Skip to content

Commit aa28297

Browse files
committed
Dockerfile: use GOTOOLCHAIN=local
Related discussion in docker-library/golang#472 Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent a1d966c commit aa28297

4 files changed

Lines changed: 4 additions & 0 deletions

File tree

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ RUN test -n "$APT_MIRROR" && sed -ri "s#(httpredir|deb|security).debian.org#${AP
4444
ARG DEBIAN_FRONTEND
4545
RUN apt-get update && apt-get install --no-install-recommends -y file
4646
ENV GO111MODULE=off
47+
ENV GOTOOLCHAIN=local
4748

4849
FROM base AS criu
4950
ARG DEBIAN_FRONTEND

Dockerfile.simple

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
1212

1313
FROM ${GOLANG_IMAGE}
1414
ENV GO111MODULE=off
15+
ENV GOTOOLCHAIN=local
1516

1617
# allow replacing debian mirror
1718
ARG APT_MIRROR

Dockerfile.windows

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ ENV GO_VERSION=${GO_VERSION} `
175175
GIT_VERSION=2.11.1 `
176176
GOPATH=C:\gopath `
177177
GO111MODULE=off `
178+
GOTOOLCHAIN=local `
178179
FROM_DOCKERFILE=1 `
179180
GOTESTSUM_VERSION=${GOTESTSUM_VERSION} `
180181
GOWINRES_VERSION=${GOWINRES_VERSION}

hack/dockerfiles/generate-files.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RUN apt-get update && apt-get --no-install-recommends install -y git unzip
1010
ARG PROTOC_VERSION
1111
ARG TARGETOS
1212
ARG TARGETARCH
13+
ENV GOTOOLCHAIN=local
1314
RUN <<EOT
1415
set -e
1516
arch=$(echo $TARGETARCH | sed -e s/amd64/x86_64/ -e s/arm64/aarch_64/)

0 commit comments

Comments
 (0)