From 5c8028b7e41025bb2b36a3bbdefa29c96b70a534 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 8 Aug 2023 20:17:19 +0200 Subject: [PATCH 1/3] common: bump go to 1.20.7 Signed-off-by: CrazyMax --- common/vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/vars.mk b/common/vars.mk index 0f6cf922..da0485f0 100644 --- 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 From a2c3200345a710ff9c2ebb49a03f8281b4bf1212 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 8 Aug 2023 20:17:29 +0200 Subject: [PATCH 2/3] pkg(docker-cli): bump go to 1.20.5 Signed-off-by: CrazyMax --- pkg/docker-cli/Dockerfile | 2 +- pkg/docker-cli/Makefile | 2 +- pkg/docker-cli/docker-bake.hcl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile index 8b7b679e..712be4a7 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.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 index 3c415e2a..11cb86cb 100644 --- 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 index c7cde3c1..8aed8da3 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.3" + default = "1.20.5" } variable "GO_IMAGE_VARIANT" { default = "bullseye" From 1508ce3da39921550dd2f691077efdebd397ada9 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 8 Aug 2023 20:17:38 +0200 Subject: [PATCH 3/3] pkg(docker-engine): bump go to 1.20.5 Signed-off-by: CrazyMax --- pkg/docker-engine/Dockerfile | 2 +- pkg/docker-engine/Makefile | 2 +- pkg/docker-engine/docker-bake.hcl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile index e4158c24..4964e18f 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.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 index b4a872be..f4b6e346 100644 --- 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 index 23981361..ffac703e 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.3" + default = "1.20.5" } variable "GO_IMAGE_VARIANT" { default = "bullseye"