github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7484 from lengrongfu/feat/update_install_cni_script

Browse Source 
fix install cni script
This commit is contained in:
Kazuyoshi Kato 2022-10-19 14:22:42 -07:00 committed by GitHub
commit 30ae238771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Vagrantfile vendored
View File

@ -154,7 +154,8 @@ EOF
source /etc/environment source /etc/environment
source /etc/profile.d/sh.local source /etc/profile.d/sh.local
set -eux -o pipefail 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 PATH=/opt/cni/bin:$PATH type ${CNI_BINARIES} || true
SHELL SHELL
end end

5
contrib/Dockerfile.test
View File

@ -40,9 +40,8 @@ WORKDIR /go/src/github.com/containerd/containerd
FROM golang AS cni FROM golang AS cni
ENV DESTDIR=/build ENV DESTDIR=/build
COPY script/setup/install-cni ./ COPY script/setup/install-cni go.mod /
COPY go.mod /go/src/github.com/containerd/containerd/go.mod RUN DESTDIR=/build /install-cni
RUN ./install-cni
FROM golang AS critools FROM golang AS critools
ARG DESTDIR=/build ARG DESTDIR=/build

2
script/setup/install-cni
View File

@ -21,7 +21,7 @@
# #
set -eu -o pipefail 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_DIR=${DESTDIR:=''}/opt/cni
CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d