Merge pull request #178 from crazy-max/containerd-1.7_bump-go

[containerd/1.7] bump go to 1.20.10
docker · Oct 21, 2023 · 78ce2b1 · 78ce2b1
2 parents 3262cc5 + 056f738
commit 78ce2b1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile
@@ -17,12 +17,12 @@
 ARG XX_VERSION="1.2.1"
 ARG DEBIAN_FRONTEND="noninteractive"
 
-# https://github.com/containerd/containerd/blob/main/.github/workflows/ci.yml#L132
+# https://github.com/containerd/containerd/blob/release/1.7/.github/workflows/ci.yml#L127
 ARG MD2MAN_VERSION="v2.0.2"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.20.3"
+ARG GO_VERSION="1.20.10"
 ARG GO_IMAGE_VARIANT="bullseye"
 ARG PKG_RELEASE="debian11"
 ARG PKG_TYPE="deb"

diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile
@@ -14,8 +14,8 @@
 
 include ../../common/vars.mk
 
-# https://github.com/containerd/containerd/blob/main/.github/workflows/release.yml#L16
-export GO_VERSION = 1.20.3
+# https://github.com/containerd/containerd/blob/release/1.7/.github/workflows/release.yml#L16
+export GO_VERSION = 1.20.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.20.3"
+  default = "1.20.10"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"