containerd
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 2 additions & 1 deletion b/‎.github/workflows/ci.yml‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎.github/workflows/release.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/release.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Makefile‎
Lines changed: 1 addition & 1 deletion b/‎Makefile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Vagrantfile‎
Lines changed: 0 additions & 1 deletion b/‎Vagrantfile‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎contrib/Dockerfile.test‎
Lines changed: 1 addition & 2 deletions b/‎contrib/Dockerfile.test‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎go.mod‎
Lines changed: 76 additions & 0 deletions b/‎go.mod‎
Lines changed: 76 additions & 0 deletions
@@ -199,7 +199,7 @@ jobs:
           set -o xtrace
           mingw32-make.exe binaries
           bindir="$(pwd)"
-          SHIM_COMMIT=$(grep Microsoft/hcsshim vendor.conf | awk '{print $2}')
+          SHIM_COMMIT=$(grep 'Microsoft/hcsshim ' go.mod | awk '{print $2}')
           cd ../../Microsoft/hcsshim
           git fetch --tags origin "${SHIM_COMMIT}"
           git checkout "${SHIM_COMMIT}"
@@ -229,6 +229,7 @@ jobs:
     needs: [project, linters, protos, man]
 
     strategy:
+      fail-fast: false
       matrix:
         runtime: [io.containerd.runtime.v1.linux, io.containerd.runc.v1, io.containerd.runc.v2]
         runc: [runc, crun]
 
@@ -91,7 +91,7 @@ jobs:
         id: hcsshim_commit
         if: startsWith(matrix.os, 'windows')
         shell: bash
-        run: echo "::set-output name=sha::$(grep Microsoft/hcsshim vendor.conf | awk '{print $2}')"
+        run: echo "::set-output name=sha::$(grep 'Microsoft/hcsshim ' go.mod | awk '{print $2}')"
         working-directory: src/github.com/containerd/containerd
 
       - name: Checkout hcsshim source
 
@@ -377,7 +377,7 @@ root-coverage: ## generate coverage profiles for unit tests that require root
 
 vendor:
 	@echo "$(WHALE) $@"
-	@vndr
+	@go mod vendor
 
 help: ## this help
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort
@@ -85,7 +85,6 @@ Vagrant.configure("2") do |config|
         curl -fsSL "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" | tar Cxz /usr/local
         cat >> /etc/environment <<EOF
 PATH=/usr/local/go/bin:$PATH
-GO111MODULE=off
 EOF
         source /etc/environment
         cat >> /etc/profile.d/sh.local <<EOF
 
@@ -32,10 +32,9 @@ RUN apt-get update && apt-get install -y \
     libseccomp-dev \
   --no-install-recommends
 
-COPY vendor.conf vendor.conf
+COPY go.mod go.mod
 COPY script/setup/install-runc install-runc
 ARG GOPROXY=direct
-ARG GO111MODULE=off
 RUN ./install-runc
 
 FROM golang-base AS dev
 
@@ -0,0 +1,76 @@
+module github.com/containerd/containerd
+
+go 1.15
+
+require (
+	github.com/BurntSushi/toml v0.3.1
+	github.com/Microsoft/go-winio v0.4.15-0.20200908182639-5b44b70ab3ab
+	github.com/Microsoft/hcsshim v0.8.10
+	github.com/Microsoft/hcsshim/test v0.0.0-20201119174602-966bebae11b4
+	github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4
+	github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e
+	github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102
+	github.com/containerd/console v1.0.1
+	github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe
+	github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c
+	github.com/containerd/go-cni v1.0.1
+	github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328
+	github.com/containerd/imgcrypt v1.0.1
+	github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164
+	github.com/containerd/ttrpc v1.0.2
+	github.com/containerd/typeurl v1.0.1
+	github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2
+	github.com/containernetworking/plugins v0.8.6
+	github.com/coreos/go-systemd/v22 v22.1.0
+	github.com/davecgh/go-spew v1.1.1
+	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
+	github.com/docker/go-metrics v0.0.1
+	github.com/docker/go-units v0.4.0
+	github.com/emicklei/go-restful v2.9.5+incompatible
+	github.com/fsnotify/fsnotify v1.4.9
+	github.com/gogo/googleapis v1.4.0
+	github.com/gogo/protobuf v1.3.1
+	github.com/golang/protobuf v1.4.2
+	github.com/google/go-cmp v0.5.1
+	github.com/google/uuid v1.1.1
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
+	github.com/hashicorp/go-multierror v1.0.0
+	github.com/imdario/mergo v0.3.10
+	github.com/moby/sys/symlink v0.1.0
+	github.com/opencontainers/go-digest v1.0.0
+	github.com/opencontainers/image-spec v1.0.1
+	github.com/opencontainers/runc v1.0.0-rc92
+	github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6
+	github.com/opencontainers/selinux v1.6.0
+	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.7.1
+	github.com/sirupsen/logrus v1.7.0
+	github.com/stretchr/testify v1.4.0
+	github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2
+	github.com/tchap/go-patricia v2.2.6+incompatible
+	github.com/urfave/cli v1.22.2
+	github.com/willf/bitset v1.1.11 // indirect
+	go.etcd.io/bbolt v1.3.5
+	golang.org/x/net v0.0.0-20200707034311-ab3426394381
+	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
+	golang.org/x/sys v0.0.0-20201013081832-0aaa2718063a
+	google.golang.org/grpc v1.30.0
+	gotest.tools/v3 v3.0.2
+	k8s.io/api v0.19.4
+	k8s.io/apimachinery v0.19.4
+	k8s.io/apiserver v0.19.4
+	k8s.io/client-go v0.19.4
+	k8s.io/component-base v0.19.4
+	k8s.io/cri-api v0.19.4
+	k8s.io/klog/v2 v2.2.0
+	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
+)
+
+replace (
+	github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
+	github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
+	// urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092
+	github.com/urfave/cli => github.com/urfave/cli v1.22.1
+	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
+	google.golang.org/grpc => google.golang.org/grpc v1.27.1
+)