From ac61da58905ccead7d87ee2689f2465c836e0882 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 16 Aug 2021 19:56:45 -0700 Subject: [PATCH] update go to 1.17 Signed-off-by: Tonis Tiigi --- Dockerfile | 12 ++---------- examples/buildkit0/buildkit.go | 2 +- examples/buildkit1/buildkit.go | 2 +- examples/buildkit2/buildkit.go | 2 +- examples/buildkit3/buildkit.go | 2 +- examples/nested-llb/main.go | 2 +- .../dockerfile/cmd/dockerfile-frontend/Dockerfile | 2 +- hack/dockerfiles/generated-files.Dockerfile | 2 +- hack/dockerfiles/lint.Dockerfile | 2 +- hack/dockerfiles/vendor.Dockerfile | 3 ++- util/archutil/Dockerfile | 2 +- 11 files changed, 13 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 97d2b1f00..0aafe6a70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,18 +21,10 @@ RUN apk add --no-cache git # xx is a helper for cross-compilation FROM --platform=$BUILDPLATFORM tonistiigi/xx@sha256:1e96844fadaa2f9aea021b2b05299bc02fe4c39a92d8e735b93e8e2b15610128 AS xx -FROM --platform=$BUILDPLATFORM golang:1.16-alpine AS golatest - -FROM golatest AS go-linux -FROM golatest AS go-darwin -FROM golatest AS go-windows-amd64 -FROM golatest AS go-windows-386 -FROM golatest AS go-windows-arm -FROM --platform=$BUILDPLATFORM golang:1.17beta1-alpine AS go-windows-arm64 -FROM go-windows-${TARGETARCH} AS go-windows +FROM --platform=$BUILDPLATFORM golang:1.17-alpine AS golatest # gobuild is base stage for compiling go/cgo -FROM go-${TARGETOS} AS gobuild-base +FROM golatest AS gobuild-base RUN apk add --no-cache file bash clang lld pkgconfig git make COPY --from=xx / / diff --git a/examples/buildkit0/buildkit.go b/examples/buildkit0/buildkit.go index b52b67180..78f988d85 100644 --- a/examples/buildkit0/buildkit.go +++ b/examples/buildkit0/buildkit.go @@ -33,7 +33,7 @@ func main() { } func goBuildBase() llb.State { - goAlpine := llb.Image("docker.io/library/golang:1.16-alpine") + goAlpine := llb.Image("docker.io/library/golang:1.17-alpine") return goAlpine. AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix). AddEnv("GOPATH", "/go"). diff --git a/examples/buildkit1/buildkit.go b/examples/buildkit1/buildkit.go index 45992193b..98793d0ab 100644 --- a/examples/buildkit1/buildkit.go +++ b/examples/buildkit1/buildkit.go @@ -33,7 +33,7 @@ func main() { } func goBuildBase() llb.State { - goAlpine := llb.Image("docker.io/library/golang:1.16-alpine") + goAlpine := llb.Image("docker.io/library/golang:1.17-alpine") return goAlpine. AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix). AddEnv("GOPATH", "/go"). diff --git a/examples/buildkit2/buildkit.go b/examples/buildkit2/buildkit.go index 8efc438cb..7a88562cf 100644 --- a/examples/buildkit2/buildkit.go +++ b/examples/buildkit2/buildkit.go @@ -33,7 +33,7 @@ func main() { } func goBuildBase() llb.State { - goAlpine := llb.Image("docker.io/library/golang:1.16-alpine") + goAlpine := llb.Image("docker.io/library/golang:1.17-alpine") return goAlpine. AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix). AddEnv("GOPATH", "/go"). diff --git a/examples/buildkit3/buildkit.go b/examples/buildkit3/buildkit.go index 2477fb2d3..fa985f18e 100644 --- a/examples/buildkit3/buildkit.go +++ b/examples/buildkit3/buildkit.go @@ -34,7 +34,7 @@ func main() { } func goBuildBase() llb.State { - goAlpine := llb.Image("docker.io/library/golang:1.16-alpine") + goAlpine := llb.Image("docker.io/library/golang:1.17-alpine") return goAlpine. AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix). AddEnv("GOPATH", "/go"). diff --git a/examples/nested-llb/main.go b/examples/nested-llb/main.go index 5111de864..74eb58864 100644 --- a/examples/nested-llb/main.go +++ b/examples/nested-llb/main.go @@ -32,7 +32,7 @@ func main() { } func goBuildBase() llb.State { - goAlpine := llb.Image("docker.io/library/golang:1.16-alpine") + goAlpine := llb.Image("docker.io/library/golang:1.17-alpine") return goAlpine. AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix). AddEnv("GOPATH", "/go"). diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile index b4cf72b28..b8f4e0e85 100644 --- a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile +++ b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile @@ -3,7 +3,7 @@ # xx is a helper for cross-compilation FROM --platform=$BUILDPLATFORM tonistiigi/xx:golang@sha256:810dc54d5144f133a218e88e319184bf8b9ce01d37d46ddb37573e90decd9eef AS xx -FROM --platform=$BUILDPLATFORM golang:1.16-alpine AS base +FROM --platform=$BUILDPLATFORM golang:1.17-alpine AS base RUN apk add git bash COPY --from=xx / / WORKDIR /src diff --git a/hack/dockerfiles/generated-files.Dockerfile b/hack/dockerfiles/generated-files.Dockerfile index c81bb4165..1f7e24438 100644 --- a/hack/dockerfiles/generated-files.Dockerfile +++ b/hack/dockerfiles/generated-files.Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.3 # protoc is dynamically linked to glibc to can't use golang:1.10-alpine -FROM golang:1.16-buster AS gobuild-base +FROM golang:1.17-buster AS gobuild-base RUN apt-get update && apt-get --no-install-recommends install -y \ unzip \ diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index b889cfbe1..9f41aae74 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.3 -FROM golang:1.16-alpine +FROM golang:1.17-alpine RUN apk add --no-cache gcc musl-dev yamllint RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.41.1 WORKDIR /go/src/github.com/moby/buildkit diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile index 99d75a75b..48878e1d7 100644 --- a/hack/dockerfiles/vendor.Dockerfile +++ b/hack/dockerfiles/vendor.Dockerfile @@ -1,5 +1,6 @@ # syntax = docker/dockerfile:1.3 -FROM golang:1.16-alpine AS vendored + +FROM golang:1.17-alpine AS vendored RUN apk add --no-cache git WORKDIR /src RUN --mount=target=/src,rw \ diff --git a/util/archutil/Dockerfile b/util/archutil/Dockerfile index f4e1f1d54..4c801ae0f 100644 --- a/util/archutil/Dockerfile +++ b/util/archutil/Dockerfile @@ -49,7 +49,7 @@ FROM base AS exit-mips64 COPY fixtures/exit.mips64.s . RUN mips64-linux-gnuabi64-as --noexecstack -o exit.o exit.mips64.s && mips64-linux-gnuabi64-ld -o exit -s exit.o -FROM golang:1.16-alpine AS generate +FROM golang:1.17-alpine AS generate WORKDIR /src COPY --from=exit-amd64 /src/exit amd64 COPY --from=exit-386 /src/exit 386