From 1d9b781b1a1d5eaa5f86568d7a2baa570674740d Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 8 Aug 2023 20:11:49 +0200 Subject: [PATCH 1/2] pkg(docker-cli): bump go to 1.20.7 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 712be4a7..17633e99 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.5" +ARG GO_VERSION="1.20.7" 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 11c1827f..3c3884d2 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/23.0/Dockerfile#L4 -export GO_VERSION = 1.20.5 +export GO_VERSION = 1.20.7 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 df0ad49e..3cdb8f9f 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.5" + default = "1.20.7" } variable "GO_IMAGE_VARIANT" { default = "bullseye" From 5670d1eb6e1dc01f37d1e5a902694b4585e4f262 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 8 Aug 2023 20:13:31 +0200 Subject: [PATCH 2/2] pkg(docker-engine): bump go to 1.20.7 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 4964e18f..2bb2ee68 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.5" +ARG GO_VERSION="1.20.7" 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 740af2f9..d13e085c 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/23.0/Dockerfile#L3 -export GO_VERSION = 1.20.5 +export GO_VERSION = 1.20.7 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 d9773700..a0052cb3 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.5" + default = "1.20.7" } variable "GO_IMAGE_VARIANT" { default = "bullseye"