From 8535d0a7df331ed9a525420a2e070f916042cbaa Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sat, 21 Oct 2023 21:13:28 +0200 Subject: [PATCH 1/2] pkg(docker-cli): bump go to 1.20.10 Signed-off-by: CrazyMax --- pkg/docker-cli/Dockerfile | 2 +- pkg/docker-cli/Makefile | 4 ++-- pkg/docker-cli/docker-bake.hcl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile index 5f811f59..81522ea9 100644 --- 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 index 81d9c8cd..a37b733f 100644 --- 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 index 1b194df1..8ede9a6e 100644 --- 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" From cacdd6307832b4993c9954dc8d92e07e8499236e Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sat, 21 Oct 2023 21:13:38 +0200 Subject: [PATCH 2/2] pkg(docker-engine): bump go to 1.20.10 Signed-off-by: CrazyMax --- pkg/docker-engine/Dockerfile | 2 +- pkg/docker-engine/Makefile | 4 ++-- pkg/docker-engine/docker-bake.hcl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile index e1743d44..0597b6c0 100644 --- 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 index fbef8e6c..a191f82f 100644 --- 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 index 15cf99bb..135f2a5a 100644 --- 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"