From aa282973d42ace1f7270b43d36d15968a1403a12 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 --- Dockerfile | 1 + Dockerfile.simple | 1 + Dockerfile.windows | 1 + hack/dockerfiles/generate-files.Dockerfile | 1 + 4 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index e6eef07a9f..c4cc8289ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,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 6d2ab34a99..e21a2ca384 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 17c655d583..41575b2d4e 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -175,6 +175,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} diff --git a/hack/dockerfiles/generate-files.Dockerfile b/hack/dockerfiles/generate-files.Dockerfile index 89f7b9715a..955cec0766 100644 --- a/hack/dockerfiles/generate-files.Dockerfile +++ b/hack/dockerfiles/generate-files.Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update && apt-get --no-install-recommends install -y git unzip ARG PROTOC_VERSION ARG TARGETOS ARG TARGETARCH +ENV GOTOOLCHAIN=local RUN <