Merge pull request #2401 from AkihiroSuda/dev

update containerd (1.7.3), runc (1.1.8), kubo (0.21.0), and test deps

Author: AkihiroSuda

.cirrus.yml

@@ -30,6 +30,9 @@ windows_task:
   matrix:
     - name: "Windows/containerd-1.7"
       env:
+        # containerd >= 1.7.2 can't pass nerdctl CI:
+        # `hcsshim::PrepareLayer failed in Win32: The parameter is incorrect. (0x57)`
+        # https://github.com/containerd/containerd/issues/8891
         ctrdVersion: 1.7.1
   env:
     CGO_ENABLED: 0

.github/workflows/test.yml

@@ -77,11 +77,11 @@ jobs:
         # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 20.04
-            containerd: v1.6.21
+            containerd: v1.6.22
           - ubuntu: 20.04
-            containerd: v1.7.1
+            containerd: v1.7.3
           - ubuntu: 22.04
-            containerd: v1.7.1
+            containerd: v1.7.3
           - ubuntu: 22.04
             containerd: main
     env:
@@ -113,25 +113,25 @@ jobs:
         # ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 20.04
-            containerd: v1.6.21
+            containerd: v1.6.22
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.7.1
+            containerd: v1.7.3
             target: test-integration-rootless
           - ubuntu: 22.04
-            containerd: v1.7.1
+            containerd: v1.7.3
             target: test-integration-rootless
           - ubuntu: 22.04
             containerd: main
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.6.21
+            containerd: v1.6.22
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 20.04
-            containerd: v1.7.1
+            containerd: v1.7.3
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
-            containerd: v1.7.1
+            containerd: v1.7.3
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
             containerd: main

Dockerfile

@@ -18,8 +18,8 @@
 # TODO: verify commit hash
 
 # Basic deps
-ARG CONTAINERD_VERSION=v1.7.1
-ARG RUNC_VERSION=v1.1.7
+ARG CONTAINERD_VERSION=v1.7.3
+ARG RUNC_VERSION=v1.1.8
 ARG CNI_PLUGINS_VERSION=v1.3.0
 
 # Extra deps: Build
@@ -37,7 +37,7 @@ ARG BYPASS4NETNS_VERSION=v0.3.0
 ARG FUSE_OVERLAYFS_VERSION=v1.12
 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.6
 # Extra deps: IPFS
-ARG KUBO_VERSION=v0.20.0
+ARG KUBO_VERSION=v0.21.0
 # Extra deps: Init
 ARG TINI_VERSION=v0.19.0
 # Extra deps: Debug
@@ -47,8 +47,8 @@ ARG BUILDG_VERSION=v0.4.1
 ARG GO_VERSION=1.20
 ARG UBUNTU_VERSION=22.04
 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
-ARG GOTESTSUM_VERSION=v1.10.0
-ARG NYDUS_VERSION=v2.2.1
+ARG GOTESTSUM_VERSION=v1.10.1
+ARG NYDUS_VERSION=v2.2.2
 ARG SOCI_SNAPSHOTTER_VERSION=0.3.0
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.2.1 AS xx

Dockerfile.d/SHA256SUMS.d/kubo-v0.20.0

@@ -0,0 +1,3 @@
+# From https://github.com/ipfs/kubo/releases
+b1897919a4f6dd299d6c73dec8e4be98f986e4071eeffaefadf921f26e271c4e  kubo_v0.21.0_linux-amd64.tar.gz
+702af7aa5dc9117e9bc32b03d13bb872105b74d361f119ce15fdad689a4f1bce  kubo_v0.21.0_linux-arm64.tar.gz