Skip to content

Commit 0ff1922

Browse files
authored
Merge pull request #2260 from cpanato/ip-bullseye
cross: install ip looks like it is not there for bullseye
2 parents 10acee9 + fa446fc commit 0ff1922

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

images/build/cross/default/Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ RUN apt-get -q update \
5656
jq \
5757
patch \
5858
rsync \
59-
unzip
59+
unzip \
60+
iproute2
6061

6162
# Use dynamic cgo linking for architectures other than amd64 for the server platforms
6263
# To install crossbuild essential for other architectures add the following repository.
@@ -102,8 +103,8 @@ RUN mkdir $TMPDIR \
102103
&& chmod o+t $TMPDIR
103104

104105
# Get the code coverage tool and goimports
105-
RUN go get golang.org/x/tools/cmd/cover \
106-
golang.org/x/tools/cmd/goimports \
106+
RUN for i in {1..5}; do GOPROXY="direct" go install golang.org/x/tools/cmd/cover@latest && break || sleep 15; done \
107+
&& for i in {1..5}; do GOPROXY="direct" go install golang.org/x/tools/cmd/goimports@latest && break || sleep 15; done \
107108
&& go clean -cache
108109

109110
# Cleanup a bit

images/build/cross/variants.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ variants:
22
v1.23-go1.17-bullseye:
33
CONFIG: 'go1.17-bullseye'
44
TYPE: 'default'
5-
IMAGE_VERSION: 'v1.23.0-go1.17.1-bullseye.0'
5+
IMAGE_VERSION: 'v1.23.0-go1.17.1-bullseye.1'
66
KUBERNETES_VERSION: 'v1.23.0'
77
GO_VERSION: '1.17.1'
88
GO_MAJOR_VERSION: '1.17'
99
OS_CODENAME: 'bullseye'
10-
REVISION: '0'
10+
REVISION: '1'
1111
PROTOBUF_VERSION: '3.7.0'
1212
v1.23-go1.17-buster:
1313
CONFIG: 'go1.17-buster'

0 commit comments

Comments
 (0)