Merge pull request #2778 from AkihiroSuda/dev

update containerd (1.7.13), runc (1.1.12), bypass4netns (0.4.0), Kubo (0.26.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.26
+            containerd: v1.6.28
           - ubuntu: 20.04
-            containerd: v1.7.11
+            containerd: v1.7.13
           - ubuntu: 22.04
-            containerd: v1.7.11
+            containerd: v1.7.13
           - ubuntu: 22.04
             containerd: main
     env:
@@ -113,7 +113,7 @@ jobs:
         # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 22.04
-            containerd: v1.7.11
+            containerd: v1.7.13
     env:
       UBUNTU_VERSION: "${{ matrix.ubuntu }}"
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -157,31 +157,31 @@ jobs:
         # ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 20.04
-            containerd: v1.6.26
+            containerd: v1.6.28
             rootlesskit: v1.1.1
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.7.11
+            containerd: v1.7.13
             rootlesskit: v2.0.0
             target: test-integration-rootless
           - ubuntu: 22.04
-            containerd: v1.7.11
+            containerd: v1.7.13
             rootlesskit: v1.1.1
             target: test-integration-rootless
           - ubuntu: 22.04
             containerd: main
             rootlesskit: v2.0.0
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.6.26
+            containerd: v1.6.28
             rootlesskit: v1.1.1
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 20.04
-            containerd: v1.7.11
+            containerd: v1.7.13
             rootlesskit: v2.0.0
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
-            containerd: v1.7.11
+            containerd: v1.7.13
             rootlesskit: v1.1.1
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
@@ -275,15 +275,15 @@ jobs:
       - uses: actions/[email protected]
         with:
           repository: containerd/containerd
-          ref: v1.7.11
+          ref: v1.7.13
           path: containerd
           fetch-depth: 1
       - name: "Set up CNI"
         working-directory: containerd
         run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
       - name: "Set up containerd"
         env:
-          ctrdVersion: 1.7.11
+          ctrdVersion: 1.7.13
         run: powershell hack/configure-windows-ci.ps1
       # TODO: Run unit tests
       - name: "Run integration tests"

Dockerfile

@@ -18,8 +18,8 @@
 # TODO: verify commit hash
 
 # Basic deps
-ARG CONTAINERD_VERSION=v1.7.11
-ARG RUNC_VERSION=v1.1.11
+ARG CONTAINERD_VERSION=v1.7.13
+ARG RUNC_VERSION=v1.1.12
 ARG CNI_PLUGINS_VERSION=v1.4.0
 
 # Extra deps: Build
@@ -32,12 +32,12 @@ ARG IMGCRYPT_VERSION=v1.1.9
 ARG ROOTLESSKIT_VERSION=v2.0.0
 ARG SLIRP4NETNS_VERSION=v1.2.2
 # Extra deps: bypass4netns
-ARG BYPASS4NETNS_VERSION=v0.3.0
+ARG BYPASS4NETNS_VERSION=v0.4.0
 # Extra deps: FUSE-OverlayFS
 ARG FUSE_OVERLAYFS_VERSION=v1.13
 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8
 # Extra deps: IPFS
-ARG KUBO_VERSION=v0.24.0
+ARG KUBO_VERSION=v0.26.0
 # Extra deps: Init
 ARG TINI_VERSION=v0.19.0
 # Extra deps: Debug