From a8e1769e93bb2878d63feaa8938d4cf55f5c5389 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 22 Sep 2023 16:58:14 +0200 Subject: [PATCH] Dockerfile: use GOTOOLCHAIN=local Related discussion in https://github.com/docker-library/golang/issues/472 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit aa282973d42ace1f7270b43d36d15968a1403a12) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 1 + Dockerfile.simple | 1 + Dockerfile.windows | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index eda4e2f45d5e9..5318e96db7ad5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,6 +37,7 @@ RUN test -n "$APT_MIRROR" && sed -ri "s#(httpredir|deb|security).debian.org#${AP ARG DEBIAN_FRONTEND RUN apt-get update && apt-get install --no-install-recommends -y file ENV GO111MODULE=off +ENV GOTOOLCHAIN=local FROM base AS criu ARG DEBIAN_FRONTEND diff --git a/Dockerfile.simple b/Dockerfile.simple index bdbbeafdd8430..161d66f1ad739 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -12,6 +12,7 @@ ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}" FROM ${GOLANG_IMAGE} ENV GO111MODULE=off +ENV GOTOOLCHAIN=local # allow replacing debian mirror ARG APT_MIRROR diff --git a/Dockerfile.windows b/Dockerfile.windows index b90009a5413a1..c08b0787c5852 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -179,6 +179,7 @@ ENV GO_VERSION=${GO_VERSION} ` GIT_VERSION=2.11.1 ` GOPATH=C:\gopath ` GO111MODULE=off ` + GOTOOLCHAIN=local ` FROM_DOCKERFILE=1 ` GOTESTSUM_VERSION=${GOTESTSUM_VERSION} ` GOWINRES_VERSION=${GOWINRES_VERSION}