diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 91135d49..d2c72d63 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -17,7 +17,7 @@ ARG XX_VERSION="1.1.2" ARG DEBIAN_FRONTEND="noninteractive" -# https://github.com/containerd/containerd/blob/v1.6.14/.github/workflows/ci.yml#L125 +# https://github.com/containerd/containerd/blob/v1.6.15/.github/workflows/ci.yml#L125 ARG MD2MAN_VERSION="v2.0.1" # common args diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile index 5588afd2..dbc57580 100644 --- a/pkg/containerd/Makefile +++ b/pkg/containerd/Makefile @@ -14,21 +14,21 @@ include ../../common/vars.mk -# https://github.com/containerd/containerd/blob/v1.6.14/.github/workflows/release.yml#L9 +# https://github.com/containerd/containerd/blob/v1.6.15/.github/workflows/release.yml#L9 export GO_VERSION = 1.18.9 DESTDIR ?= $(BASEDIR)/bin BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl export CONTAINERD_REPO := $(if $(CONTAINERD_REPO),$(CONTAINERD_REPO),https://github.com/containerd/containerd.git) -export CONTAINERD_REF := $(if $(CONTAINERD_REF),$(CONTAINERD_REF),v1.6.14) +export CONTAINERD_REF := $(if $(CONTAINERD_REF),$(CONTAINERD_REF),v1.6.15) export RUNC_REPO := $(if $(RUNC_REPO),$(RUNC_REPO),https://github.com/opencontainers/runc.git) export RUNC_REF := $(if $(RUNC_REF),$(RUNC_REF),) export PKG_DEB_REVISION = 1 PKG_LIST ?= deb rpm static -# supported platforms: https://github.com/containerd/containerd/blob/v1.6.14/.github/workflows/ci.yml#L138-L156 +# supported platforms: https://github.com/containerd/containerd/blob/v1.6.15/.github/workflows/ci.yml#L138-L156 # FIXME: can't build static binaries with containerd Makefile for darwin/amd64 darwin/arm64 windows/amd64 platforms # FIXME: linux/riscv64 needs ubuntu:22.04 image # FIXME: add linux/ppc64le when a remote PowerPC instance is available (too slow with QEMU) diff --git a/pkg/containerd/deb/changelog b/pkg/containerd/deb/changelog index 5b0e9cfb..e15c2153 100644 --- a/pkg/containerd/deb/changelog +++ b/pkg/containerd/deb/changelog @@ -1,3 +1,9 @@ +containerd.io (1.6.15-1) release; urgency=medium + + * Update containerd to v1.6.15 + + -- Sebastiaan van Stijn Mon, 09 Jan 2023 12:17:39 +0000 + containerd.io (1.6.14-1) release; urgency=medium * Update containerd to v1.6.14 diff --git a/pkg/containerd/docker-bake.hcl b/pkg/containerd/docker-bake.hcl index 77080275..b5eaabd2 100644 --- a/pkg/containerd/docker-bake.hcl +++ b/pkg/containerd/docker-bake.hcl @@ -21,7 +21,7 @@ variable "CONTAINERD_REPO" { # Sets the containerd ref. variable "CONTAINERD_REF" { - default = "v1.6.14" + default = "v1.6.15" } # In case we want to set runc to a specific version instead of using diff --git a/pkg/containerd/rpm/containerd.spec b/pkg/containerd/rpm/containerd.spec index 4b1c3cc2..6355784d 100644 --- a/pkg/containerd/rpm/containerd.spec +++ b/pkg/containerd/rpm/containerd.spec @@ -163,6 +163,9 @@ done %changelog +* Mon Jan 09 2023 Sebastiaan van Stijn - 1.6.15-3.1 + - Update containerd to v1.6.15 + * Mon Dec 19 2022 Sebastiaan van Stijn - 1.6.14-3.1 - Update containerd to v1.6.14