From d51784adc0b9af5d8d511f1a2681a906f6dfeec8 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 14 Jun 2017 16:21:08 +0100 Subject: [PATCH] Allow /etc/init.d/010-containerd to exit when complete Don't think there is a need for it to remain and it drops an unnecessary process. Signed-off-by: Ian Campbell --- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd.yml | 2 +- linuxkit.yml | 2 +- pkg/init/etc/init.d/010-containerd | 2 -- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- test/cases/000_build/000_outputs/test.yml | 2 +- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml | 2 +- test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/010_kmod_4.9.x/kmod.yml | 2 +- test/cases/030_security/000_docker-bench/test-docker-bench.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test-binfmt.yml | 2 +- .../040_packages/003_ca-certificates/test-ca-certificates.yml | 2 +- test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test-sysctl.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- 40 files changed, 39 insertions(+), 41 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index b77134b6c..3ac140316 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/azure.yml b/examples/azure.yml index 8da1a180d..d0592d491 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/docker.yml b/examples/docker.yml index d0a434eb6..249885995 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/gcp.yml b/examples/gcp.yml index 99f8d3d34..6ca78dbdc 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/getty.yml b/examples/getty.yml index 1323e3061..810d3963a 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/minimal.yml b/examples/minimal.yml index b666d3a72..8995df9f7 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index c46ea5ada..a415eedbd 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 services: diff --git a/examples/packet.yml b/examples/packet.yml index 7f199bd63..33417cb67 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS1 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 70dceb424..96782d3b4 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index ddd01a706..54a027b24 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/swap.yml b/examples/swap.yml index 66e3e1f34..f3690e39b 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/vmware.yml b/examples/vmware.yml index 26866f3bc..16043b98b 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 8f03a3281..8f19451bd 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 4cc680ef4..199783c54 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/linuxkit.yml b/linuxkit.yml index b9fe5e4f4..5e2453b78 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/pkg/init/etc/init.d/010-containerd b/pkg/init/etc/init.d/010-containerd index 3fdb3c994..8ec251290 100755 --- a/pkg/init/etc/init.d/010-containerd +++ b/pkg/init/etc/init.d/010-containerd @@ -39,5 +39,3 @@ then service start "$(basename $f)" done fi - -wait diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 29a195a77..ffa64d8df 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 433c94113..121b7e402 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index b0a368e76..2609a226f 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 964d86d61..f2cd97370 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 7050d53a1..66901cb21 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 964d86d61..f2cd97370 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index 964d86d61..f2cd97370 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index 964d86d61..f2cd97370 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 499ba1fa1..db6bbc3d2 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index 964d86d61..f2cd97370 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git 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 index 8beb31bb8..0fd638238 100644 --- 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 @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.4.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git 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 index 8c29050d8..19177bf92 100644 --- 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 @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git 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 index 2b3719158..7aa66c238 100644 --- 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 @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.11.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml index 7b2d2ea47..1dce3fd7a 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml index b804002e6..dab5d199b 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 9caaefaa9..25b6382ae 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index 3bacf42c1..d270ead2f 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml index 4eda60511..116a45671 100644 --- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml +++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index a7d92c0f3..c3e7b5a15 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 5c68b678f..e4a012877 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index b892e8be4..2beca3c5f 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index 525994903..bd4da4d1f 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index d6208cbee..ea2c5c1c3 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 3d5adf48b..ea67b199a 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26 onboot: