Update to containerd c215531a8f63a98a69134e804fea4ee6d354bb90

This includes https://github.com/containerd/containerd/pull/994 and hence requires updating the various instances of `/etc/containerd/config.toml`. Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2025-09-13 13:49:25 +00:00 · 2017-06-14 16:35:33 +01:00
parent d51784adc0
commit 9d2da9cabc
45 changed files with 50 additions and 47 deletions
--- a/test/cases/000_build/000_outputs/test.yml
+++ b/test/cases/000_build/000_outputs/test.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"
--- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
+++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml
+++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml
+++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml
+++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml
+++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/000_qemu/100_container/test.yml
+++ b/test/cases/010_platforms/000_qemu/100_container/test.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml
+++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml
+++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: check-kernel-config
    image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1"
--- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml
+++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: check-kernel-config
    image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1"
--- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml
+++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: check-kernel-config
    image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1"
--- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml
+++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: check
    image: "kmod-test"
--- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml
+++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/test/cases/030_security/010_ports/test.yml
+++ b/test/cases/030_security/010_ports/test.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: test
    image: "alpine:3.6"
--- a/test/cases/040_packages/002_binfmt/test-binfmt.yml
+++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: binfmt
    image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765"
--- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml
+++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: test
--- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml
+++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"
--- a/test/cases/040_packages/013_mkimage/mkimage.yml
+++ b/test/cases/040_packages/013_mkimage/mkimage.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: mkimage
    image: "linuxkit/mkimage:f4bf0c24261f7d120c8674892805ab3054eb8ac3"
--- a/test/cases/040_packages/013_mkimage/run.yml
+++ b/test/cases/040_packages/013_mkimage/run.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/040_packages/019_sysctl/test-sysctl.yml
+++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: sysctl
    image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018"
--- a/test/hack/test-ltp.yml
+++ b/test/hack/test-ltp.yml
@@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: ltp
    image: "linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d"
--- a/test/hack/test.yml
+++ b/test/hack/test.yml
@@ -6,7 +6,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
-  - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
+  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
 onboot:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"