fix install cni script

lengrongfu · thaJeztah · commit edfac183479d · 2023-01-24T21:10:44.000+01:00
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io> (cherry picked from commit 047e684) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/Vagrantfile b/Vagrantfile
@@ -146,7 +146,8 @@ EOF
         source /etc/environment
         source /etc/profile.d/sh.local
         set -eux -o pipefail
-        ${GOPATH}/src/github.com/containerd/containerd/script/setup/install-cni
+        cd ${GOPATH}/src/github.com/containerd/containerd
+        script/setup/install-cni
         PATH=/opt/cni/bin:$PATH type ${CNI_BINARIES} || true
     SHELL
   end
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
@@ -40,9 +40,8 @@ WORKDIR /go/src/github.com/containerd/containerd
 
 FROM golang AS cni
 ENV DESTDIR=/build
-COPY script/setup/install-cni ./
-COPY go.mod /go/src/github.com/containerd/containerd/go.mod
-RUN ./install-cni
+COPY script/setup/install-cni go.mod /
+RUN DESTDIR=/build /install-cni
 
 FROM golang AS critools
 ARG DESTDIR=/build
diff --git a/script/setup/install-cni b/script/setup/install-cni
@@ -21,7 +21,7 @@
 #
 set -eu -o pipefail
 
-CNI_COMMIT=${1:-$(grep containernetworking/plugins "$GOPATH"/src/github.com/containerd/containerd/go.mod | awk '{print $2}')}
+CNI_COMMIT=${1:-$(go list -f "{{.Version}}" -m github.com/containernetworking/plugins)}
 CNI_DIR=${DESTDIR:=''}/opt/cni
 CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`#`
`22`	`22`	`set -eu -o pipefail`
`23`	`23`
`24`		`-CNI_COMMIT=${1:-$(grep containernetworking/plugins "$GOPATH"/src/github.com/containerd/containerd/go.mod \| awk '{print $2}')}`
	`24`	`+CNI_COMMIT=${1:-$(go list -f "{{.Version}}" -m github.com/containernetworking/plugins)}`
`25`	`25`	`CNI_DIR=${DESTDIR:=''}/opt/cni`
`26`	`26`	`CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d`
`27`	`27`