From f9e07a80c3fa89745328c868be669c0edbca0013 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 6 Aug 2023 14:44:46 +0200 Subject: [PATCH 1/2] common: bump go to 1.19.12 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 d40962e3..7174a5c2 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.19.8 +export GO_VERSION ?= 1.19.12 export GO_IMAGE_VARIANT ?= bullseye # if set, ony build matching the local platform From c3f1ec41b00ffc6c1defa82c6c52a3297c09d4ad Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 6 Aug 2023 14:45:09 +0200 Subject: [PATCH 2/2] pkg(containerd): bump go to 1.19.10 Signed-off-by: CrazyMax --- pkg/containerd/Dockerfile | 2 +- pkg/containerd/Makefile | 2 +- pkg/containerd/docker-bake.hcl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 45ce4767..53c142e7 100644 --- 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.19.8" +ARG GO_VERSION="1.19.10" ARG GO_IMAGE_VARIANT="bullseye" ARG PKG_RELEASE="debian11" ARG PKG_TYPE="deb" diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile index 1ebe917c..3429dd3e 100644 --- a/pkg/containerd/Makefile +++ b/pkg/containerd/Makefile @@ -15,7 +15,7 @@ include ../../common/vars.mk # https://github.com/containerd/containerd/blob/release/1.6/.github/workflows/release.yml#L9 -export GO_VERSION = 1.19.8 +export GO_VERSION = 1.19.10 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 index 46c193f9..e8d6dd97 100644 --- 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.19.8" + default = "1.19.10" } variable "GO_IMAGE_VARIANT" { default = "bullseye"