Merge pull request #4064 from deitch/containerd-config-2

containerd config.toml v2
2025-07-19 09:16:29 +00:00 · 2024-07-19 09:54:34 +03:00 · 2024-07-19 09:54:34 +03:00 · fa08581fd5
commit fa08581fd5
parent d68494ba4b d665a978a1
57 changed files with 61 additions and 57 deletions
--- a/examples/addbinds.yml
+++ b/examples/addbinds.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/cadvisor.yml
+++ b/examples/cadvisor.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/containerd-debug.yml
+++ b/examples/containerd-debug.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/dm-crypt-loop.yml
+++ b/examples/dm-crypt-loop.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/dm-crypt.yml
+++ b/examples/dm-crypt.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/docker-for-mac.yml
+++ b/examples/docker-for-mac.yml
@ -6,7 +6,7 @@ init:
  - linuxkit/vpnkit-expose-port:77e45e4681c78d59f1d8a48818260948d55f9d05 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  # support metadata for optional config in /run/config
--- a/examples/docker.yml
+++ b/examples/docker.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/getty.yml
+++ b/examples/getty.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/hostmount-writeable-overlay.yml
+++ b/examples/hostmount-writeable-overlay.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/influxdb-os.yml
+++ b/examples/influxdb-os.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: dhcpcd
--- a/examples/logging.yml
+++ b/examples/logging.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
  - linuxkit/memlogd:cb79fd19e6485cfc61b85c607ca172cd860554c5
 onboot:
--- a/examples/minimal.yml
+++ b/examples/minimal.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee
--- a/examples/node_exporter.yml
+++ b/examples/node_exporter.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 services:
  - name: getty
    image: linuxkit/getty:5d86a2ce2d890c14ab66b13638dcadf74f29218b
--- a/examples/openstack.yml
+++ b/examples/openstack.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/platform-aws.yml
+++ b/examples/platform-aws.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/platform-azure.yml
+++ b/examples/platform-azure.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/platform-equinixmetal.yml
+++ b/examples/platform-equinixmetal.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
  - linuxkit/firmware:8def159583422181ddee3704f7024ecb9c02d348
 onboot:
--- a/examples/platform-gcp.yml
+++ b/examples/platform-gcp.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/platform-hetzner.yml
+++ b/examples/platform-hetzner.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
  - linuxkit/firmware:8def159583422181ddee3704f7024ecb9c02d348
 onboot:
--- a/examples/platform-rt-for-vmware.yml
+++ b/examples/platform-rt-for-vmware.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/platform-scaleway.yml
+++ b/examples/platform-scaleway.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/platform-vmware.yml
+++ b/examples/platform-vmware.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/platform-vultr.yml
+++ b/examples/platform-vultr.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/redis-os.yml
+++ b/examples/redis-os.yml
@ -6,7 +6,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee
--- a/examples/sshd.yml
+++ b/examples/sshd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/static-ip.yml
+++ b/examples/static-ip.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: ip
    image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252
--- a/examples/swap.yml
+++ b/examples/swap.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/tpm.yml
+++ b/examples/tpm.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/examples/vpnkit-forwarder.yml
+++ b/examples/vpnkit-forwarder.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee
--- a/examples/vsudd-containerd.yml
+++ b/examples/vsudd-containerd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee
--- a/examples/wireguard.yml
+++ b/examples/wireguard.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/linuxkit.yml
+++ b/linuxkit.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/pkg/containerd/etc/containerd/config.toml
+++ b/pkg/containerd/etc/containerd/config.toml
@ -1,6 +1,10 @@
+version = 2
 state = "/run/containerd"
 root = "/var/lib/containerd"
-disabled_plugins = ["cri"]
+
+
+[plugins."io.containerd.grpc.v1.cri"]
+  disabled = true

 [grpc]
  address = "/run/containerd/containerd.sock"
--- a/projects/compose/compose-dynamic.yml
+++ b/projects/compose/compose-dynamic.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/projects/compose/compose-static.yml
+++ b/projects/compose/compose-static.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/projects/ima-namespace/ima-namespace.yml
+++ b/projects/ima-namespace/ima-namespace.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
  - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29
 onboot:
--- a/projects/memorizer/memorizer.yml
+++ b/projects/memorizer/memorizer.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee
--- a/projects/miragesdk/examples/fdd.yml
+++ b/projects/miragesdk/examples/fdd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
  - samoht/fdd
 onboot:
--- a/projects/miragesdk/examples/mirage-dhcp.yml
+++ b/projects/miragesdk/examples/mirage-dhcp.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: sysctl
    image: linuxkit/sysctl:5a374e4bf3e5a7deeacff6571d0f30f7ea8f56db
--- a/projects/okernel/examples/okernel_simple.yaml
+++ b/projects/okernel/examples/okernel_simple.yaml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/projects/shiftfs/shiftfs.yml
+++ b/projects/shiftfs/shiftfs.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/test/cases/000_build/001_tarheaders/test.yml
+++ b/test/cases/000_build/001_tarheaders/test.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435

 onboot:
  - name: dhcpcd
--- a/test/cases/000_build/010_reproducible/test.yml
+++ b/test/cases/000_build/010_reproducible/test.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435

 onboot:
  - name: dhcpcd
--- a/test/cases/000_build/050_sbom/test.yml
+++ b/test/cases/000_build/050_sbom/test.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435

 onboot:
  - name: package1
--- a/test/cases/000_build/060_input_tar/000_build/test1.yml
+++ b/test/cases/000_build/060_input_tar/000_build/test1.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: sysctl
    image: linuxkit/sysctl:5a374e4bf3e5a7deeacff6571d0f30f7ea8f56db
--- a/test/cases/000_build/060_input_tar/000_build/test2.yml
+++ b/test/cases/000_build/060_input_tar/000_build/test2.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/test/cases/000_build/060_input_tar/010_same_filename/test.yml
+++ b/test/cases/000_build/060_input_tar/010_same_filename/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: sysctl
    image: linuxkit/sysctl:5a374e4bf3e5a7deeacff6571d0f30f7ea8f56db
--- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
+++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 services:
  - name: acpid
    image: linuxkit/acpid:3b1560c81d3884e049ebbd9d9bf94ccb394e6cd3
--- a/test/cases/030_security/000_docker-bench/test.yml
+++ b/test/cases/030_security/000_docker-bench/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: sysctl
--- a/test/cases/040_packages/003_containerd/test.yml
+++ b/test/cases/040_packages/003_containerd/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: dhcpcd
--- a/test/cases/040_packages/007_getty-containerd/test.yml
+++ b/test/cases/040_packages/007_getty-containerd/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: dhcpcd
--- a/test/cases/040_packages/009_init_containerd/test.yml
+++ b/test/cases/040_packages/009_init_containerd/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 services:
  - name: test
--- a/test/cases/040_packages/011_kmsg/test.yml
+++ b/test/cases/040_packages/011_kmsg/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
  - linuxkit/memlogd:cb79fd19e6485cfc61b85c607ca172cd860554c5
 services:
--- a/test/cases/040_packages/012_logwrite/test.yml
+++ b/test/cases/040_packages/012_logwrite/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
  - linuxkit/memlogd:cb79fd19e6485cfc61b85c607ca172cd860554c5
 services:
--- a/test/cases/040_packages/023_wireguard/test.yml
+++ b/test/cases/040_packages/023_wireguard/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
  - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
  - name: dhcpcd
--- a/test/hack/test-ltp.yml
+++ b/test/hack/test-ltp.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: ltp
    image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd
--- a/test/hack/test.yml
+++ b/test/hack/test.yml
@ -6,7 +6,7 @@ kernel:
 init:
  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
  - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee