From 55e13c914e2da1c2f31d47693e5e2418baa1d490 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 18 Jul 2024 20:47:39 +0300 Subject: [PATCH] containerd to 1.7.20 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/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 ++-- .../010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/000_qemu/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- .../cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- .../010_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 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- .../cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test-create.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- .../040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../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 | 2 +- test/pkg/ns/template.yml | 2 +- tools/containerd-dev/Dockerfile | 2 +- 118 files changed, 175 insertions(+), 175 deletions(-) diff --git a/examples/addbinds.yml b/examples/addbinds.yml index ccbf0fb7e..63a1d80cc 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 6249a9b0c..a24ac0f12 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/containerd-debug.yml b/examples/containerd-debug.yml index 300de4c0a..6ddf7811b 100644 --- a/examples/containerd-debug.yml +++ b/examples/containerd-debug.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8a7b6cdb89197dc94eb6db69ef9dc90b750db598 + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 99451e158..95ed4bf3e 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index 74f65dc64..17d514ff7 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index d3223e12c..e2d8cb429 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:77e45e4681c78d59f1d8a48818260948d55f9d05 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: # support metadata for optional config in /run/config diff --git a/examples/docker.yml b/examples/docker.yml index b97ee8aa5..186fe61ac 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 7d7ae81be..a04b21588 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index a075f0b7e..10af444e0 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index d4fdc99c8..bf3d753ed 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: dhcpcd diff --git a/examples/logging.yml b/examples/logging.yml index ef2e6cab4..9bc3a95ac 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff - linuxkit/memlogd:cb79fd19e6485cfc61b85c607ca172cd860554c5 onboot: diff --git a/examples/minimal.yml b/examples/minimal.yml index 50b2977c6..45c782f01 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: dhcpcd image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 596d26dd6..d845153bf 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c services: - name: getty image: linuxkit/getty:5d86a2ce2d890c14ab66b13638dcadf74f29218b diff --git a/examples/openstack.yml b/examples/openstack.yml index 54b06982a..46cdc3da6 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index 10d6505f0..9987551ff 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index 5b908f6cf..90fe75e7c 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/platform-equinixmetal.yml b/examples/platform-equinixmetal.yml index c2bfde929..f7fc0c71d 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff - linuxkit/firmware:8def159583422181ddee3704f7024ecb9c02d348 onboot: diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index a32d3f4bc..7fd2a73db 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index 53b53623e..01eac40ea 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff - linuxkit/firmware:8def159583422181ddee3704f7024ecb9c02d348 onboot: diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index 7e2f8bf1a..5e1fab54a 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.13-rt cmdline: "console=tty0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index f3c42840e..5e9100362 100644 --- a/examples/platform-scaleway.yml +++ b/examples/platform-scaleway.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index ec94050b0..f524853b5 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index 2a412f2a0..3a607b381 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 658298873..39836ddbf 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: dhcpcd image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee diff --git a/examples/sshd.yml b/examples/sshd.yml index e4351e7cb..973f2750a 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 5a85b085a..9f107d76e 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: ip image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 diff --git a/examples/swap.yml b/examples/swap.yml index e785dee51..dc9310ce8 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index 8b1d2291f..9161ff042 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 4b1dfec44..5af3a8678 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: dhcpcd image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 09b323349..f35487275 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: dhcpcd image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 67d8e0077..089952717 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 3c5449471..3fbda8536 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 25355f7b9..ee71776db 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e 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:25522a7fcffd14465d807fadc3d3e4f6da7b10ec as containerd-dev +FROM linuxkit/containerd-dev:af26a5c09a71b919ee8113501d783a5bf299482d as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index fbd91661a..3d88f4900 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:25522a7fcffd14465d807fadc3d3e4f6da7b10ec AS containerd-dev +FROM linuxkit/containerd-dev:af26a5c09a71b919ee8113501d783a5bf299482d AS containerd-dev FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e 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 27582b68d..79147688c 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 085daaa50..9e6e7cfb0 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 4e3d3537b..5fec63cfb 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index f5951dcd8..249705851 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 01944e57d..38e2cd206 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 395c705f9..cbd1b39c1 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: dhcpcd image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 61ade4cd7..7beffc562 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index e497cccf2..67f7f03f8 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.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: sysctl image: linuxkit/sysctl:5a374e4bf3e5a7deeacff6571d0f30f7ea8f56db diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index afb3e23c3..f3b2ff2ee 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index f71a7ef34..391a3b9fe 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/src/cmd/linuxkit/moby/build/mkimage.yaml b/src/cmd/linuxkit/moby/build/mkimage.yaml index 3bd1f4d06..1611cb9c5 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 9f6205d47..0a417ee3d 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 5fc813d6f..aac8e4692 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.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: dhcpcd diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 5fc813d6f..aac8e4692 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.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: dhcpcd diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index 8ffdc01db..c8a31e2ea 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 1c3252d53..3bce76f8a 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.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c 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 4a66a8894..eeb71c5ff 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.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: sysctl image: linuxkit/sysctl:5a374e4bf3e5a7deeacff6571d0f30f7ea8f56db 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 b6a8727d5..6cb35bb98 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.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff 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 4a66a8894..eeb71c5ff 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.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: sysctl image: linuxkit/sysctl:5a374e4bf3e5a7deeacff6571d0f30f7ea8f56db 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 ae4ff4aa0..811a99c71 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 ae4ff4aa0..811a99c71 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 8b0869f79..02efc5eb0 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 46cdb4cb3..89f9e4667 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 46cdb4cb3..89f9e4667 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 46cdb4cb3..89f9e4667 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 46cdb4cb3..89f9e4667 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 30aaff655..21deabfc3 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 46cdb4cb3..89f9e4667 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 46cdb4cb3..89f9e4667 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 0ad95edfb..31ce1d198 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.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c services: - name: acpid image: linuxkit/acpid:3b1560c81d3884e049ebbd9d9bf94ccb394e6cd3 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 46cdb4cb3..89f9e4667 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 c0be3c725..eef9d21e9 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 9a7186f19..08f1d2000 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 aa6acdf6d..15d702b73 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 ad47a5733..80af15993 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 df458cb50..f6d14a803 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 b32e82e6c..2cf48cbba 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 881ff5759..928b7ef82 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 2c6fe89f9..23592279d 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 00e38ca4e..cf955f064 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 be05d6c19..eef2e5510 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.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 32a247ebe..e486efe67 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 90bf5cf82..687d5fce6 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 c0e3369bf..439186444 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 1910c722e..f67553ffc 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 1b3eacbaf..90199c214 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 d57d56bba..1191cbdfa 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 56822da67..4b2ca3340 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 3b022acaa..a23f8e92f 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.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: dhcpcd @@ -18,6 +18,6 @@ onboot: image: linuxkit/mount:19ff89c251a4156bda8ed11c95faad2f40eb770e command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:28c007ed5fbba471250ecf6bb9686db5cd5b2ffe + image: linuxkit/test-containerd:e6cff2a90a761ed7385c699378fbaa4b13b9f314 - name: poweroff image: linuxkit/poweroff:401dc53c604c0b2179ed0369a6968fd4179cc176 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 8089980dc..49259dab2 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 2de015615..74605cad0 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 57875224c..59e05bcf5 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 1d8b0a8d4..bba3f431c 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 c486c1d4c..3d9e91d0c 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 2eb92bfbd..08927a410 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 6aec1b445..ecaa19da4 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 ff65cc7b1..7a51705c0 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 a1362354d..e3e9a97e0 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 dd8cdddef..4d4cfc87b 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 305bf2e30..1c1804019 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 2eb92bfbd..08927a410 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 1e01ec1d1..559286438 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 5014ebc94..dd5a9367a 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 78345a0a9..1d1a0b508 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 b3709b048..9dbc4a9b2 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 798776909..4633e2594 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 9130bda6a..a7b400508 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 cd6910050..ff2ac2719 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 c95f6d8d4..d49be4a5f 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 0ea631081..e8632854f 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.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff 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 9b3300785..4c196bc0e 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.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff services: - name: test diff --git a/test/cases/040_packages/011_kmsg/test.yml b/test/cases/040_packages/011_kmsg/test.yml index b75734165..c95f13bd9 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.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff - linuxkit/memlogd:cb79fd19e6485cfc61b85c607ca172cd860554c5 services: diff --git a/test/cases/040_packages/012_logwrite/test.yml b/test/cases/040_packages/012_logwrite/test.yml index 9cdd2d189..bd0bae191 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.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff - linuxkit/memlogd:cb79fd19e6485cfc61b85c607ca172cd860554c5 services: diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 685581b9c..ea9e301eb 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 638c89dab..f6463cac4 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 c9636de2b..9d6f4e534 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 bfb446aa7..01bdbc7aa 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 82c2c3563..1cc7aa565 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - 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 786ba2562..d1f33860a 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.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index ba3bd8fe7..e63da9716 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index f62dfd5ce..365eeb72a 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:988f659e3ffbdbaf7aef7483a5d5ede50a63e96c onboot: - name: dhcpcd image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index a8a4e973f..792258b47 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:25522a7fcffd14465d807fadc3d3e4f6da7b10ec as containerd-dev +FROM linuxkit/containerd-dev:af26a5c09a71b919ee8113501d783a5bf299482d as containerd-dev FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index c044705a9..545a7674e 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:6f7576cf6de37003339dcbde8a336f1eca9aedbb + - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test-ns diff --git a/tools/containerd-dev/Dockerfile b/tools/containerd-dev/Dockerfile index 5eb050016..edcaf892a 100644 --- a/tools/containerd-dev/Dockerfile +++ b/tools/containerd-dev/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e as builder # `test/pkg/containerd/Dockerfile` when changing this. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.7.2 +ENV CONTAINERD_COMMIT=v1.7.20 ENV GOPATH=/go RUN apk add go git RUN mkdir -p $GOPATH/src/github.com/containerd && \