Fix reference to vendor.conf in scripts

zhsj · zhsj · commit 553a36915878 · 2020-12-01T01:34:10.000+08:00
Signed-off-by: Shengjing Zhu &lt;zhsj@debian.org&gt;
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
@@ -32,7 +32,7 @@ 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
diff --git a/script/setup/install-cni b/script/setup/install-cni
@@ -17,14 +17,15 @@
 #
 # Builds and installs cni plugins to /opt/cni/bin,
 # and create basic cni config in /etc/cni/net.d.
-# The commit defined in vendor.conf
+# The commit defined in go.mod
 #
 set -eu -o pipefail
 
-CNI_COMMIT=$(grep containernetworking/plugins "$GOPATH"/src/github.com/containerd/containerd/vendor.conf | awk '{print $2}')
+CNI_COMMIT=$(grep containernetworking/plugins "$GOPATH"/src/github.com/containerd/containerd/go.mod | awk '{print $2}')
 CNI_DIR=${DESTDIR:=''}/opt/cni
 CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
 
+cd "$GOPATH"
 go get -d github.com/containernetworking/plugins/...
 cd "$GOPATH"/src/github.com/containernetworking/plugins
 git checkout $CNI_COMMIT
diff --git a/script/setup/install-runc b/script/setup/install-runc
@@ -16,13 +16,14 @@
 
 #
 # Builds and installs runc to /usr/local/go/bin based off
-# the commit defined in vendor.conf
+# the commit defined in go.mod
 #
 set -eu -o pipefail
 
 function install_runc() {
-	RUNC_COMMIT=$(grep opencontainers/runc "$GOPATH"/src/github.com/containerd/containerd/vendor.conf | awk '{print $2}')
+	RUNC_COMMIT=$(grep opencontainers/runc "$GOPATH"/src/github.com/containerd/containerd/go.mod | awk '{print $2}')
 
+	cd "$GOPATH"
 	go get -d github.com/opencontainers/runc
 	cd "$GOPATH"/src/github.com/opencontainers/runc
 	git checkout $RUNC_COMMIT

Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,14 @@`
`16`	`16`
`17`	`17`	`#`
`18`	`18`	`# Builds and installs runc to /usr/local/go/bin based off`
`19`		`-# the commit defined in vendor.conf`
	`19`	`+# the commit defined in go.mod`
`20`	`20`	`#`
`21`	`21`	`set -eu -o pipefail`
`22`	`22`
`23`	`23`	`function install_runc() {`
`24`		`- RUNC_COMMIT=$(grep opencontainers/runc "$GOPATH"/src/github.com/containerd/containerd/vendor.conf \| awk '{print $2}')`
	`24`	`+ RUNC_COMMIT=$(grep opencontainers/runc "$GOPATH"/src/github.com/containerd/containerd/go.mod \| awk '{print $2}')`
`25`	`25`
	`26`	`+ cd "$GOPATH"`
`26`	`27`	`go get -d github.com/opencontainers/runc`
`27`	`28`	`cd "$GOPATH"/src/github.com/opencontainers/runc`
`28`	`29`	`git checkout $RUNC_COMMIT`