Merge pull request #153 from crazy-max/containerd-1.6_bump-go

[containerd/1.6] bump go
docker · Aug 6, 2023 · 5033164 · 5033164
2 parents 542e69b + c3f1ec4
commit 5033164
Show file tree

Hide file tree

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

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.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
@@ -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
@@ -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"