From 54be4048f0bdd4cbf36bde5adcf1f07e1c296d5e Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Mon, 19 Oct 2020 17:26:25 +0300 Subject: [PATCH 1/2] fix reversed equals error Signed-off-by: Avi Deitcher --- pkg/init/cmd/service/system_init.go | 2 +- .../040_packages/020_init_containerd/check.sh | 13 +++++++++ .../040_packages/020_init_containerd/test.sh | 24 ++++++++++++++++ .../040_packages/020_init_containerd/test.yml | 28 +++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 test/cases/040_packages/020_init_containerd/check.sh create mode 100644 test/cases/040_packages/020_init_containerd/test.sh create mode 100644 test/cases/040_packages/020_init_containerd/test.yml diff --git a/pkg/init/cmd/service/system_init.go b/pkg/init/cmd/service/system_init.go index 21670b78b..58a404524 100644 --- a/pkg/init/cmd/service/system_init.go +++ b/pkg/init/cmd/service/system_init.go @@ -85,7 +85,7 @@ func systemInitCmd(ctx context.Context, args []string) { // look for containerd options ctrdArgs := []string{} - if b, err := ioutil.ReadFile(containerdOptsFile); err != nil { + if b, err := ioutil.ReadFile(containerdOptsFile); err == nil { ctrdArgs = strings.Fields(string(b)) } diff --git a/test/cases/040_packages/020_init_containerd/check.sh b/test/cases/040_packages/020_init_containerd/check.sh new file mode 100644 index 000000000..9e62043e2 --- /dev/null +++ b/test/cases/040_packages/020_init_containerd/check.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +function failed { + printf "containerd commandline vars not set: FAILED\n" >/dev/console + /sbin/poweroff -f + exit 1 +} + +ps -ef | grep containerd | grep -q trace || failed + +printf "containerd commandline vars test suite PASSED\n" >/dev/console + +/sbin/poweroff -f diff --git a/test/cases/040_packages/020_init_containerd/test.sh b/test/cases/040_packages/020_init_containerd/test.sh new file mode 100644 index 000000000..46203e684 --- /dev/null +++ b/test/cases/040_packages/020_init_containerd/test.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# SUMMARY: Check that the containerd command-line options have been enabled by init +# LABELS: +# REPEAT: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" +NAME=init_containerd + +clean_up() { + rm -rf ${NAME}-* +} +trap clean_up EXIT + +# Test code goes here +linuxkit build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run $NAME)" +echo "${RESULT}" +echo "${RESULT}" | grep -q "suite PASSED" + +exit 0 diff --git a/test/cases/040_packages/020_init_containerd/test.yml b/test/cases/040_packages/020_init_containerd/test.yml new file mode 100644 index 000000000..adb612cbd --- /dev/null +++ b/test/cases/040_packages/020_init_containerd/test.yml @@ -0,0 +1,28 @@ +kernel: + image: linuxkit/kernel:5.4.39 + cmdline: "console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a + - linuxkit/runc:v0.8 + - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f + - linuxkit/ca-certificates:v0.8 +services: + - name: test + image: alpine:3.11 + pid: host + binds: + - /check.sh:/check.sh + - /dev/console:/dev/console + capabilities: + - CAP_SYS_BOOT + command: ["sh", "/check.sh"] +files: + - path: check.sh + source: ./check.sh + - path: /etc/containerd/cli-opts + contents: "--log-level trace" +trust: + org: + - linuxkit + image: + - alpine:3.11 From 279ee46f395049e3f55598e55bdee733c7eee078 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Mon, 19 Oct 2020 17:29:19 +0300 Subject: [PATCH 2/2] update hashes for pkg/init Signed-off-by: Avi Deitcher --- examples/addbinds.yml | 2 +- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/cadvisor.yml | 2 +- examples/dm-crypt-loop.yml | 2 +- examples/dm-crypt.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/hetzner.yml | 2 +- examples/hostmount-writeable-overlay.yml | 2 +- examples/influxdb-os.yml | 2 +- examples/logging.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/openstack.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/rt-for-vmware.yml | 2 +- examples/scaleway.yml | 2 +- examples/sshd.yml | 2 +- examples/static-ip.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd-containerd.yml | 2 +- examples/vultr.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- projects/clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/landlock/landlock.yml | 2 +- projects/memorizer/memorizer.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/okernel/examples/okernel_simple.yaml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- src/cmd/linuxkit/moby/linuxkit.go | 2 +- test/cases/000_build/000_formats/test.yml | 2 +- test/cases/000_build/010_reproducible/test.yml | 2 +- test/cases/000_build/020_binds/test.yml | 2 +- .../cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/000_qemu/005_run_kernel+squashfs/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_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- .../010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- test/cases/010_platforms/110_gcp/000_run/test.yml | 2 +- test/cases/020_kernel/002_config_4.14.x/test.yml | 2 +- test/cases/020_kernel/005_config_4.19.x/test.yml | 2 +- test/cases/020_kernel/011_config_5.4.x/test.yml | 2 +- test/cases/020_kernel/012_config_5.6.x/test.yml | 2 +- test/cases/020_kernel/102_kmod_4.14.x/test.yml | 2 +- test/cases/020_kernel/105_kmod_4.19.x/test.yml | 2 +- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 2 +- test/cases/020_kernel/112_kmod_5.6.x/test.yml | 2 +- test/cases/020_kernel/200_namespace/common.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/002_bpftrace/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/000_simple/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/001_luks/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/002_key/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test-create.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- test/cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../cases/040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../040_packages/006_format_mount/005_by_device_force/test.yml | 2 +- test/cases/040_packages/006_format_mount/006_gpt/test.yml | 2 +- test/cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- test/cases/040_packages/008_metadata/000_cidata/test.yml | 2 +- test/cases/040_packages/012_losetup/test.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.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 2 +- test/cases/040_packages/030_logwrite/test.yml | 2 +- test/cases/040_packages/031_kmsg/test.yml | 2 +- test/cases/040_packages/032_bcc/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- test/pkg/ns/template.yml | 2 +- 105 files changed, 105 insertions(+), 105 deletions(-) diff --git a/examples/addbinds.yml b/examples/addbinds.yml index 8c9b5cae3..ed9c9f21e 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 diff --git a/examples/aws.yml b/examples/aws.yml index 1fc0fc1fa..f5242d9f1 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/azure.yml b/examples/azure.yml index bf776d105..fdcd6c604 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 2d1d69672..e9c4a26ce 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index b92792a19..221e002b4 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index 538e61fae..c169a39a2 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index ac11c55c0..b4b3da003 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -4,7 +4,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:v0.8 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/docker.yml b/examples/docker.yml index 479b49f5f..8de9eb3d8 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/gcp.yml b/examples/gcp.yml index b7d7d63e3..d10bce601 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/getty.yml b/examples/getty.yml index 610a8a18a..097431c0d 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/hetzner.yml b/examples/hetzner.yml index 3b8d3448c..5a0ece1c1 100644 --- a/examples/hetzner.yml +++ b/examples/hetzner.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 2a728c1eb..0dc1b54a5 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index baace2c63..9fc03007b 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/logging.yml b/examples/logging.yml index e98de22af..62d7a8367 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/minimal.yml b/examples/minimal.yml index 2e778908d..48ce438bd 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 15812e7a0..a05c14e04 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f services: diff --git a/examples/openstack.yml b/examples/openstack.yml index ef6e3f7ca..73cdc8767 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/packet.yml b/examples/packet.yml index 5594f63f0..6876b4256 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index e115a6df1..91110bbb9 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f onboot: diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index e444cc0d0..ebe292d55 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.28-rt cmdline: "console=tty0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/scaleway.yml b/examples/scaleway.yml index 73c5db2ac..90562e500 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/sshd.yml b/examples/sshd.yml index e588e7358..7896ba77e 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 1059af382..67c5cb1d3 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f onboot: diff --git a/examples/swap.yml b/examples/swap.yml index 117cd696d..47e5e45b5 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/tpm.yml b/examples/tpm.yml index b18cf565f..dd6134a3b 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/vmware.yml b/examples/vmware.yml index 7378dcbf8..b797b2d7d 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index f3febd665..3453c095f 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f onboot: diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 89cbb046b..8e650eb3b 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f onboot: diff --git a/examples/vultr.yml b/examples/vultr.yml index 8046c71c6..17ba4f7fb 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index f5f6ff327..a93f59fae 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/linuxkit.yml b/linuxkit.yml index 9f3c6a8f6..cf6248702 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 6b372f09f..88ea66aec 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-clear-containers:4.9.x cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 3b425624a..fe2b7a6c4 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index bc934e414..4af1877b8 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 042f81945..2f580ed7d 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index b31506e76..129606a46 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: mobylinux/kernel-landlock:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 934ff807a..368511dbe 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index bef690f00..5e3ec78f8 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 5e0942245..77b48ff2e 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index e7e0f4b99..3b5173df5 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,7 +2,7 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index d43ccb427..27963ea1a 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,7 +2,7 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index bb159bb83..38df6c8f0 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -17,7 +17,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: mkimage diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 33385d035..abacb6c0e 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: dhcpcd diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 77ccaaa5b..a9d3d8662 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index 4f1f7f743..e4783de7c 100644 --- a/test/cases/000_build/020_binds/test.yml +++ b/test/cases/000_build/020_binds/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 onboot: - name: mount diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index bfa5b5e10..385c1dccc 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index bfa5b5e10..385c1dccc 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff 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 b25a730e8..fd705c27e 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:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff 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 2d8c416d1..5ba1c586a 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:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 2d8c416d1..5ba1c586a 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 2d8c416d1..5ba1c586a 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 2d8c416d1..5ba1c586a 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff 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 c65db6741..b6664930d 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:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 2d8c416d1..5ba1c586a 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 2d8c416d1..5ba1c586a 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index c14e53dcd..d46617e62 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f services: diff --git a/test/cases/010_platforms/110_gcp/000_run/test.yml b/test/cases/010_platforms/110_gcp/000_run/test.yml index 2d8c416d1..5ba1c586a 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff diff --git a/test/cases/020_kernel/002_config_4.14.x/test.yml b/test/cases/020_kernel/002_config_4.14.x/test.yml index 68ae23bc2..aa2b99b92 100644 --- a/test/cases/020_kernel/002_config_4.14.x/test.yml +++ b/test/cases/020_kernel/002_config_4.14.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.179 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/005_config_4.19.x/test.yml b/test/cases/020_kernel/005_config_4.19.x/test.yml index d93affcaf..8c3c6cfde 100644 --- a/test/cases/020_kernel/005_config_4.19.x/test.yml +++ b/test/cases/020_kernel/005_config_4.19.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.19.121 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/011_config_5.4.x/test.yml b/test/cases/020_kernel/011_config_5.4.x/test.yml index 337b74de7..5a52b4494 100644 --- a/test/cases/020_kernel/011_config_5.4.x/test.yml +++ b/test/cases/020_kernel/011_config_5.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/012_config_5.6.x/test.yml b/test/cases/020_kernel/012_config_5.6.x/test.yml index b3111d74e..a1d019719 100644 --- a/test/cases/020_kernel/012_config_5.6.x/test.yml +++ b/test/cases/020_kernel/012_config_5.6.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.6.11 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/102_kmod_4.14.x/test.yml b/test/cases/020_kernel/102_kmod_4.14.x/test.yml index 39585f3e2..4e64b37cb 100644 --- a/test/cases/020_kernel/102_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/102_kmod_4.14.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.179 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: check diff --git a/test/cases/020_kernel/105_kmod_4.19.x/test.yml b/test/cases/020_kernel/105_kmod_4.19.x/test.yml index 1a72e6cd6..a05d5480c 100644 --- a/test/cases/020_kernel/105_kmod_4.19.x/test.yml +++ b/test/cases/020_kernel/105_kmod_4.19.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.19.121 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: check diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.yml b/test/cases/020_kernel/111_kmod_5.4.x/test.yml index 94438fecf..5c6b00528 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.yml +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: check diff --git a/test/cases/020_kernel/112_kmod_5.6.x/test.yml b/test/cases/020_kernel/112_kmod_5.6.x/test.yml index 72806ddcd..56e27af48 100644 --- a/test/cases/020_kernel/112_kmod_5.6.x/test.yml +++ b/test/cases/020_kernel/112_kmod_5.6.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.6.11 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: check diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index 34c11e9a9..81579ddb3 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 trust: org: diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 769b27ffe..678a0a602 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 2250a9b32..30151f5ab 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:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 1899a86e5..3c120c60d 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: binfmt diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index d5f4d5764..ac5c81f8c 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/bpftrace:v0.8 onboot: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 4a4d1717f..a3c72cf27 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/ca-certificates:v0.8 onboot: diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index e0fff2fb4..6a3ac00a7 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 47ccd79cc..61f620b71 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index fe1e95eff..1f5cb131d 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: dm-crypt diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index 69c764e75..b4a73daf9 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: dm-crypt diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index b68b9873b..5313a248e 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: dm-crypt diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 26f8a0c1f..a30aa1bb7 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: format diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index 31b285bc1..f7c20330f 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 14609961b..fb44cfed5 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 7da3d03d0..c3b6caa2c 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index ebc242f08..1bf94fb08 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: format diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 598ee6dbf..f197eaa43 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/003_gpt/test-create.yml b/test/cases/040_packages/005_extend/003_gpt/test-create.yml index 82ce094b2..c95adfdca 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test-create.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: format diff --git a/test/cases/040_packages/005_extend/003_gpt/test.yml b/test/cases/040_packages/005_extend/003_gpt/test.yml index 31b285bc1..f7c20330f 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: extend diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index ca0633de2..52d1d6400 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 5d4de6ffa..d9b78fa33 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 79c99de2b..b4a24dba2 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index b86a594ac..9e6a4f267 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: modprobe diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index d4afbb5e3..a1489ca38 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index 1c2aaa374..e525994eb 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.yml b/test/cases/040_packages/006_format_mount/006_gpt/test.yml index c69129b71..c34a33830 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 96937c01b..75d14907c 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: format diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index a28500aef..34bd84913 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.yml b/test/cases/040_packages/008_metadata/000_cidata/test.yml index f0205fca4..9cbd081d4 100644 --- a/test/cases/040_packages/008_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/008_metadata/000_cidata/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: metadata diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index db2d54fd5..27182ebff 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: losetup diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 2f6538100..118664617 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:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 6d9c24735..fc49df8e6 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:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 47012071c..99a70755a 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 86c471ef7..ee8ba8b4e 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index 47e42159a..705559003 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 5d257a24b..23575c380 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f - linuxkit/ca-certificates:v0.8 diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index ce2864584..811c24632 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/kernel-bcc:5.4.39 onboot: diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 22aa093fe..6599afa5c 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 854e31aa9..caa11e5af 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 00f0b29a2..f9a5f817f 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde + - linuxkit/init:4f6508f4f35b134dda3807bb5d75c117c193a86a - linuxkit/runc:v0.8 onboot: - name: test-ns