From ee2f1fadd155a93290d6661eb0f2cec2f92b3ec7 Mon Sep 17 00:00:00 2001 From: ChengyuZhu6 Date: Fri, 31 Oct 2025 20:36:27 +0800 Subject: [PATCH] bump to containerd v2.2.0-rc.0 Signed-off-by: ChengyuZhu6 --- .github/workflows/workflow-test.yml | 4 ++-- Dockerfile | 2 +- hack/generate-release-note.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workflow-test.yml b/.github/workflows/workflow-test.yml index 54b86450877..ffe980d0a9b 100644 --- a/.github/workflows/workflow-test.yml +++ b/.github/workflows/workflow-test.yml @@ -146,9 +146,9 @@ jobs: go-version: 1.25 windows-cni-version: v0.3.1 docker-version: 5:28.0.4-1~ubuntu.24.04~noble - containerd-version: 2.1.4 + containerd-version: 2.2.0-rc.0 # Note: these as for amd64 - containerd-sha: 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515 + containerd-sha: 8a7956e91a33bca10b13b196df00e73acebb7f3931e0d1456c0209139f96251b containerd-service-sha: 1941362cbaa89dd591b99c32b050d82c583d3cd2e5fa63085d7017457ec5fca8 linux-cni-version: v1.8.0 linux-cni-sha: ab3bda535f9d90766cccc90d3dddb5482003dd744d7f22bcf98186bf8eea8be6 diff --git a/Dockerfile b/Dockerfile index d67ce6a8b04..13277e48394 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ # Basic deps # @BINARY: the binary checksums are verified via Dockerfile.d/SHA256SUMS.d/- -ARG CONTAINERD_VERSION=v2.1.4@75cb2b7193e4e490e9fbdc236c0e811ccaba3376 +ARG CONTAINERD_VERSION=v2.2.0-rc.0@870bb7c80de5f4f69952b0188154ce61dbd4115a ARG RUNC_VERSION=v1.3.1@e6457afc48eff1ce22dece664932395026a7105e ARG CNI_PLUGINS_VERSION=v1.8.0@BINARY diff --git a/hack/generate-release-note.sh b/hack/generate-release-note.sh index b4e75493397..54124b79500 100755 --- a/hack/generate-release-note.sh +++ b/hack/generate-release-note.sh @@ -25,7 +25,7 @@ cat <<-EOX (To be documented) ## Compatible containerd versions -This release of nerdctl is expected to be used with containerd v1.7, v2.0, or v2.1. +This release of nerdctl is expected to be used with containerd v1.7, v2.0, v2.1, or v2.2. Some features may not work with other releases of containerd. ## About the binaries