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

[containerd/1.6] bump go to 1.20.8
docker · Oct 21, 2023 · f9e45b7 · f9e45b7
2 parents 657c826 + 8d3f9b9
commit f9e45b7
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
-ARG MD2MAN_VERSION="v2.0.2"
+# https://github.com/containerd/containerd/blob/release/1.6/.github/workflows/ci.yml#L133
+ARG MD2MAN_VERSION="v2.0.1"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.19.12"
+ARG GO_VERSION="1.20.8"
 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.12
+export GO_VERSION = 1.20.8
 
 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.12"
+  default = "1.20.8"
 }
 variable "GO_IMAGE_VARIANT" {
   default = "bullseye"