Merge pull request #168 from crazy-max/bump-go

update go
docker · Oct 21, 2023 · 8f6b98d · 8f6b98d
2 parents 07ed5b1 + f531c18
commit 8f6b98d
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 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.7
+export GO_VERSION ?= 1.21.3
 export GO_IMAGE_VARIANT ?= bullseye
 
 # if set, ony build matching the local platform

diff --git a/pkg/buildx/Dockerfile b/pkg/buildx/Dockerfile
@@ -19,7 +19,7 @@ ARG DEBIAN_FRONTEND="noninteractive"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.5"
+ARG GO_VERSION="1.21.3"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"

diff --git a/pkg/buildx/Makefile b/pkg/buildx/Makefile
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/docker/buildx/blob/master/Dockerfile#L3
-export GO_VERSION = 1.20.5
+export GO_VERSION = 1.21.3
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl

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

diff --git a/pkg/compose/Dockerfile b/pkg/compose/Dockerfile
@@ -19,7 +19,7 @@ ARG DEBIAN_FRONTEND="noninteractive"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.5"
+ARG GO_VERSION="1.21.1"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"

diff --git a/pkg/compose/Makefile b/pkg/compose/Makefile
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/docker/compose/blob/main/Dockerfile#L18
-export GO_VERSION = 1.20.5
+export GO_VERSION = 1.21.1
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl

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

diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile
@@ -22,7 +22,7 @@ ARG MD2MAN_VERSION="v2.0.2"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.5"
+ARG GO_VERSION="1.21.3"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"

diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/containerd/containerd/blob/main/.github/workflows/release.yml#L16
-export GO_VERSION = 1.20.5
+export GO_VERSION = 1.21.3
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl

diff --git a/pkg/containerd/docker-bake.hcl b/pkg/containerd/docker-bake.hcl
@@ -43,7 +43,7 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.20.5"
+  default = "1.21.3"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"

diff --git a/pkg/credential-helpers/Dockerfile b/pkg/credential-helpers/Dockerfile
@@ -20,7 +20,7 @@ ARG DEBIAN_FRONTEND="noninteractive"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.5"
+ARG GO_VERSION="1.20.6"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"

diff --git a/pkg/credential-helpers/Makefile b/pkg/credential-helpers/Makefile
@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/docker/docker-credential-helpers/blob/master/Dockerfile#L3
-export GO_VERSION = 1.20.5
+export GO_VERSION = 1.20.6
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl

diff --git a/pkg/credential-helpers/docker-bake.hcl b/pkg/credential-helpers/docker-bake.hcl
@@ -34,7 +34,7 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.20.5"
+  default = "1.20.6"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"

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.5"
+ARG GO_VERSION="1.21.3"
 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.5
+export GO_VERSION = 1.21.3
 
 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.5"
+  default = "1.21.3"
 }
 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.5"
+ARG GO_VERSION="1.21.3"
 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.5
+export GO_VERSION = 1.21.3
 
 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.5"
+  default = "1.21.3"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"