Skip to content

Commit f1e3904

Browse files
authored
Merge pull request #4566 from ChengyuZhu6/update
bump to containerd v2.2.0-rc.0
2 parents c3dd63f + ee2f1fa commit f1e3904

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/workflow-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ jobs:
146146
go-version: 1.25
147147
windows-cni-version: v0.3.1
148148
docker-version: 5:28.0.4-1~ubuntu.24.04~noble
149-
containerd-version: 2.1.4
149+
containerd-version: 2.2.0-rc.0
150150
# Note: these as for amd64
151-
containerd-sha: 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515
151+
containerd-sha: 8a7956e91a33bca10b13b196df00e73acebb7f3931e0d1456c0209139f96251b
152152
containerd-service-sha: 1941362cbaa89dd591b99c32b050d82c583d3cd2e5fa63085d7017457ec5fca8
153153
linux-cni-version: v1.8.0
154154
linux-cni-sha: ab3bda535f9d90766cccc90d3dddb5482003dd744d7f22bcf98186bf8eea8be6

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
# Basic deps
1919
# @BINARY: the binary checksums are verified via Dockerfile.d/SHA256SUMS.d/<COMPONENT>-<VERSION>
20-
ARG CONTAINERD_VERSION=v2.1.4@75cb2b7193e4e490e9fbdc236c0e811ccaba3376
20+
ARG CONTAINERD_VERSION=v2.2.0-rc.0@870bb7c80de5f4f69952b0188154ce61dbd4115a
2121
ARG RUNC_VERSION=v1.3.1@e6457afc48eff1ce22dece664932395026a7105e
2222
ARG CNI_PLUGINS_VERSION=v1.8.0@BINARY
2323

hack/generate-release-note.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cat <<-EOX
2525
(To be documented)
2626
2727
## Compatible containerd versions
28-
This release of nerdctl is expected to be used with containerd v1.7, v2.0, or v2.1.
28+
This release of nerdctl is expected to be used with containerd v1.7, v2.0, v2.1, or v2.2.
2929
Some features may not work with other releases of containerd.
3030
3131
## About the binaries

0 commit comments

Comments
 (0)