Merge pull request #4589 from AkihiroSuda/dev

update containerd (2.2.0), BuildKit (0.25.2), containerd-fuse-overlayfs (2.1.7)

Author: ktock

.github/workflows/workflow-test.yml

@@ -146,7 +146,7 @@ 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.2.0-rc.0
+      containerd-version: 2.2.0
       # Note: these as for amd64
       containerd-sha: 8a7956e91a33bca10b13b196df00e73acebb7f3931e0d1456c0209139f96251b
       containerd-service-sha: 1941362cbaa89dd591b99c32b050d82c583d3cd2e5fa63085d7017457ec5fca8

Dockerfile

@@ -17,12 +17,12 @@
 
 # Basic deps
 # @BINARY: the binary checksums are verified via Dockerfile.d/SHA256SUMS.d/<COMPONENT>-<VERSION>
-ARG CONTAINERD_VERSION=v2.2.0-rc.0@870bb7c80de5f4f69952b0188154ce61dbd4115a
+ARG CONTAINERD_VERSION=v2.2.0@1c4457e00facac03ce1d75f7b6777a7a851e5c41
 ARG RUNC_VERSION=v1.3.3@d842d7719497cc3b774fd71620278ac9e17710e0
 ARG CNI_PLUGINS_VERSION=v1.8.0@BINARY
 
 # Extra deps: Build
-ARG BUILDKIT_VERSION=v0.25.1@BINARY
+ARG BUILDKIT_VERSION=v0.25.2@BINARY
 # Extra deps: Lazy-pulling
 ARG STARGZ_SNAPSHOTTER_VERSION=v0.18.0@BINARY
 # Extra deps: Encryption
@@ -34,7 +34,7 @@ ARG SLIRP4NETNS_VERSION=v1.3.3@BINARY
 ARG BYPASS4NETNS_VERSION=v0.4.2@aa04bd3dcc48c6dae6d7327ba219bda8fe2a4634
 # Extra deps: FUSE-OverlayFS
 ARG FUSE_OVERLAYFS_VERSION=v1.15@BINARY
-ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.6@BINARY
+ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.7@BINARY
 # Extra deps: Init
 ARG TINI_VERSION=v0.19.0@BINARY
 # Extra deps: Debug

Dockerfile.d/SHA256SUMS.d/buildkit-v0.25.1

@@ -0,0 +1,2 @@
+d18b8188b600e201a1b3d08c20e2a1e439cf51d2c2285f132dd9bd51c666f6d6  buildkit-v0.25.2.linux-amd64.tar.gz
+f6fd69c40bec1788d650430ede40545a47bd765922ad23456a463e88b47039cf  buildkit-v0.25.2.linux-arm64.tar.gz

Dockerfile.d/SHA256SUMS.d/buildkit-v0.25.2

@@ -0,0 +1,6 @@
+d54148043c22381af89cec2a167431e40668716404a1eb682ca69dfb890376f3  containerd-fuse-overlayfs-2.1.7-linux-amd64.tar.gz
+a301030391d51356065f628b5e6e5a5a8c55f1978289eb71d8f5284af7a81eda  containerd-fuse-overlayfs-2.1.7-linux-arm-v7.tar.gz
+94ed6c2c3bece42e0c789ea056565b64fe487de4644121ee0dfb8acd8ef9369c  containerd-fuse-overlayfs-2.1.7-linux-arm64.tar.gz
+1bfb1f86894b640781d837ec0f66997222b419532fae730579140dbc1c7ea858  containerd-fuse-overlayfs-2.1.7-linux-ppc64le.tar.gz
+9f2ef69b06229f5357f3fc23524922cea6616663ff220979a110a7742aaffee6  containerd-fuse-overlayfs-2.1.7-linux-riscv64.tar.gz
+03f61035cef5fff33c5084c55f133d0340597520d8d12112970609dff0bd1e7a  containerd-fuse-overlayfs-2.1.7-linux-s390x.tar.gz