Merge pull request moby#5059 from tonistiigi/update-go1.22

AkihiroSuda · web-flow · commit 8e7219f643ae · 2024-06-19T14:15:54.000+09:00
Update Go to 1.22
diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml
@@ -27,7 +27,7 @@ on:
         type: string
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.22"
   SETUP_BUILDX_VERSION: "latest"
   SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
 
diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml
@@ -21,7 +21,7 @@ on:
       - 'frontend/dockerfile/docs/**'
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.22"
   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
@@ -19,7 +19,7 @@ on:
       - 'frontend/dockerfile/docs/**'
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.22"
   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
@@ -19,7 +19,7 @@ on:
       - 'frontend/dockerfile/docs/**'
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.22"
   DESTDIR: "./bin"
 
 jobs:
diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@ ARG AZURITE_VERSION=3.18.0
 ARG GOTESTSUM_VERSION=v1.9.0
 ARG DELVE_VERSION=v1.22.1
 
-ARG GO_VERSION=1.21
+ARG GO_VERSION=1.22
 ARG ALPINE_VERSION=3.20
 ARG XX_VERSION=1.4.0
 ARG BUILDKIT_DEBUG
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.21-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.22-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.21-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.22-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.21-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.22-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.21-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.22-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.21-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.22-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.21-alpine")
+	goAlpine := llb.Image("docker.io/library/golang:1.22-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,6 +1,6 @@
 # syntax=docker/dockerfile-upstream:master
 
-ARG GO_VERSION=1.21
+ARG GO_VERSION=1.22
 ARG ALPINE_VERSION=3.20
 ARG XX_VERSION=1.4.0
 
diff --git a/hack/dockerfiles/archutil.Dockerfile b/hack/dockerfiles/archutil.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile-upstream:master
 
-ARG GO_VERSION=1.21
+ARG GO_VERSION=1.22
 ARG ALPINE_VERSION=3.20
 ARG DEBIAN_VERSION=trixie
 
diff --git a/hack/dockerfiles/docs.Dockerfile b/hack/dockerfiles/docs.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.21
+ARG GO_VERSION=1.22
 ARG ALPINE_VERSION=3.20
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest
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.21
+ARG GO_VERSION=1.22
 ARG DEBIAN_VERSION=bookworm
 ARG PROTOC_VERSION=3.11.4
 
diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile-upstream:master
 
-ARG GO_VERSION=1.21
+ARG GO_VERSION=1.22
 ARG ALPINE_VERSION=3.20
 ARG XX_VERSION=1.4.0
 ARG PROTOLINT_VERSION=0.45.0
diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile-upstream:master
 
-ARG GO_VERSION=1.21
+ARG GO_VERSION=1.22
 ARG ALPINE_VERSION=3.20
 ARG MODOUTDATED_VERSION=v0.9.0
 

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.21-alpine")`
	`36`	`+ goAlpine := llb.Image("docker.io/library/golang:1.22-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.21-alpine")`
	`37`	`+ goAlpine := llb.Image("docker.io/library/golang:1.22-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.21-alpine")`
	`40`	`+ goAlpine := llb.Image("docker.io/library/golang:1.22-alpine")`
`41`	`41`	`return goAlpine.`
`42`	`42`	`AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix).`
`43`	`43`	`AddEnv("GOPATH", "/go").`