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

[docker/24.0] bump go
docker · Aug 8, 2023 · ac7d9fc · ac7d9fc
2 parents bb13ceb + 1508ce3
commit ac7d9fc
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/common/vars.mk b/common/vars.mk
@@ -16,7 +16,7 @@ export BASEDIR ?= $(CURDIR)
 
 # go base image
 export GO_IMAGE ?= golang
-export GO_VERSION ?= 1.20.3
+export GO_VERSION ?= 1.20.7
 export GO_IMAGE_VARIANT ?= bullseye
 
 # if set, ony build matching the local platform

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.3"
+ARG GO_VERSION="1.20.5"
 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
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/docker/cli/blob/master/Dockerfile#L4
-export GO_VERSION = 1.20.3
+export GO_VERSION = 1.20.5
 
 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.3"
+  default = "1.20.5"
 }
 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.3"
+ARG GO_VERSION="1.20.5"
 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
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/moby/moby/blob/master/Dockerfile#L3
-export GO_VERSION = 1.20.3
+export GO_VERSION = 1.20.5
 
 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.3"
+  default = "1.20.5"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"