Skip to content

Commit

Permalink
Merge pull request #4578 from thaJeztah/gotoolchain_local
Browse files Browse the repository at this point in the history
Dockerfile: use GOTOOLCHAIN=local
  • Loading branch information
thaJeztah authored Sep 26, 2023
2 parents 8d1ddff + e9759ce commit a36f0f9
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ARG BUILDX_VERSION=0.11.2
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

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

FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-bullseye
ENV GOTOOLCHAIN=local
COPY --link --from=xx / /
RUN apt-get update && apt-get install --no-install-recommends -y bash clang lld llvm file
WORKDIR /go/src/github.com/docker/cli
Expand Down
3 changes: 2 additions & 1 deletion dockerfiles/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ ARG BUILDX_VERSION=0.11.2
FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx

FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang
ENV CGO_ENABLED=0
ENV GOTOOLCHAIN=local
ENV CGO_ENABLED=0

FROM golang AS gofumpt
ARG GOFUMPT_VERSION=v0.4.0
Expand Down
1 change: 1 addition & 0 deletions dockerfiles/Dockerfile.lint
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ARG GOLANGCI_LINT_VERSION=v1.54.2
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint

FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS lint
ENV GOTOOLCHAIN=local
ENV GO111MODULE=off
ENV CGO_ENABLED=0
ENV GOGC=75
Expand Down
1 change: 1 addition & 0 deletions dockerfiles/Dockerfile.vendor
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ ARG ALPINE_VERSION=3.17
ARG MODOUTDATED_VERSION=v0.8.0

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

Expand Down
1 change: 1 addition & 0 deletions e2e/testdata/Dockerfile.gencerts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
ARG GO_VERSION=1.20.8

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

0 comments on commit a36f0f9

Please sign in to comment.