update to go 1.20

crazy-max · crazy-max · commit b8a97ab78533 · 2023-02-21T12:09:54.000+01:00
Signed-off-by: CrazyMax &lt;crazy-max@users.noreply.github.com&gt;
diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml
@@ -27,7 +27,7 @@ on:
         type: string
 
 env:
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.20"
   SETUP_BUILDX_VERSION: "latest"
   SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
   TESTFLAGS: "-v --parallel=6 --timeout=30m"
diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml
@@ -20,7 +20,7 @@ on:
       - 'frontend/dockerfile/docs/**'
 
 env:
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.20"
   SETUP_BUILDX_VERSION: "latest"
   SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
   IMAGE_NAME: "moby/buildkit"
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -18,7 +18,7 @@ on:
       - 'frontend/dockerfile/docs/**'
 
 env:
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.20"
   SETUP_BUILDX_VERSION: "latest"
   SETUP_BUILDKIT_TAG: "moby/buildkit:latest"
   IMAGE_NAME: "docker/dockerfile-upstream"
diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml
@@ -18,7 +18,7 @@ on:
       - 'frontend/dockerfile/docs/**'
 
 env:
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.20"
   TESTFLAGS: "-v --parallel=6 --timeout=30m"
 
 jobs:
@@ -39,7 +39,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: "${{ env.GO_VERSION }}"
           cache: true
       -
         name: Go mod
diff --git a/Dockerfile b/Dockerfile
@@ -15,6 +15,7 @@ ARG MINIO_VERSION=RELEASE.2022-05-03T20-36-08Z
 ARG MINIO_MC_VERSION=RELEASE.2022-05-04T06-07-55Z
 ARG AZURITE_VERSION=3.18.0
 
+ARG GO_VERSION=1.20
 ARG ALPINE_VERSION=3.17
 
 # minio for s3 integration tests
@@ -35,7 +36,7 @@ FROM alpine-$TARGETARCH AS alpinebase
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.2.1 AS xx
 
 # go base image
-FROM --platform=$BUILDPLATFORM golang:1.19-alpine${ALPINE_VERSION} AS golatest
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest
 
 # git stage is used for checking out remote repository sources
 FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS git
diff --git 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.19-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.20-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
@@ -33,7 +33,7 @@ func main() {
 }
 
 func goBuildBase() llb.State {
-	goAlpine := llb.Image("docker.io/library/golang:1.19-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.20-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
@@ -33,7 +33,7 @@ func main() {
 }
 
 func goBuildBase() llb.State {
-	goAlpine := llb.Image("docker.io/library/golang:1.19-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.20-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
@@ -34,7 +34,7 @@ func main() {
 }
 
 func goBuildBase() llb.State {
-	goAlpine := llb.Image("docker.io/library/golang:1.19-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.20-alpine")
 	return goAlpine.
 		AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix).
 		AddEnv("GOPATH", "/go").
diff --git a/examples/buildkit4/buildkit.go b/examples/buildkit4/buildkit.go
@@ -37,7 +37,7 @@ func main() {
 }
 
 func goBuildBase() llb.State {
-	goAlpine := llb.Image("docker.io/library/golang:1.19-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.20-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
@@ -32,7 +32,7 @@ func main() {
 }
 
 func goBuildBase() llb.State {
-	goAlpine := llb.Image("docker.io/library/golang:1.19-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.20-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
@@ -1,9 +1,11 @@
 # syntax=docker/dockerfile-upstream:master
 
+ARG GO_VERSION=1.20
+
 # xx is a helper for cross-compilation
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:master@sha256:d4254d9739ce2de9fb88e09bdc716aa0c65f0446a2a2143399f991d71136a3d4 AS xx
 
-FROM --platform=$BUILDPLATFORM golang:1.19-alpine AS base
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS base
 RUN apk add git bash
 COPY --from=xx / /
 WORKDIR /src
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/moby/buildkit
 
-go 1.18
+go 1.19
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0
diff --git a/hack/dockerfiles/generated-files.Dockerfile b/hack/dockerfiles/generated-files.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile-upstream:master
 
-ARG GO_VERSION="1.19"
+ARG GO_VERSION="1.20"
 ARG NODE_VERSION="19"
 ARG PROTOC_VERSION="3.11.4"
 
diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile
@@ -1,6 +1,8 @@
 # syntax=docker/dockerfile-upstream:master
 
-FROM golang:1.19-alpine
+ARG GO_VERSION=1.20
+
+FROM golang:${GO_VERSION}-alpine
 ENV GOFLAGS="-buildvcs=false"
 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.48.0
diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile
@@ -1,6 +1,8 @@
 # syntax=docker/dockerfile-upstream:master
 
-FROM golang:1.19-alpine AS vendored
+ARG GO_VERSION=1.20
+
+FROM golang:${GO_VERSION}-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
@@ -52,7 +52,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.19-alpine AS generate
+FROM golang:1.20-alpine AS generate
 WORKDIR /src
 COPY --from=exit-amd64 /src/exit amd64
 COPY --from=exit-386 /src/exit 386

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func main() {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func goBuildBase() llb.State {`
`36`		`- goAlpine := llb.Image("docker.io/library/golang:1.19-alpine")`
	`36`	`+ goAlpine := llb.Image("docker.io/library/golang:1.20-alpine")`
`37`	`37`	`return goAlpine.`
`38`	`38`	`AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix).`
`39`	`39`	`AddEnv("GOPATH", "/go").`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func main() {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func goBuildBase() llb.State {`
`37`		`- goAlpine := llb.Image("docker.io/library/golang:1.19-alpine")`
	`37`	`+ goAlpine := llb.Image("docker.io/library/golang:1.20-alpine")`
`38`	`38`	`return goAlpine.`
`39`	`39`	`AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix).`
`40`	`40`	`AddEnv("GOPATH", "/go").`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func main() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func goBuildBase() llb.State {`
`40`		`- goAlpine := llb.Image("docker.io/library/golang:1.19-alpine")`
	`40`	`+ goAlpine := llb.Image("docker.io/library/golang:1.20-alpine")`
`41`	`41`	`return goAlpine.`
`42`	`42`	`AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix).`
`43`	`43`	`AddEnv("GOPATH", "/go").`