From 2af30c55037ca056a64fe35c6ac9af3c7b33e0a0 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 22 Aug 2024 15:03:27 +0300 Subject: [PATCH] support cmdline-driven debugging mode for runc Signed-off-by: Avi Deitcher --- docs/cmdline.md | 15 ++++++++ docs/yaml.md | 3 ++ examples/addbinds.yml | 2 +- examples/cadvisor.yml | 2 +- examples/containerd-debug.yml | 2 +- examples/dm-crypt-loop.yml | 2 +- examples/dm-crypt.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- examples/getty.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/platform-aws.yml | 2 +- examples/platform-azure.yml | 2 +- examples/platform-equinixmetal.yml | 2 +- examples/platform-gcp.yml | 2 +- examples/platform-hetzner.yml | 2 +- examples/platform-rt-for-vmware.yml | 2 +- examples/platform-scaleway.yml | 2 +- examples/platform-vmware.yml | 2 +- examples/platform-vultr.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/static-ip.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/volumes.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd-containerd.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- pkg/init/cmd/service/runc.go | 38 +++++++++++++++++-- .../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/build/mkimage.yaml | 2 +- test/cases/000_build/000_formats/test.yml | 2 +- test/cases/000_build/001_tarheaders/test.yml | 2 +- .../cases/000_build/010_reproducible/test.yml | 2 +- test/cases/000_build/020_binds/test.yml | 2 +- test/cases/000_build/050_sbom/test.yml | 2 +- .../060_input_tar/000_build/test1.yml | 2 +- .../060_input_tar/000_build/test2.yml | 2 +- .../060_input_tar/010_same_filename/test.yml | 2 +- .../070_volumes/000_rw_on_rw/test.yml | 2 +- .../070_volumes/001_ro_on_ro/test.yml | 2 +- .../070_volumes/002_rw_on_ro/test.yml | 2 +- .../070_volumes/003_ro_on_rw/test.yml | 2 +- .../000_build/070_volumes/004_blank/test.yml | 2 +- .../000_build/070_volumes/005_image/test.yml | 2 +- .../070_volumes/006_mount_types/test.yml | 2 +- .../000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../000_qemu/005_run_kernel+squashfs/test.yml | 2 +- .../000_qemu/010_run_iso/test.yml | 2 +- .../000_qemu/020_run_efi/test.yml | 2 +- .../000_qemu/030_run_qcow_bios/test.yml | 2 +- .../000_qemu/040_run_raw_bios/test.yml | 2 +- .../000_qemu/050_run_aws/test.yml | 2 +- .../000_qemu/100_container/test.yml | 2 +- .../000_run_kernel+initrd/test.yml | 2 +- .../005_run_kernel+squashfs/test.yml | 2 +- .../010_hyperkit/010_acpi/test.yml | 2 +- .../010_platforms/110_gcp/000_run/test.yml | 2 +- .../020_kernel/011_config_5.4.x/test.yml | 2 +- .../020_kernel/013_config_5.10.x/test.yml | 2 +- .../020_kernel/016_config_5.15.x/test.yml | 2 +- .../020_kernel/019_config_6.6.x/test.yml | 2 +- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 2 +- .../cases/020_kernel/113_kmod_5.10.x/test.yml | 2 +- .../cases/020_kernel/116_kmod_5.15.x/test.yml | 2 +- test/cases/020_kernel/119_kmod_6.6.x/test.yml | 2 +- .../cases/020_kernel/200_namespace/common.yml | 2 +- .../030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/001_dummy/test.yml | 2 +- test/cases/040_packages/002_bcc/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/002_bpftrace/test.yml | 2 +- .../040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_cgroupv2/test.yml | 2 +- .../040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- .../004_dm-crypt/000_simple/test.yml | 2 +- .../004_dm-crypt/001_luks/test.yml | 2 +- .../004_dm-crypt/002_key/test.yml | 2 +- .../005_extend/000_ext4/test-create.yml | 2 +- .../040_packages/005_extend/000_ext4/test.yml | 2 +- .../005_extend/001_btrfs/test-create.yml | 2 +- .../005_extend/001_btrfs/test.yml | 2 +- .../005_extend/002_xfs/test-create.yml | 2 +- .../040_packages/005_extend/002_xfs/test.yml | 2 +- .../005_extend/003_gpt/test-create.yml | 2 +- .../040_packages/005_extend/003_gpt/test.yml | 2 +- .../006_format_mount/000_auto/test.yml | 2 +- .../006_format_mount/001_by_label/test.yml | 2 +- .../006_format_mount/002_by_name/test.yml.in | 2 +- .../006_format_mount/003_btrfs/test.yml | 2 +- .../006_format_mount/004_xfs/test.yml | 2 +- .../005_by_device_force/test.yml | 2 +- .../006_format_mount/006_gpt/test.yml | 2 +- .../006_format_mount/010_multiple/test.yml | 2 +- .../007_getty-containerd/test.yml | 2 +- .../040_packages/009_init_containerd/test.yml | 2 +- test/cases/040_packages/011_kmsg/test.yml | 2 +- test/cases/040_packages/012_logwrite/test.yml | 2 +- test/cases/040_packages/012_losetup/test.yml | 2 +- .../013_metadata/000_cidata/test.yml | 2 +- .../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 +- .../cases/040_packages/023_wireguard/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- test/pkg/ns/template.yml | 2 +- 125 files changed, 175 insertions(+), 125 deletions(-) create mode 100644 docs/cmdline.md diff --git a/docs/cmdline.md b/docs/cmdline.md new file mode 100644 index 000000000..07c8ba080 --- /dev/null +++ b/docs/cmdline.md @@ -0,0 +1,15 @@ +# Kernel command-line options + +The kernel command-line is a string of text that the kernel parses as it is starting up. It is passed by the boot loader +to the kernel and specifies parameters that the kernel uses to configure the system. The command-line is a list of command-line +options separated by spaces. The options are parsed by the kernel and can be used to enable or disable certain features. + +LinuxKit passes all command-line options to the kernel, which uses them in the usual way. + +There are several options that can be used to control the behaviour of linuxkit itself, or specifically packages +within linuxkit. Unless standard Linux options exist, these all are prefaced with `linuxkit.`. + +| Option | Description | +|---|---| +| `linuxkit.runc_debug=1` | Start runc for `onboot` and `onshutdown` containers to run with `--debug`. Also sends output to the console, in addition to the normal output to logfiles. If not present or set to 0, default to usual mode. | +| `linuxkit.unified_cgroup_hierarchy=0` | Start up cgroups v1. If not present or set to 1, default to cgroups v1. | diff --git a/docs/yaml.md b/docs/yaml.md index b04e13e81..a3d1c9096 100644 --- a/docs/yaml.md +++ b/docs/yaml.md @@ -52,6 +52,9 @@ which should contain a `kernel` file that will be booted (eg a `bzImage` for `am called `kernel.tar` which is a tarball that is unpacked into the root, which should usually contain a kernel modules directory. `cmdline` specifies the kernel command line options if required. +The contents of `cmdline` are passed to the kernel as-is. There are several special values that are +used to control the behaviour of linuxkit packages. See [kernel command line options](../docs/cmdline.md). + To override the names, you can specify the kernel image name with `binary: bzImage` and the tar image with `tar: kernel.tar` or the empty string or `none` if you do not want to use a tarball at all. diff --git a/examples/addbinds.yml b/examples/addbinds.yml index 4bb6912ee..ab403064a 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index b68f1570a..ab964c281 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/containerd-debug.yml b/examples/containerd-debug.yml index 767876a6d..669f9f1b2 100644 --- a/examples/containerd-debug.yml +++ b/examples/containerd-debug.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index c6db5635d..89f7e9fe5 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index aa6a3e172..189eb7e2f 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index aa15282d6..cdf16529e 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:77e45e4681c78d59f1d8a48818260948d55f9d05 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/docker.yml b/examples/docker.yml index 0af2e2591..7779ab364 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/getty.yml b/examples/getty.yml index d34f03b1a..6ce391793 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 1394de250..51d42ac6e 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 77f377379..3bbbb6bd5 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/logging.yml b/examples/logging.yml index d1fb0da5a..aaf592d23 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/minimal.yml b/examples/minimal.yml index fcd12172c..b6fb3b233 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 913839146..a074b2773 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 services: diff --git a/examples/openstack.yml b/examples/openstack.yml index eda03470c..10de6b877 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index dafbb9764..625f8f4c5 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index 15a651782..b31a0521a 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-equinixmetal.yml b/examples/platform-equinixmetal.yml index da1da3d7d..d56e668b3 100644 --- a/examples/platform-equinixmetal.yml +++ b/examples/platform-equinixmetal.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index dba0ef407..2b941cedc 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index b6187a9f9..d29e14dda 100644 --- a/examples/platform-hetzner.yml +++ b/examples/platform-hetzner.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index cfd0ef9eb..df7ec1a9d 100644 --- a/examples/platform-rt-for-vmware.yml +++ b/examples/platform-rt-for-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13-rt cmdline: "console=tty0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index 9943cdf6e..aa2f3ef39 100644 --- a/examples/platform-scaleway.yml +++ b/examples/platform-scaleway.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index 6b493283f..a6abfaa56 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index a553ad14b..7b7f9940d 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/redis-os.yml b/examples/redis-os.yml index c45f9370d..bb07376c5 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index 4b16f6123..449c586ea 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/static-ip.yml b/examples/static-ip.yml index f673c159f..d4243b608 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/swap.yml b/examples/swap.yml index 2544dcf6e..651dddf8e 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/tpm.yml b/examples/tpm.yml index eeeece045..3f0fb9077 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/volumes.yml b/examples/volumes.yml index 4defe9ae0..790cd3fda 100644 --- a/examples/volumes.yml +++ b/examples/volumes.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 3a8c06fe7..db2a14eaf 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 84365a5d7..dcb3670fc 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 3d9059193..ca94663f5 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/linuxkit.yml b/linuxkit.yml index 968da2272..53a70eaf6 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/pkg/init/cmd/service/runc.go b/pkg/init/cmd/service/runc.go index a3f6f0e40..3620b70d3 100644 --- a/pkg/init/cmd/service/runc.go +++ b/pkg/init/cmd/service/runc.go @@ -7,6 +7,7 @@ import ( "path" "path/filepath" "strconv" + "strings" log "github.com/sirupsen/logrus" "golang.org/x/sys/unix" @@ -62,6 +63,28 @@ func runcInit(rootPath, serviceType string) int { } logger := GetLog(logDir) + v2, err := isCgroupV2() + if err != nil { + log.Fatalf("Cannot determine cgroup version: %v", err) + } + msg := "cgroup v1" + if v2 { + msg = "cgroup v2" + } + log.Printf("Using %s", msg) + + // did we choose to run in debug mode? If so, runc will be in debug, and all messages will go to stdout/stderr in addition to the log + var runcDebugMode bool + dt, err := os.ReadFile("/proc/cmdline") + if err != nil { + log.Fatalf("error reading /proc/cmdline: %v", err) + } + for _, s := range strings.Fields(string(dt)) { + if s == "linuxkit.runc_debug=1" { + runcDebugMode = true + break + } + } for _, file := range files { name := file.Name() @@ -75,7 +98,11 @@ func runcInit(rootPath, serviceType string) int { continue } pidfile := filepath.Join(tmpdir, name) - cmd := exec.Command(runcBinary, "create", "--bundle", path, "--pid-file", pidfile, name) + cmdArgs := []string{"create", "--bundle", path, "--pid-file", pidfile, name} + if runcDebugMode { + cmdArgs = append([]string{"--debug"}, cmdArgs...) + } + cmd := exec.Command(runcBinary, cmdArgs...) stdoutLog := serviceType + "." + name + ".out" stdout, err := logger.Open(stdoutLog) @@ -95,8 +122,13 @@ func runcInit(rootPath, serviceType string) int { } defer stderr.Close() - cmd.Stdout = stdout - cmd.Stderr = stderr + if runcDebugMode { + cmd.Stdout = io.MultiWriter(stdout, os.Stdout) + cmd.Stderr = io.MultiWriter(stderr, os.Stderr) + } else { + cmd.Stdout = stdout + cmd.Stderr = stderr + } if err := cmd.Run(); err != nil { log.Printf("Error creating %s: %v", name, err) diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index cf14cc72d..5d44ed4c3 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:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index bf0edf759..c7f1a6593 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index e1ae0b537..30e01b907 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 768f3f7a7..f76a55d28 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:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 088f3473d..1207cdcdb 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:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 22592255c..ebfd2a810 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:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index c81426675..b00d94c5b 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index cd1fa3239..381c19a2b 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 98a5c802f..5daf00fc5 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:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 633e91fe2..c82cba01e 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:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/src/cmd/linuxkit/moby/build/mkimage.yaml b/src/cmd/linuxkit/moby/build/mkimage.yaml index 01118f9ee..241eaeb3a 100644 --- a/src/cmd/linuxkit/moby/build/mkimage.yaml +++ b/src/cmd/linuxkit/moby/build/mkimage.yaml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: mkimage diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 418f6e064..23c2d92ca 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dhcpcd diff --git a/test/cases/000_build/001_tarheaders/test.yml b/test/cases/000_build/001_tarheaders/test.yml index 5257be720..df60acc8f 100644 --- a/test/cases/000_build/001_tarheaders/test.yml +++ b/test/cases/000_build/001_tarheaders/test.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 5257be720..df60acc8f 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index 39e8ab06c..d0e155045 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: mount diff --git a/test/cases/000_build/050_sbom/test.yml b/test/cases/000_build/050_sbom/test.yml index 4c0850ffd..f7ca3ee92 100644 --- a/test/cases/000_build/050_sbom/test.yml +++ b/test/cases/000_build/050_sbom/test.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 diff --git a/test/cases/000_build/060_input_tar/000_build/test1.yml b/test/cases/000_build/060_input_tar/000_build/test1.yml index 75df02aac..501a98b7a 100644 --- a/test/cases/000_build/060_input_tar/000_build/test1.yml +++ b/test/cases/000_build/060_input_tar/000_build/test1.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/cases/000_build/060_input_tar/000_build/test2.yml b/test/cases/000_build/060_input_tar/000_build/test2.yml index e8710dfca..a977b29bd 100644 --- a/test/cases/000_build/060_input_tar/000_build/test2.yml +++ b/test/cases/000_build/060_input_tar/000_build/test2.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/000_build/060_input_tar/010_same_filename/test.yml b/test/cases/000_build/060_input_tar/010_same_filename/test.yml index 75df02aac..501a98b7a 100644 --- a/test/cases/000_build/060_input_tar/010_same_filename/test.yml +++ b/test/cases/000_build/060_input_tar/010_same_filename/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml b/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml index f13600035..4307458ca 100644 --- a/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml +++ b/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test1 diff --git a/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml b/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml index f311d187d..6bba17166 100644 --- a/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml +++ b/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml b/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml index 3374a4a45..3979ca8fe 100644 --- a/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml +++ b/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml b/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml index e1d60c434..5f968a3fb 100644 --- a/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml +++ b/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test1 diff --git a/test/cases/000_build/070_volumes/004_blank/test.yml b/test/cases/000_build/070_volumes/004_blank/test.yml index cde65bcb4..c621b1119 100644 --- a/test/cases/000_build/070_volumes/004_blank/test.yml +++ b/test/cases/000_build/070_volumes/004_blank/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/000_build/070_volumes/005_image/test.yml b/test/cases/000_build/070_volumes/005_image/test.yml index 7b0aaf7de..777d59471 100644 --- a/test/cases/000_build/070_volumes/005_image/test.yml +++ b/test/cases/000_build/070_volumes/005_image/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/000_build/070_volumes/006_mount_types/test.yml b/test/cases/000_build/070_volumes/006_mount_types/test.yml index 311ac554d..432705531 100644 --- a/test/cases/000_build/070_volumes/006_mount_types/test.yml +++ b/test/cases/000_build/070_volumes/006_mount_types/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: testbinds 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 1404c6292..55f926e68 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 1404c6292..55f926e68 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 bfbf75b68..86f790cab 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 4e7706550..f964f8940 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 4e7706550..f964f8940 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 4e7706550..f964f8940 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 4e7706550..f964f8940 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 03623a679..cef076a56 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 4e7706550..f964f8940 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 4e7706550..f964f8940 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 46bbb6ad7..5bad4401b 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 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 4e7706550..f964f8940 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff 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 723e3e95e..acd34a9b8 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.172-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/013_config_5.10.x/test.yml b/test/cases/020_kernel/013_config_5.10.x/test.yml index afbce3ee7..c78bce078 100644 --- a/test/cases/020_kernel/013_config_5.10.x/test.yml +++ b/test/cases/020_kernel/013_config_5.10.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/016_config_5.15.x/test.yml b/test/cases/020_kernel/016_config_5.15.x/test.yml index df0f6e36c..8ae774c27 100644 --- a/test/cases/020_kernel/016_config_5.15.x/test.yml +++ b/test/cases/020_kernel/016_config_5.15.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/019_config_6.6.x/test.yml b/test/cases/020_kernel/019_config_6.6.x/test.yml index 652999ba8..5f96e274d 100644 --- a/test/cases/020_kernel/019_config_6.6.x/test.yml +++ b/test/cases/020_kernel/019_config_6.6.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13-44a5293614ca7c7674013e928cb11dcdbba73ba8 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config 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 c4180406c..81a2fed5e 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.172-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/113_kmod_5.10.x/test.yml b/test/cases/020_kernel/113_kmod_5.10.x/test.yml index 9d67ec9f3..d518aa9b6 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/test.yml +++ b/test/cases/020_kernel/113_kmod_5.10.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/116_kmod_5.15.x/test.yml b/test/cases/020_kernel/116_kmod_5.15.x/test.yml index 0a3c4671e..918f880df 100644 --- a/test/cases/020_kernel/116_kmod_5.15.x/test.yml +++ b/test/cases/020_kernel/116_kmod_5.15.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/119_kmod_6.6.x/test.yml b/test/cases/020_kernel/119_kmod_6.6.x/test.yml index e8764d198..621a9198b 100644 --- a/test/cases/020_kernel/119_kmod_6.6.x/test.yml +++ b/test/cases/020_kernel/119_kmod_6.6.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13-44a5293614ca7c7674013e928cb11dcdbba73ba8 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index 4909c34d3..f37b0c5a5 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -2,5 +2,5 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 915f7132a..fd4d88148 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 305ccf3a1..3a2609d2b 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:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/040_packages/001_dummy/test.yml b/test/cases/040_packages/001_dummy/test.yml index 6139405bf..112353eb8 100644 --- a/test/cases/040_packages/001_dummy/test.yml +++ b/test/cases/040_packages/001_dummy/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dummy diff --git a/test/cases/040_packages/002_bcc/test.yml b/test/cases/040_packages/002_bcc/test.yml index fc949e08c..ca14591fd 100644 --- a/test/cases/040_packages/002_bcc/test.yml +++ b/test/cases/040_packages/002_bcc/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/kernel-bcc:5.4.113 onboot: diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 1bcb7089a..47e445fbb 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: binfmt diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 13a031515..240a45e27 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/bpftrace:d9ddf9095bce44197aadb0119fe963cb9ebc4444 onboot: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 68b65fe7a..d99058a95 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: diff --git a/test/cases/040_packages/003_cgroupv2/test.yml b/test/cases/040_packages/003_cgroupv2/test.yml index 5279b3908..7a28f9e1a 100644 --- a/test/cases/040_packages/003_cgroupv2/test.yml +++ b/test/cases/040_packages/003_cgroupv2/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "linuxkit.unified_cgroup_hierarchy=1 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 7b80d5bc4..f75e2fce0 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 67d6ae9f5..6d6604306 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 d2db59ab0..298851ce6 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 905d58be5..9f8cbb7f3 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 d5f3e923f..e941a08a2 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 e4f2b0c83..6ec16e06f 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 2a32f2ed6..d2290675c 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 50b8f2df4..5e4f927e0 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 7d808a444..f8efc4baf 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 d70da0c06..a8c279149 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 42c261248..9ad9a298a 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 9f5bda123..f1831376c 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 2a32f2ed6..d2290675c 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 3cf64cad5..3a1ab7212 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 084ff8601..79e9996fc 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 d3970261b..2d0e51b6d 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 cad81cdf3..f745e38e6 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 17a76131d..c7d1ba936 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 90a18591f..0598d3235 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 94f72e846..69a6a3948 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 a1c85767c..d1aadb9bb 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f 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 935253588..3ea979c84 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/009_init_containerd/test.yml b/test/cases/040_packages/009_init_containerd/test.yml index f17c87057..853c2b0a2 100644 --- a/test/cases/040_packages/009_init_containerd/test.yml +++ b/test/cases/040_packages/009_init_containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/011_kmsg/test.yml b/test/cases/040_packages/011_kmsg/test.yml index 5686e009e..8068bb43b 100644 --- a/test/cases/040_packages/011_kmsg/test.yml +++ b/test/cases/040_packages/011_kmsg/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/012_logwrite/test.yml b/test/cases/040_packages/012_logwrite/test.yml index 46b7452bc..6f11483b7 100644 --- a/test/cases/040_packages/012_logwrite/test.yml +++ b/test/cases/040_packages/012_logwrite/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index fb5379645..dcab7e271 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: losetup diff --git a/test/cases/040_packages/013_metadata/000_cidata/test.yml b/test/cases/040_packages/013_metadata/000_cidata/test.yml index c4388d269..950a166ed 100644 --- a/test/cases/040_packages/013_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/013_metadata/000_cidata/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: metadata diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 47c2f2f90..d4aa733a8 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 6fc112325..101ea0415 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 2d533f8f6..20def7ebe 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 97d6dee02..d7352af7d 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 0801a0c9b..9bf843679 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 12c63adca..260e4be14 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 741ac0d15..dc84a492d 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:6e9ce8698d65bca46d4a791656f86a8a80bffd75 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test-ns