From 14c29db5c27d94c3b3b7798a3dfe2f30e513588d Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 6 Mar 2025 17:12:07 +0200 Subject: [PATCH] Containerd v2.0.3 (#4112) * containerd to semver v2.0.3 Signed-off-by: Avi Deitcher * containerd v2.0.3 plus commits to fix blkdiscard Signed-off-by: Avi Deitcher * update containerd-dev dependencies Signed-off-by: Avi Deitcher * updated pkg/init and pkg/containerd deps Signed-off-by: Avi Deitcher --------- Signed-off-by: Avi Deitcher --- examples/addbinds.yml | 4 ++-- examples/cadvisor.yml | 4 ++-- examples/containerd-debug.yml | 4 ++-- examples/dm-crypt-loop.yml | 4 ++-- examples/dm-crypt.yml | 4 ++-- examples/docker-for-mac.yml | 4 ++-- examples/docker.yml | 4 ++-- examples/getty.yml | 4 ++-- examples/hostmount-writeable-overlay.yml | 4 ++-- examples/influxdb-os.yml | 4 ++-- examples/logging.yml | 4 ++-- examples/minimal.yml | 4 ++-- examples/node_exporter.yml | 4 ++-- examples/openstack.yml | 4 ++-- examples/platform-aws.yml | 4 ++-- examples/platform-azure.yml | 4 ++-- examples/platform-equinixmetal.yml | 4 ++-- examples/platform-gcp.yml | 4 ++-- examples/platform-hetzner.yml | 4 ++-- examples/platform-rt-for-vmware.yml | 4 ++-- examples/platform-scaleway.yml | 4 ++-- examples/platform-vmware.yml | 4 ++-- examples/platform-vultr.yml | 4 ++-- examples/redis-os.yml | 4 ++-- examples/sshd.yml | 4 ++-- examples/static-ip.yml | 4 ++-- examples/swap.yml | 4 ++-- examples/tpm.yml | 4 ++-- examples/volumes.yml | 4 ++-- examples/vpnkit-forwarder.yml | 4 ++-- examples/vsudd-containerd.yml | 4 ++-- examples/wireguard.yml | 4 ++-- linuxkit.yml | 4 ++-- pkg/containerd/Dockerfile | 2 +- pkg/init/Dockerfile | 2 +- projects/clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 4 ++-- projects/compose/compose-static.yml | 4 ++-- projects/ima-namespace/ima-namespace.yml | 4 ++-- projects/landlock/landlock.yml | 2 +- projects/memorizer/memorizer.yml | 4 ++-- projects/miragesdk/examples/fdd.yml | 4 ++-- projects/miragesdk/examples/mirage-dhcp.yml | 4 ++-- projects/okernel/examples/okernel_simple.yaml | 4 ++-- projects/shiftfs/shiftfs.yml | 4 ++-- 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 | 4 ++-- test/cases/000_build/010_reproducible/test.yml | 4 ++-- test/cases/000_build/020_binds/test.yml | 2 +- test/cases/000_build/050_sbom/test.yml | 4 ++-- test/cases/000_build/060_input_tar/000_build/test1.yml | 4 ++-- test/cases/000_build/060_input_tar/000_build/test2.yml | 4 ++-- .../000_build/060_input_tar/010_same_filename/test.yml | 4 ++-- test/cases/000_build/070_volumes/000_rw_on_rw/test.yml | 2 +- test/cases/000_build/070_volumes/001_ro_on_ro/test.yml | 2 +- test/cases/000_build/070_volumes/002_rw_on_ro/test.yml | 2 +- test/cases/000_build/070_volumes/003_ro_on_rw/test.yml | 2 +- test/cases/000_build/070_volumes/004_blank/test.yml | 2 +- test/cases/000_build/070_volumes/005_image/test.yml | 2 +- test/cases/000_build/070_volumes/006_mount_types/test.yml | 2 +- .../010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../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 +- .../010_platforms/000_qemu/030_run_qcow_bios/test.yml | 2 +- .../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_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_hyperkit/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 4 ++-- test/cases/010_platforms/110_gcp/000_run/test.yml | 2 +- test/cases/020_kernel/011_config_5.4.x/test.yml | 2 +- test/cases/020_kernel/013_config_5.10.x/test.yml | 2 +- test/cases/020_kernel/016_config_5.15.x/test.yml | 2 +- test/cases/020_kernel/019_config_6.6.x/test.yml | 2 +- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 2 +- test/cases/020_kernel/113_kmod_5.10.x/test.yml | 2 +- test/cases/020_kernel/116_kmod_5.15.x/test.yml | 2 +- test/cases/020_kernel/119_kmod_6.6.x/test.yml | 2 +- test/cases/020_kernel/200_namespace/common.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 4 ++-- 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 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_cgroupv2/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 6 +++--- 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 +- .../040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- .../040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- .../cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- .../cases/040_packages/005_extend/003_gpt/test-create.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test.yml | 2 +- .../cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- .../040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- .../040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../006_format_mount/005_by_device_force/test.yml | 2 +- test/cases/040_packages/006_format_mount/006_gpt/test.yml | 2 +- .../040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 4 ++-- test/cases/040_packages/009_init_containerd/test.yml | 4 ++-- test/cases/040_packages/011_kmsg/test.yml | 4 ++-- test/cases/040_packages/012_logwrite/test.yml | 4 ++-- test/cases/040_packages/012_losetup/test.yml | 2 +- test/cases/040_packages/013_metadata/000_cidata/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 | 4 ++-- test/hack/test-ltp.yml | 4 ++-- test/hack/test.yml | 4 ++-- test/pkg/containerd/Dockerfile | 5 +---- test/pkg/ns/template.yml | 2 +- tools/containerd-dev/Dockerfile | 8 +++++--- 126 files changed, 188 insertions(+), 189 deletions(-) diff --git a/examples/addbinds.yml b/examples/addbinds.yml index 1a1032268..cd42c7ccc 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 5ebeb56b5..299353aa8 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/containerd-debug.yml b/examples/containerd-debug.yml index aeae28d4a..96acbc48b 100644 --- a/examples/containerd-debug.yml +++ b/examples/containerd-debug.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index dfc7ca207..d432cddf0 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index b6033160f..79bbac6b3 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index a3ed01bbb..cb4272f3e 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -4,9 +4,9 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:b30e8456ac128b2ac360329898368b309ea6e477 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: # support metadata for optional config in /run/config diff --git a/examples/docker.yml b/examples/docker.yml index 83ce404cf..3cf4caf85 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 7b35f89eb..16fa907c5 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 4091164d1..af8cf9f1f 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index fb0020905..ad9919700 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: dhcpcd diff --git a/examples/logging.yml b/examples/logging.yml index 547407015..9ab7ed01d 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb - linuxkit/memlogd:e28ecaa23a3693ae96575fb3bc421bc1d9f46c4f onboot: diff --git a/examples/minimal.yml b/examples/minimal.yml index 58a072a93..e5d910e86 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: dhcpcd image: linuxkit/dhcpcd:157df9ef45a035f1542ec2270e374f18efef98a5 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 86bd8b82a..ffd7fc35e 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d services: - name: getty image: linuxkit/getty:05eca453695984a69617f1f1f0bcdae7f7032967 diff --git a/examples/openstack.yml b/examples/openstack.yml index fa0afbc30..1833fff75 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index 27e5d39ab..f2116cca8 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index 47634614c..9f9e1b1db 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/platform-equinixmetal.yml b/examples/platform-equinixmetal.yml index 06dfbbf80..ebdeaa35e 100644 --- a/examples/platform-equinixmetal.yml +++ b/examples/platform-equinixmetal.yml @@ -3,9 +3,9 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb - linuxkit/firmware:bfc7802f909c4b760de5dd2bc02a7f52e86b78f7 onboot: diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index 43ca7fa0e..008a24f63 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index ebf306b52..fbac4a801 100644 --- a/examples/platform-hetzner.yml +++ b/examples/platform-hetzner.yml @@ -3,9 +3,9 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb - linuxkit/firmware:bfc7802f909c4b760de5dd2bc02a7f52e86b78f7 onboot: diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index 0ee25c3bc..546e4d8a5 100644 --- a/examples/platform-rt-for-vmware.yml +++ b/examples/platform-rt-for-vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71-rt cmdline: "console=tty0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index 745778ab8..d2de7990c 100644 --- a/examples/platform-scaleway.yml +++ b/examples/platform-scaleway.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index 795091ee7..72e9866c8 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index 2fdf377d5..b3d409d2e 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 4c51736ca..7c1fc19ee 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: dhcpcd image: linuxkit/dhcpcd:157df9ef45a035f1542ec2270e374f18efef98a5 diff --git a/examples/sshd.yml b/examples/sshd.yml index 788e78553..3e5e686ef 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 19d9c96c8..2be854791 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: ip image: linuxkit/ip:9696394a7d57b384ae919662ae162c9152029156 diff --git a/examples/swap.yml b/examples/swap.yml index 4526ad589..8f055267f 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index 946c34fbf..0ca2f2a4e 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/volumes.yml b/examples/volumes.yml index ffe4f718f..8709b0ef2 100644 --- a/examples/volumes.yml +++ b/examples/volumes.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 3ef18ca6d..03b1e0999 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: dhcpcd image: linuxkit/dhcpcd:157df9ef45a035f1542ec2270e374f18efef98a5 diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index a8c1cf0d1..ab094ddfb 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: dhcpcd image: linuxkit/dhcpcd:157df9ef45a035f1542ec2270e374f18efef98a5 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index bc0cee97a..19a595ed5 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 51c925365..f79cf9ef5 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index a813f8f69..21ce98fa9 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a as alpine RUN apk add tzdata binutils RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd -FROM linuxkit/containerd-dev:dcb484003086d12dc0458793375f3769553f330e as containerd-dev +FROM linuxkit/containerd-dev:fb4bf37a114ce1eb8a2c4ed3db91a50301805e2c as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 8ebc07097..0c9b6abcf 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:dcb484003086d12dc0458793375f3769553f330e AS containerd-dev +FROM linuxkit/containerd-dev:fb4bf37a114ce1eb8a2c4ed3db91a50301805e2c AS containerd-dev FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index fbde3114d..535673067 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:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index e09b58c33..86edba2d5 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index af4b5300f..eb0b891a8 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 8152140c2..0e5909942 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 49de52cdf..62ba99626 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:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 67910d149..47cd34607 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: dhcpcd image: linuxkit/dhcpcd:157df9ef45a035f1542ec2270e374f18efef98a5 diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 5acdf9c8e..4720dc292 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 99cd35975..7c180884d 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: sysctl image: linuxkit/sysctl:5f56434b81004b50b47ed629b222619168c2bcdf diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index d657803e1..5e40a9530 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,9 +2,9 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index a326254fe..f44cba44c 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,9 +2,9 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/src/cmd/linuxkit/moby/build/mkimage.yaml b/src/cmd/linuxkit/moby/build/mkimage.yaml index 31ff6d6a2..0a39a7302 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:8b5af3365fc7d015db4e44113d93c7b1f8e2d2ab onboot: - name: mkimage diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 29fa36727..d635b6d1b 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: dhcpcd diff --git a/test/cases/000_build/001_tarheaders/test.yml b/test/cases/000_build/001_tarheaders/test.yml index cb3583fec..3ce6e4809 100644 --- a/test/cases/000_build/001_tarheaders/test.yml +++ b/test/cases/000_build/001_tarheaders/test.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: dhcpcd diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index cb3583fec..3ce6e4809 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: dhcpcd diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index 493178241..293d0f2fa 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: mount diff --git a/test/cases/000_build/050_sbom/test.yml b/test/cases/000_build/050_sbom/test.yml index f10654026..1ad3adf33 100644 --- a/test/cases/000_build/050_sbom/test.yml +++ b/test/cases/000_build/050_sbom/test.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: package1 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 53c578cc8..60ad4fb66 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,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: sysctl image: linuxkit/sysctl:5f56434b81004b50b47ed629b222619168c2bcdf 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 0ee2bb004..5b8410462 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,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl 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 53c578cc8..60ad4fb66 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,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: sysctl image: linuxkit/sysctl:5f56434b81004b50b47ed629b222619168c2bcdf 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 37dedd121..f33d0818e 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 0b4c2c3aa..6de4bbdc2 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 23216969a..56d3a821f 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 a6df8a903..4b526b069 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 0aa508ba7..9e9336a43 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 1298196af..df8b32246 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 4017cef62..e120ca383 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 9e7001543..8748fc485 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 9e7001543..8748fc485 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 7b58fa767..83e2bff39 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 cb7356e4b..638727307 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 cb7356e4b..638727307 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 cb7356e4b..638727307 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 cb7356e4b..638727307 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 b25f383b6..2cedf4592 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 cb7356e4b..638727307 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 cb7356e4b..638727307 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 132669fa8..755f42576 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d services: - name: acpid image: linuxkit/acpid:6cb5575e487a8fcbd4c3eb6721c23299e6ea452f 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 cb7356e4b..638727307 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.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 bcc64df0c..cb1d699ba 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:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 dc612b0fa..68b2028af 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:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 6155b3313..f8f5cb49a 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:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 598a39259..3c2e8b266 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.71-819af9d59279506dd2994e7aea1cbbaaebfdb0a2 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 5a4431b0c..3bd9d1bcd 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:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 57b944933..a52036b18 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:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 037b9143b..2fa75f845 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:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 20fb1a805..36aad51a5 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.71-819af9d59279506dd2994e7aea1cbbaaebfdb0a2 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: check diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index 003de86cf..eddb7336d 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index f78636b98..8c324b216 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index e48bea603..3c00796dd 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.71 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: test diff --git a/test/cases/040_packages/001_dummy/test.yml b/test/cases/040_packages/001_dummy/test.yml index 493fb83f8..fc0dc46e3 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: dummy diff --git a/test/cases/040_packages/002_bcc/test.yml b/test/cases/040_packages/002_bcc/test.yml index 85e11e390..124e0eca8 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - 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 734dbb49a..9e92dbee2 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: binfmt diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 464f023f8..bcf49589b 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - linuxkit/bpftrace:044371a0dfe9401b343c5e60cd08c25d6a89c608 onboot: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index f0e000769..cc5ab54c3 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: diff --git a/test/cases/040_packages/003_cgroupv2/test.yml b/test/cases/040_packages/003_cgroupv2/test.yml index 5e289b89b..86ff0642a 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.71 cmdline: "linuxkit.unified_cgroup_hierarchy=1 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 133b82823..8fe14c34c 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: dhcpcd @@ -18,6 +18,6 @@ onboot: image: linuxkit/mount:cb8caa72248f7082fc2074ce843d53cdc15df04a command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:0dfd29a79418cdff3e6228b4fa1b6594524c4717 + image: linuxkit/test-containerd:ff8a62cbe38b24954d45a3466168f54d7eee20d1 - name: poweroff image: linuxkit/poweroff:91a23d43c403e200102b7512d8de95f89c86565c diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 074719ee1..6c76dee77 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 2e6cbfa3f..4e70b71ca 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 425e558b5..c8aabb24e 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 14efd8296..a000671b8 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 74158cfd8..adc292ec0 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 4a56ed4a4..714bfea19 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 f07d16447..0aa4d737e 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 e5f4e2c2d..828d5bae8 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 64362e8fe..639c4ffd5 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 7e867722b..3dc70013d 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 f1bfb6cb7..841c6feb7 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 4a56ed4a4..714bfea19 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 44855bcf7..5492a4d20 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 76594f039..aa4d75668 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 084cadacb..1304c2882 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 b50824e53..93bcc6585 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 abfb08596..500991fea 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 9e0435ee8..74015ae61 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 996563a5a..f9642f53d 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 a66eaf167..d098f28c9 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 4f95a4d37..a29ac0da1 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: dhcpcd diff --git a/test/cases/040_packages/009_init_containerd/test.yml b/test/cases/040_packages/009_init_containerd/test.yml index d528e8a11..3bf3d3dbb 100644 --- a/test/cases/040_packages/009_init_containerd/test.yml +++ b/test/cases/040_packages/009_init_containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb services: - name: test diff --git a/test/cases/040_packages/011_kmsg/test.yml b/test/cases/040_packages/011_kmsg/test.yml index 7a8c13c3c..d47c5bb54 100644 --- a/test/cases/040_packages/011_kmsg/test.yml +++ b/test/cases/040_packages/011_kmsg/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb - linuxkit/memlogd:e28ecaa23a3693ae96575fb3bc421bc1d9f46c4f services: diff --git a/test/cases/040_packages/012_logwrite/test.yml b/test/cases/040_packages/012_logwrite/test.yml index a6aed0a71..b13cf433d 100644 --- a/test/cases/040_packages/012_logwrite/test.yml +++ b/test/cases/040_packages/012_logwrite/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb - linuxkit/memlogd:e28ecaa23a3693ae96575fb3bc421bc1d9f46c4f services: diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 9786f6ebf..d285280d3 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 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 1ad591994..66a51f1b2 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: metadata diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index f5252ec7e..15dfe6047 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index d1a689768..d8a2c06d9 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 807610f34..56c3cddaa 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.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 2f84c65ca..1d609a2fc 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d - linuxkit/ca-certificates:7b32a26ca9c275d3ef32b11fe2a83dbd2aee2fdb onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index e172d2752..55ccbd6df 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index 57bfcb205..4166a7d61 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 - - linuxkit/containerd:44f4526a97d898b2fe98c2de888f422861b984d0 + - linuxkit/containerd:a988a1a8bcbacc2c0390ca0c08f949e2b4b5915d onboot: - name: dhcpcd image: linuxkit/dhcpcd:157df9ef45a035f1542ec2270e374f18efef98a5 diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index bc407daa1..b12aec2cb 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:dcb484003086d12dc0458793375f3769553f330e as containerd-dev +FROM linuxkit/containerd-dev:fb4bf37a114ce1eb8a2c4ed3db91a50301805e2c as containerd-dev FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) @@ -23,9 +23,6 @@ RUN apk add --no-cache --initdb -p /out \ xfsprogs \ tzdata -# because we want the one from util-linux-misc at /sbin/blkdiscard to override the one from busybox -RUN rm /out/usr/bin/blkdiscard - RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache RUN cp /out/usr/share/zoneinfo/UTC /out/etc/localtime diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 59e1fa41d..b2fffcbbb 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.71 cmdline: "console=ttyS0" init: - - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed + - linuxkit/init:8eea386739975a43af558eec757a7dcb3a3d2e7b - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9 onboot: - name: test-ns diff --git a/tools/containerd-dev/Dockerfile b/tools/containerd-dev/Dockerfile index 9bc236b3e..e0dbbe088 100644 --- a/tools/containerd-dev/Dockerfile +++ b/tools/containerd-dev/Dockerfile @@ -6,9 +6,11 @@ FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a as builder # `test/pkg/containerd/Dockerfile` when changing this. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -# this is a commit post-v2.0.2 that contains a fix necesary for tests to pass. -# it should be released with v2.0.3, which can be used once that release is available. -ENV CONTAINERD_COMMIT=3904a5761fadbb999d3fc1a7f7ab7cc6f6d7d850 +# this commit is post-v2.0.3 and includes the fix for the blkdiscard issue +# which is necessary for the root tests to pass when running on Alpine. +# Once it is in semver, likely v2.0.4, we can switch to that. +# See PR https://github.com/containerd/containerd/pull/11330 +ENV CONTAINERD_COMMIT=f35b7dae5f1f4f1277e4c39b89acb0a8ea669c48 ENV GOPATH=/go RUN apk add go git RUN mkdir -p $GOPATH/src/github.com/containerd && \