Skip to content

Commit 610745c

Browse files
zbb88888zhangzujian
authored andcommitted
keep dockerfile variable the same as download-go-deps.sh (#4863)
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com> Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent c72b725 commit 610745c

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

dist/images/Dockerfile.base

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ RUN mkdir /packages/ && \
111111
FROM ghcr.io/aquasecurity/trivy:latest AS trivy
112112

113113
ARG ARCH
114-
ENV CNI_VERSION="v1.6.0"
115-
ENV KUBE_VERSION="v1.31.4"
116-
ENV GOBGP_VERSION="3.30.0"
114+
ENV CNI_PLUGINS_VERSION="v1.6.1"
115+
ENV KUBECTL_VERSION="v1.31.4"
116+
ENV GOBGP_VERSION="3.32.0"
117117
ENV TRIVY_DB_REPOSITORY="public.ecr.aws/aquasecurity/trivy-db:2"
118118

119119
RUN apk --no-cache add curl jq

dist/images/go-deps/download-go-deps.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
set -e
44

55
ARCH=${ARCH:-amd64}
6-
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-v1.6.0}
6+
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-v1.6.1}
77
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.31.4}
8-
GOBGP_VERSION=${GOBGP_VERSION:-3.31.0}
8+
GOBGP_VERSION=${GOBGP_VERSION:-3.32.0}
99

1010

1111
DEPS_DIR=/godeps

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08
1111
github.com/containerd/containerd v1.7.24
1212
github.com/containernetworking/cni v1.2.3
13-
github.com/containernetworking/plugins v1.6.0
13+
github.com/containernetworking/plugins v1.6.1
1414
github.com/docker/docker v27.4.1+incompatible
1515
github.com/emicklei/go-restful/v3 v3.12.1
1616
github.com/evanphx/json-patch/v5 v5.9.0
@@ -26,7 +26,7 @@ require (
2626
github.com/moby/sys/mountinfo v0.7.2
2727
github.com/onsi/ginkgo/v2 v2.22.0
2828
github.com/onsi/gomega v1.36.0
29-
github.com/osrg/gobgp/v3 v3.31.0
29+
github.com/osrg/gobgp/v3 v3.32.0
3030
github.com/ovn-org/libovsdb v0.7.0
3131
github.com/parnurzeal/gorequest v0.3.0
3232
github.com/prometheus-community/pro-bing v0.5.0

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ github.com/containerd/typeurl/v2 v2.2.0 h1:6NBDbQzr7I5LHgp34xAXYF5DOTQDn05X58lsP
6363
github.com/containerd/typeurl/v2 v2.2.0/go.mod h1:8XOOxnyatxSWuG8OfsZXVnAF4iZfedjS/8UHSPJnX4g=
6464
github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM=
6565
github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
66-
github.com/containernetworking/plugins v1.6.0 h1:lrsUrLF7QODLx6gncHOqk/pnCiC7c6bvDAskV4KUifQ=
67-
github.com/containernetworking/plugins v1.6.0/go.mod h1:rYLQWMJz/dYuW1XhHdc9xuzdkgbkWEEjwOhUm84+288=
66+
github.com/containernetworking/plugins v1.6.1 h1:bYd2bpE6hEBqexyaiI2/sst0xJ+v7pEMWrjA5qtkxiU=
67+
github.com/containernetworking/plugins v1.6.1/go.mod h1:SP5UG3jDO9LtmfbBJdP+nl3A1atOtbj2MBOYsnaxy64=
6868
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
6969
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
7070
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -387,8 +387,8 @@ github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47/go.mod h1:u7NR
387387
github.com/openshift/custom-resource-status v1.1.2 h1:C3DL44LEbvlbItfd8mT5jWrqPfHnSOQoQf/sypqA6A4=
388388
github.com/openshift/custom-resource-status v1.1.2/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
389389
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
390-
github.com/osrg/gobgp/v3 v3.31.0 h1:qDKokSsHUlvp03kHwOIwq0D1jPJruYRBpOHQsJYHdfc=
391-
github.com/osrg/gobgp/v3 v3.31.0/go.mod h1:8m+kgkdaWrByxg5EWpNUO2r/mopodrNBOUBhMnW/yGQ=
390+
github.com/osrg/gobgp/v3 v3.32.0 h1:B2krh/44etYQAuLq+iMkORxIvXj+cGIpuR6qDGNGagM=
391+
github.com/osrg/gobgp/v3 v3.32.0/go.mod h1:8m+kgkdaWrByxg5EWpNUO2r/mopodrNBOUBhMnW/yGQ=
392392
github.com/parnurzeal/gorequest v0.3.0 h1:SoFyqCDC9COr1xuS6VA8fC8RU7XyrJZN2ona1kEX7FI=
393393
github.com/parnurzeal/gorequest v0.3.0/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE=
394394
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=

0 commit comments

Comments
 (0)