From 6168b875a4f80b6884e5c805fee575ffd94a7c78 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 2 May 2020 18:53:17 +0200 Subject: [PATCH] Dockerfile.buildx: bump to Go 1.13.10 Looks like this Dockerfile was not yet updated; possibly because `go mod` issues when building buildx 0.3.1. Given that the upstream repository uses vendoring, I: - removed the `go mod download` step - added `-mod=vendor` to use vendoring mode Signed-off-by: Sebastiaan van Stijn --- Dockerfile.buildx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile.buildx b/Dockerfile.buildx index 1f430f8b5a..c0d4952e91 100644 --- a/Dockerfile.buildx +++ b/Dockerfile.buildx @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.12.10 +ARG GO_VERSION=1.13.10 ARG BUILDX_COMMIT=v0.3.1 ARG BUILDX_REPO=https://github.com/docker/buildx.git @@ -8,7 +8,6 @@ RUN git clone "${BUILDX_REPO}" /buildx WORKDIR /buildx ARG BUILDX_COMMIT RUN git fetch origin "${BUILDX_COMMIT}":build && git checkout build -RUN go mod download ARG GOOS ARG GOARCH # Keep these essentially no-op var settings for debug purposes. @@ -20,7 +19,7 @@ RUN GOOS="${GOOS}" GOARCH="${GOARCH}" BUILDX_COMMIT="${BUILDX_COMMIT}"; \ -X \"${pkg}/version.Revision=$(git rev-parse --short HEAD)\" \ -X \"${pkg}/version.Package=buildx\" \ "; \ - go build -ldflags "${ldflags}" -o /usr/bin/buildx ./cmd/buildx + go build -mod=vendor -ldflags "${ldflags}" -o /usr/bin/buildx ./cmd/buildx FROM golang:${GO_VERSION}-stretch COPY --from=build /usr/bin/buildx /usr/bin/buildx