mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
Dockerfile: use GOTOOLCHAIN=local
Related discussion in https://github.com/docker-library/golang/issues/472 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
@@ -44,6 +44,7 @@ RUN test -n "$APT_MIRROR" && sed -ri "s#(httpredir|deb|security).debian.org#${AP
|
|||||||
ARG DEBIAN_FRONTEND
|
ARG DEBIAN_FRONTEND
|
||||||
RUN apt-get update && apt-get install --no-install-recommends -y file
|
RUN apt-get update && apt-get install --no-install-recommends -y file
|
||||||
ENV GO111MODULE=off
|
ENV GO111MODULE=off
|
||||||
|
ENV GOTOOLCHAIN=local
|
||||||
|
|
||||||
FROM base AS criu
|
FROM base AS criu
|
||||||
ARG DEBIAN_FRONTEND
|
ARG DEBIAN_FRONTEND
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
|
|||||||
|
|
||||||
FROM ${GOLANG_IMAGE}
|
FROM ${GOLANG_IMAGE}
|
||||||
ENV GO111MODULE=off
|
ENV GO111MODULE=off
|
||||||
|
ENV GOTOOLCHAIN=local
|
||||||
|
|
||||||
# allow replacing debian mirror
|
# allow replacing debian mirror
|
||||||
ARG APT_MIRROR
|
ARG APT_MIRROR
|
||||||
|
|||||||
@@ -175,6 +175,7 @@ ENV GO_VERSION=${GO_VERSION} `
|
|||||||
GIT_VERSION=2.11.1 `
|
GIT_VERSION=2.11.1 `
|
||||||
GOPATH=C:\gopath `
|
GOPATH=C:\gopath `
|
||||||
GO111MODULE=off `
|
GO111MODULE=off `
|
||||||
|
GOTOOLCHAIN=local `
|
||||||
FROM_DOCKERFILE=1 `
|
FROM_DOCKERFILE=1 `
|
||||||
GOTESTSUM_VERSION=${GOTESTSUM_VERSION} `
|
GOTESTSUM_VERSION=${GOTESTSUM_VERSION} `
|
||||||
GOWINRES_VERSION=${GOWINRES_VERSION}
|
GOWINRES_VERSION=${GOWINRES_VERSION}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ RUN apt-get update && apt-get --no-install-recommends install -y git unzip
|
|||||||
ARG PROTOC_VERSION
|
ARG PROTOC_VERSION
|
||||||
ARG TARGETOS
|
ARG TARGETOS
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
|
ENV GOTOOLCHAIN=local
|
||||||
RUN <<EOT
|
RUN <<EOT
|
||||||
set -e
|
set -e
|
||||||
arch=$(echo $TARGETARCH | sed -e s/amd64/x86_64/ -e s/arm64/aarch_64/)
|
arch=$(echo $TARGETARCH | sed -e s/amd64/x86_64/ -e s/arm64/aarch_64/)
|
||||||
|
|||||||
Reference in New Issue
Block a user