Skip to content

Commit e9759ce

Browse files
committed
Dockerfile: use GOTOOLCHAIN=local
This may find its way into the official images, but until it does, let's make sure we don't get unexpected updates of go. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 8d1ddff commit e9759ce

5 files changed

Lines changed: 7 additions & 1 deletion

File tree

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ARG BUILDX_VERSION=0.11.2
1111
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
1212

1313
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS build-base-alpine
14+
ENV GOTOOLCHAIN=local
1415
COPY --link --from=xx / /
1516
RUN apk add --no-cache bash clang lld llvm file git
1617
WORKDIR /go/src/github.com/docker/cli
@@ -21,6 +22,7 @@ ARG TARGETPLATFORM
2122
RUN xx-apk add --no-cache musl-dev gcc
2223

2324
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-bullseye
25+
ENV GOTOOLCHAIN=local
2426
COPY --link --from=xx / /
2527
RUN apt-get update && apt-get install --no-install-recommends -y bash clang lld llvm file
2628
WORKDIR /go/src/github.com/docker/cli

dockerfiles/Dockerfile.dev

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ ARG BUILDX_VERSION=0.11.2
77
FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx
88

99
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang
10-
ENV CGO_ENABLED=0
10+
ENV GOTOOLCHAIN=local
11+
ENV CGO_ENABLED=0
1112

1213
FROM golang AS gofumpt
1314
ARG GOFUMPT_VERSION=v0.4.0

dockerfiles/Dockerfile.lint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ARG GOLANGCI_LINT_VERSION=v1.54.2
77
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint
88

99
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS lint
10+
ENV GOTOOLCHAIN=local
1011
ENV GO111MODULE=off
1112
ENV CGO_ENABLED=0
1213
ENV GOGC=75

dockerfiles/Dockerfile.vendor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ARG ALPINE_VERSION=3.17
55
ARG MODOUTDATED_VERSION=v0.8.0
66

77
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
8+
ENV GOTOOLCHAIN=local
89
RUN apk add --no-cache bash git rsync
910
WORKDIR /src
1011

e2e/testdata/Dockerfile.gencerts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
ARG GO_VERSION=1.20.8
44

55
FROM golang:${GO_VERSION}-alpine AS generated
6+
ENV GOTOOLCHAIN=local
67
RUN go install github.com/dmcgowan/quicktls@master
78
WORKDIR /tmp/gencerts/notary
89
RUN --mount=type=bind,source=e2e/testdata/notary,target=/tmp/gencerts/notary,rw <<EOT

0 commit comments

Comments
 (0)