Merge pull request #176 from crazy-max/docker-24.0_bump-go

[docker/24.0] bump go to 1.20.10
docker · Oct 21, 2023 · 9846013 · 9846013
2 parents 6b6250e + cacdd63
commit 9846013
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile
@@ -22,7 +22,7 @@ ARG GOVERSIONINFO_VERSION="v1.3.0"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.7"
+ARG GO_VERSION="1.20.10"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"

diff --git a/pkg/docker-cli/Makefile b/pkg/docker-cli/Makefile
@@ -14,8 +14,8 @@
 
 include ../../common/vars.mk
 
-# https://github.com/docker/cli/blob/master/Dockerfile#L4
-export GO_VERSION = 1.20.7
+# https://github.com/docker/cli/blob/24.0/Dockerfile#L4
+export GO_VERSION = 1.20.10
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl

diff --git a/pkg/docker-cli/docker-bake.hcl b/pkg/docker-cli/docker-bake.hcl
@@ -34,7 +34,7 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.20.7"
+  default = "1.20.10"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"

diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile
@@ -22,7 +22,7 @@ ARG GOWINRES_VERSION="v0.3.0"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.7"
+ARG GO_VERSION="1.20.10"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"

diff --git a/pkg/docker-engine/Makefile b/pkg/docker-engine/Makefile
@@ -14,8 +14,8 @@
 
 include ../../common/vars.mk
 
-# https://github.com/moby/moby/blob/master/Dockerfile#L3
-export GO_VERSION = 1.20.7
+# https://github.com/moby/moby/blob/24.0/Dockerfile#L3
+export GO_VERSION = 1.20.10
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl

diff --git a/pkg/docker-engine/docker-bake.hcl b/pkg/docker-engine/docker-bake.hcl
@@ -34,7 +34,7 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.20.7"
+  default = "1.20.10"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"