Pārlūkot izejas kodu

Dockerfile: use GOTOOLCHAIN=local

Related discussion in https://github.com/docker-library/golang/issues/472

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 gadu atpakaļ
vecāks
revīzija
aa282973d4
4 mainītis faili ar 4 papildinājumiem un 0 dzēšanām
  1. 1 0
      Dockerfile
  2. 1 0
      Dockerfile.simple
  3. 1 0
      Dockerfile.windows
  4. 1 0
      hack/dockerfiles/generate-files.Dockerfile

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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}

+ 1 - 0
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 <<EOT
   set -e
   arch=$(echo $TARGETARCH | sed -e s/amd64/x86_64/ -e s/arm64/aarch_64/)