From e668b25a826b92050a051fe546e8fffcced82747 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 5 Jan 2023 07:26:50 +0200 Subject: [PATCH] Alpine 317 (#3888) --- contrib/open-vm-tools/open-vm-tools-ds.yaml | 2 +- examples/addbinds.yml | 16 +- examples/cadvisor.yml | 26 +- examples/dm-crypt-loop.yml | 26 +- examples/dm-crypt.yml | 22 +- examples/docker-for-mac.yml | 40 +- examples/docker.yml | 24 +- examples/getty.yml | 16 +- examples/hostmount-writeable-overlay.yml | 16 +- examples/influxdb-os.yml | 12 +- examples/logging.yml | 20 +- examples/minimal.yml | 10 +- examples/node_exporter.yml | 14 +- examples/openstack.yml | 18 +- examples/platform-aws.yml | 20 +- examples/platform-azure.yml | 16 +- examples/platform-gcp.yml | 20 +- examples/platform-hetzner.yml | 24 +- examples/platform-packet.arm64.yml | 2 +- examples/platform-packet.yml | 24 +- examples/platform-rt-for-vmware.yml | 18 +- examples/platform-scaleway.yml | 20 +- examples/platform-vmware.yml | 16 +- examples/platform-vultr.yml | 20 +- examples/redis-os.yml | 10 +- examples/sshd.yml | 20 +- examples/static-ip.yml | 10 +- examples/swap.yml | 22 +- examples/tpm.yml | 18 +- examples/vpnkit-forwarder.yml | 12 +- examples/vsudd-containerd.yml | 10 +- examples/wireguard.yml | 20 +- kernel/Dockerfile.bcc | 2 +- linuxkit.yml | 16 +- pkg/acpid/Dockerfile | 6 +- pkg/auditd/Dockerfile | 2 +- pkg/binfmt/Dockerfile | 2 +- pkg/bpftrace/Dockerfile | 2 +- pkg/ca-certificates/Dockerfile | 2 +- pkg/cadvisor/Dockerfile | 4 +- pkg/containerd/Dockerfile | 4 +- pkg/dhcpcd/Dockerfile | 2 +- pkg/dm-crypt/Dockerfile | 2 +- pkg/dummy/Dockerfile | 2 +- pkg/extend/Dockerfile | 4 +- pkg/firmware-all/Dockerfile | 2 +- pkg/firmware/Dockerfile | 2 +- pkg/format/Dockerfile | 4 +- pkg/getty/Dockerfile | 2 +- pkg/host-timesync-daemon/Dockerfile | 2 +- pkg/init/Dockerfile | 6 +- pkg/ip/Dockerfile | 2 +- pkg/kmsg/Dockerfile | 2 +- pkg/logwrite/Dockerfile | 2 +- pkg/losetup/Dockerfile | 2 +- pkg/memlogd/Dockerfile | 2 +- pkg/metadata/Dockerfile | 2 +- pkg/metadata/main.go | 16 +- pkg/metadata/provider_gcp.go | 9 +- pkg/mkimage/Dockerfile | 2 +- pkg/modprobe/Dockerfile | 2 +- pkg/mount/Dockerfile | 4 +- pkg/node_exporter/Dockerfile | 2 +- pkg/open-vm-tools/Dockerfile | 2 +- pkg/openntpd/Dockerfile | 2 +- pkg/qemu-ga/Dockerfile | 2 +- pkg/rngd/Dockerfile | 2 +- pkg/rngd/cmd/rngd/main.go | 1 + pkg/rngd/cmd/rngd/rng_unsupported.go | 1 + pkg/runc/Dockerfile | 2 +- pkg/sshd/Dockerfile | 2 +- pkg/swap/Dockerfile | 2 +- pkg/sysctl/Dockerfile | 2 +- pkg/sysfs/Dockerfile | 2 +- pkg/trim-after-delete/Dockerfile | 2 +- pkg/tss/Dockerfile | 2 +- pkg/vpnkit-expose-port/Dockerfile | 2 +- pkg/vpnkit-forwarder/Dockerfile | 2 +- pkg/vsudd/Dockerfile | 2 +- .../clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 24 +- projects/compose/compose-static.yml | 24 +- projects/ima-namespace/ima-namespace.yml | 14 +- projects/landlock/landlock.yml | 2 +- projects/memorizer/memorizer.yml | 10 +- projects/miragesdk/examples/fdd.yml | 16 +- projects/miragesdk/examples/mirage-dhcp.yml | 12 +- projects/okernel/examples/okernel_simple.yaml | 14 +- projects/shiftfs/shiftfs.yml | 16 +- src/cmd/linuxkit/moby/images.yaml | 18 +- src/cmd/linuxkit/moby/mkimage.yaml | 8 +- test/cases/000_build/000_formats/test.yml | 6 +- .../cases/000_build/010_reproducible/test.yml | 10 +- test/cases/000_build/020_binds/test.yml | 8 +- .../000_qemu/000_run_kernel+initrd/test.yml | 6 +- .../000_qemu/005_run_kernel+squashfs/test.yml | 6 +- .../000_qemu/010_run_iso/test.yml | 6 +- .../000_qemu/020_run_efi/test.yml | 6 +- .../000_qemu/030_run_qcow_bios/test.yml | 6 +- .../000_qemu/040_run_raw_bios/test.yml | 6 +- .../000_qemu/050_run_aws/test.yml | 6 +- .../000_qemu/100_container/test.yml | 6 +- .../000_run_kernel+initrd/test.yml | 6 +- .../005_run_kernel+squashfs/test.yml | 6 +- .../010_hyperkit/010_acpi/test.yml | 8 +- .../010_platforms/110_gcp/000_run/test.yml | 6 +- .../020_kernel/011_config_5.4.x/test.yml | 8 +- .../020_kernel/013_config_5.10.x/test.yml | 8 +- .../020_kernel/016_config_5.15.x/test.yml | 8 +- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 6 +- .../cases/020_kernel/113_kmod_5.10.x/test.yml | 6 +- .../cases/020_kernel/116_kmod_5.15.x/test.yml | 6 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../010_echo-short-1con-single/test.yml | 4 +- .../test.yml | 4 +- .../011_echo-short-10con-single/test.yml | 4 +- .../test.yml | 4 +- .../012_echo-short-5con-multi/test.yml | 4 +- .../test.yml | 4 +- .../015_echo-long-1con-single/test.yml | 4 +- .../test.yml | 4 +- .../016_echo-long-10con-single/test.yml | 4 +- .../017_echo-long-5con-multi-reverse/test.yml | 4 +- .../017_echo-long-5con-multi/test.yml | 4 +- .../010_veth-unix-domain-echo/test.yml | 4 +- .../test.yml | 4 +- .../100_mix/012_veth-ipv4-echo/test.yml | 4 +- .../100_mix/013_veth-ipv6-echo/test.yml | 4 +- .../100_mix/014_veth-tcp-echo/test.yml | 4 +- .../100_mix/015_veth-udp-echo/test.yml | 4 +- .../100_mix/020_unix-domain-echo/test.yml | 4 +- .../cases/020_kernel/200_namespace/common.yml | 4 +- .../030_security/000_docker-bench/test.yml | 22 +- test/cases/030_security/010_ports/test.yml | 6 +- test/cases/040_packages/001_dummy/test.yml | 8 +- test/cases/040_packages/002_bcc/test.yml | 6 +- test/cases/040_packages/002_binfmt/test.yml | 8 +- test/cases/040_packages/002_bpftrace/test.yml | 8 +- .../040_packages/003_ca-certificates/test.yml | 8 +- test/cases/040_packages/003_cgroupv2/test.yml | 6 +- .../040_packages/003_containerd/test.yml | 20 +- test/cases/040_packages/004_dhcpcd/test.yml | 8 +- .../004_dm-crypt/000_simple/test.yml | 8 +- .../004_dm-crypt/001_luks/test.yml | 8 +- .../004_dm-crypt/002_key/test.yml | 8 +- .../005_extend/000_ext4/test-create.yml | 10 +- .../040_packages/005_extend/000_ext4/test.yml | 10 +- .../005_extend/001_btrfs/test-create.yml | 12 +- .../005_extend/001_btrfs/test.yml | 12 +- .../040_packages/005_extend/002_xfs/check.sh | 2 +- .../005_extend/002_xfs/test-create.yml | 10 +- .../040_packages/005_extend/002_xfs/test.sh | 6 +- .../040_packages/005_extend/002_xfs/test.yml | 10 +- .../005_extend/003_gpt/test-create.yml | 10 +- .../040_packages/005_extend/003_gpt/test.yml | 10 +- .../006_format_mount/000_auto/test.yml | 10 +- .../006_format_mount/001_by_label/test.yml | 10 +- .../006_format_mount/002_by_name/test.yml.in | 10 +- .../006_format_mount/003_btrfs/test.yml | 12 +- .../006_format_mount/004_xfs/test.yml | 10 +- .../005_by_device_force/test.yml | 16 +- .../006_format_mount/006_gpt/test.yml | 10 +- .../006_format_mount/010_multiple/test.yml | 14 +- .../007_getty-containerd/test.yml | 12 +- .../040_packages/009_init_containerd/test.yml | 8 +- test/cases/040_packages/011_kmsg/test.yml | 14 +- test/cases/040_packages/012_logwrite/test.yml | 12 +- test/cases/040_packages/012_losetup/test.yml | 8 +- .../013_metadata/000_cidata/test.yml | 8 +- .../040_packages/013_mkimage/mkimage.yml | 8 +- test/cases/040_packages/013_mkimage/run.yml | 6 +- test/cases/040_packages/019_sysctl/test.yml | 8 +- .../cases/040_packages/023_wireguard/test.yml | 14 +- test/hack/test-ltp.yml | 8 +- test/hack/test.yml | 12 +- test/pkg/containerd/Dockerfile | 4 +- test/pkg/containerd/build.yml | 4 +- test/pkg/docker-bench/Dockerfile | 2 +- test/pkg/kernel-config/Dockerfile | 2 +- test/pkg/ns/Dockerfile | 4 +- test/pkg/ns/template.yml | 8 +- test/pkg/poweroff/Dockerfile | 2 +- test/pkg/virtsock/Dockerfile | 4 +- tools/alpine/Dockerfile | 9 +- tools/alpine/go-compile.sh | 8 +- tools/alpine/packages | 5 +- tools/alpine/versions.aarch64 | 737 ++++++++--------- tools/alpine/versions.x86_64 | 755 +++++++++--------- tools/containerd-dev/Dockerfile | 2 +- tools/go-compile/Dockerfile | 2 +- tools/mkimage-iso-bios/Dockerfile | 2 +- tools/mkimage-iso-efi-initrd/Dockerfile | 2 +- tools/mkimage-iso-efi/Dockerfile | 2 +- tools/mkimage-iso/Dockerfile | 2 +- tools/mkimage-qcow2-efi/Dockerfile | 2 +- tools/mkimage-raw-bios/Dockerfile | 2 +- tools/mkimage-raw-efi/Dockerfile | 2 +- tools/mkimage-rpi3/Dockerfile | 2 +- tools/mkimage-squashfs/Dockerfile | 2 +- 247 files changed, 1657 insertions(+), 1616 deletions(-) diff --git a/contrib/open-vm-tools/open-vm-tools-ds.yaml b/contrib/open-vm-tools/open-vm-tools-ds.yaml index f4f37fdd4..3d3fd70f9 100644 --- a/contrib/open-vm-tools/open-vm-tools-ds.yaml +++ b/contrib/open-vm-tools/open-vm-tools-ds.yaml @@ -30,7 +30,7 @@ spec: operator: Exists effect: NoSchedule containers: - - image: linuxkit/open-vm-tools:4c3158c7ba27f7ad0ede5d383ca25b57c5588a26 + - image: linuxkit/open-vm-tools:ab851c74c42e7e17d95a64b169e396511f89b9c0 name: open-vm-tools resources: requests: diff --git a/examples/addbinds.yml b/examples/addbinds.yml index 11579f5ee..36a3ba76b 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 binds.add: # this will keep all of the existing ones as well - /var/tmp:/var/tmp - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 767f67fa8..52f52398e 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysfs - image: linuxkit/sysfs:c3bdb00c5e23bf566d294bafd5f7890ca319056f + image: linuxkit/sysfs:4f58a2447d328d391143984fc4e8508b00dc6e5b - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: ntpd - image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038 + image: linuxkit/openntpd:dd353cac6cbd816008c565041cec6650090d0ad0 - name: docker image: docker:20.10.6-dind @@ -46,7 +46,7 @@ services: - /etc/docker/daemon.json:/etc/docker/daemon.json command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] - name: cadvisor - image: linuxkit/cadvisor:38174e03a9495a2ba8a8a049458f585a8b8e4a59 + image: linuxkit/cadvisor:6ae4b50f8279692c459bccd0003066d22bd558ce files: - path: var/lib/docker directory: true diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 8f6467a62..829e2813a 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,30 +2,30 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "/dev/sda"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/dev/sda1", "/var/external"] - name: loop - image: linuxkit/losetup:43e40be0c82cbccf171ebd2a8065246e2e84f66e + image: linuxkit/losetup:fcee8e453684d45c3c411fe8c28ecb2210158638 command: ["/usr/bin/loopy", "--create", "/var/external/storage_file"] - name: dm-crypt - image: linuxkit/dm-crypt:908d3a270650aff7388092a307673c44d86e1ed0 + image: linuxkit/dm-crypt:526d32351c8246431be8e1a168cb514ff3c365af command: ["/usr/bin/crypto", "crypt_loop_dev", "/dev/loop0"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/dev/mapper/crypt_loop_dev", "/var/secure_storage"] - name: bbox image: busybox @@ -34,11 +34,11 @@ onboot: - /var:/var services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 files: - path: etc/dm-crypt/key # the below key is just to keep the example self-contained diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index ae4b4e31f..9040b1a44 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "/dev/sda"] - name: dm-crypt - image: linuxkit/dm-crypt:908d3a270650aff7388092a307673c44d86e1ed0 + image: linuxkit/dm-crypt:526d32351c8246431be8e1a168cb514ff3c365af command: ["/usr/bin/crypto", "crypt_dev", "/dev/sda1"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/dev/mapper/crypt_dev", "/var/secure_storage"] - name: bbox image: busybox @@ -28,11 +28,11 @@ onboot: - /var:/var services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 files: - path: etc/dm-crypt/key # the below key is just to keep the example self-contained diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index f77c4ac5f..6f234d31b 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -3,30 +3,30 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/vpnkit-expose-port:87ac61469247b2a0483cbd1fd2915f220e078b78 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/vpnkit-expose-port:c61565ee34e58823aaf7c05fd6359a8fd889137f # install vpnkit-expose-port and vpnkit-iptables-wrapper on host + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a + image: linuxkit/metadata:cd284d211eb6456961bf9988f802492b4b63d5b5 - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: sysfs - image: linuxkit/sysfs:c3bdb00c5e23bf566d294bafd5f7890ca319056f + image: linuxkit/sysfs:4f58a2447d328d391143984fc4e8508b00dc6e5b - name: binfmt - image: linuxkit/binfmt:a17941b47f5cb262638cfb49ffc59ac5ac2bf334 + image: linuxkit/binfmt:ecd24b710cad869af6a4716809f62d7164286367 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:77305236719ed7ab4be0f3bccc179c583fe7f5ff + image: linuxkit/swap:cf9b484598f197a31b570012815c679826145bc4 command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"] # mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding - name: mount-vpnkit @@ -44,41 +44,41 @@ onboot: - /var:/host_var command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:c05a368754f6436b326945dc16135ba547568d8d + image: linuxkit/acpid:548f8f1c8bda31cdbefb65bdb0747f97c17639d2 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038 + image: linuxkit/openntpd:dd353cac6cbd816008c565041cec6650090d0ad0 # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:89980cd551d3174b6d8528f39fbd7fd1ca049161 + image: linuxkit/vsudd:5b962bdd22524b4edb7f428de745376abe359596 binds: - /var/run:/var/run command: ["/vsudd", "-inport", "2376:unix:/var/run/docker.sock"] # vpnkit-forwarder forwards network traffic to/from the host via VSOCK port 62373. # It needs access to the vpnkit 9P coordination share - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:ea4dded7386b09dd647e854664b029be0a4f420f + image: linuxkit/vpnkit-forwarder:1dcfbb69909086be663954809e92fa2d111fecf3 binds: - /var/vpnkit:/port net: host command: ["/vpnkit-forwarder", "-vsockPort", "62373"] # Monitor for image deletes and invoke a TRIM on the container filesystem - name: trim-after-delete - image: linuxkit/trim-after-delete:533ed712cf5cede1d5aec121c3f8afc1f471f723 + image: linuxkit/trim-after-delete:736054426ca2db02d62fe78b6910616b4e677107 # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:cc7c2f88c0e585c292624b9665412c9aca615d55 + image: linuxkit/host-timesync-daemon:ce5c8fc7989b1c3f9674d1f64245bf8146b1a9fb # Run dockerd with the vpnkit userland proxy from the vpnkit-forwarder container. # Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit # for vpnkit coordination and /run/config/docker for the configuration file. diff --git a/examples/docker.yml b/examples/docker.yml index b60c01eb5..b11b5d3d3 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,31 +2,31 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: sysfs - image: linuxkit/sysfs:c3bdb00c5e23bf566d294bafd5f7890ca319056f + image: linuxkit/sysfs:4f58a2447d328d391143984fc4e8508b00dc6e5b - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 - name: ntpd - image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038 + image: linuxkit/openntpd:dd353cac6cbd816008c565041cec6650090d0ad0 - name: docker image: docker:20.10.6-dind capabilities: diff --git a/examples/getty.yml b/examples/getty.yml index d130b8ade..7983635e7 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 694820a48..78bc6e43f 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true runtime: @@ -30,7 +30,7 @@ services: destination: writeable-host-etc options: ["rw", "lowerdir=/etc", "upperdir=/run/hostetc/upper", "workdir=/run/hostetc/work"] - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index df28cb287..173923d9c 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: influxdb diff --git a/examples/logging.yml b/examples/logging.yml index 849f16cf0..a02c73a4b 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,21 +3,21 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - - linuxkit/memlogd:36758a7ab239943852c4f849283e28ba975413c6 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 + - linuxkit/memlogd:67e3bc9d0f271336567f4bffbb80a8d57d5eddba onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Inside the getty type `/proc/1/root/usr/bin/logread -F` to follow the log - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true # A service which generates log messages for testing @@ -25,6 +25,6 @@ services: image: alpine:3.13 command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); sleep 1; done" ] - name: write-and-rotate-logs - image: linuxkit/logwrite:6100d207d36a089f322defb60e86032c6f66078c + image: linuxkit/logwrite:f3ba46a1785036931bd156996659e967b594bb83 - name: kmsg - image: linuxkit/kmsg:b2f6cd4ce9041120e30a4b5ab36bb8db4f5eb458 + image: linuxkit/kmsg:d86e8b0b44a01195f5ca644adb25994a24703f0f diff --git a/examples/minimal.yml b/examples/minimal.yml index 648ab6d7a..4e92fa2d4 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index d7232ae52..99325d9a4 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 - name: node_exporter - image: linuxkit/node_exporter:bd11bc62e0cdf7a600556c0cb9f6582bf055f245 + image: linuxkit/node_exporter:9b46e0f911c91865bfd2237f37ba56cf3e8830ab diff --git a/examples/openstack.yml b/examples/openstack.yml index eba16a921..5fdcab84f 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a + image: linuxkit/metadata:cd284d211eb6456961bf9988f802492b4b63d5b5 command: ["/usr/bin/metadata", "openstack"] services: - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 binds.add: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index c3aa1605d..11b61f8ec 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -2,26 +2,26 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a + image: linuxkit/metadata:cd284d211eb6456961bf9988f802492b4b63d5b5 services: - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: dhcpcd2 - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"] - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 binds.add: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index e283bb58a..1d7d6f891 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 services: - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 binds.add: - /root/.ssh:/root/.ssh files: diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index dff231f85..e59ed94c4 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a + image: linuxkit/metadata:cd284d211eb6456961bf9988f802492b4b63d5b5 services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 binds.add: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index 477eb4bd4..ec6ccd05d 100644 --- a/examples/platform-hetzner.yml +++ b/examples/platform-hetzner.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - - linuxkit/firmware:8f89601312327c78999a880ee104ceae9a25d20e + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 + - linuxkit/firmware:a17106a98940006529c714a3783eb03238c335a7 onboot: - name: rngd1 - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a + image: linuxkit/metadata:cd284d211eb6456961bf9988f802492b4b63d5b5 command: ["/usr/bin/metadata", "hetzner"] services: - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 binds.add: - /root/.ssh:/root/.ssh files: diff --git a/examples/platform-packet.arm64.yml b/examples/platform-packet.arm64.yml index 991a5ccba..f52a22c1c 100644 --- a/examples/platform-packet.arm64.yml +++ b/examples/platform-packet.arm64.yml @@ -10,5 +10,5 @@ kernel: ucode: "" onboot: - name: modprobe - image: linuxkit/modprobe:1b59b4f2ebb877085ea0d8d3a41cf06f64c09a15 + image: linuxkit/modprobe:5dd4d7238f760bcd9f91b9166f414da953242f43 command: ["modprobe", "nicvf"] diff --git a/examples/platform-packet.yml b/examples/platform-packet.yml index ec13ee2b4..1ef088b7e 100644 --- a/examples/platform-packet.yml +++ b/examples/platform-packet.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - - linuxkit/firmware:8f89601312327c78999a880ee104ceae9a25d20e + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 + - linuxkit/firmware:a17106a98940006529c714a3783eb03238c335a7 onboot: - name: rngd1 - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a + image: linuxkit/metadata:cd284d211eb6456961bf9988f802492b4b63d5b5 command: ["/usr/bin/metadata", "packet"] services: - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 binds.add: - /root/.ssh:/root/.ssh files: diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index d5d54c8cb..af165b23f 100644 --- a/examples/platform-rt-for-vmware.yml +++ b/examples/platform-rt-for-vmware.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.11.4-rt cmdline: "console=tty0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 - name: open-vm-tools - image: linuxkit/open-vm-tools:4c3158c7ba27f7ad0ede5d383ca25b57c5588a26 + image: linuxkit/open-vm-tools:ab851c74c42e7e17d95a64b169e396511f89b9c0 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index 6cc9f35d2..2ca8dc7a4 100644 --- a/examples/platform-scaleway.yml +++ b/examples/platform-scaleway.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: rngd1 - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 command: ["/sbin/rngd", "-1"] - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a + image: linuxkit/metadata:cd284d211eb6456961bf9988f802492b4b63d5b5 services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index 68a034416..f8868c318 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -2,22 +2,22 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index 9032b688c..faa8d94bb 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a + image: linuxkit/metadata:cd284d211eb6456961bf9988f802492b4b63d5b5 command: ["/usr/bin/metadata", "vultr"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 binds.add: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 5bfcf1658..4fb5b1744 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true # Currently redis:4.0.6-alpine has trust issue with multi-arch diff --git a/examples/sshd.yml b/examples/sshd.yml index 507ea1e3a..a8e4f2baa 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: rngd1 - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 binds.add: - /root/.ssh:/root/.ssh files: diff --git a/examples/static-ip.yml b/examples/static-ip.yml index fb9d68503..9da4dab1e 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 onboot: - name: ip - image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 binds: - /etc/ip:/etc/ip command: ["ip", "-b", "/etc/ip/eth0.conf"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true files: diff --git a/examples/swap.yml b/examples/swap.yml index 4c67e23a2..98efaf122 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,30 +2,30 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:77305236719ed7ab4be0f3bccc179c583fe7f5ff + image: linuxkit/swap:cf9b484598f197a31b570012815c679826145bc4 # to use unencrypted swap, use: # command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G"] command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 diff --git a/examples/tpm.yml b/examples/tpm.yml index 775a4cbfe..5f49fbb48 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: tss - image: linuxkit/tss:9cfa8c15f2120415aab35efcfdede5b3b5fe5b4c + image: linuxkit/tss:1246031b0c9d408ceb81790a05dd37bcb9e1c4e1 - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 1813d6cb9..a5b8e8f69 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.13 @@ -19,11 +19,11 @@ onboot: command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] services: - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 binds.add: - /root/.ssh:/root/.ssh - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:ea4dded7386b09dd647e854664b029be0a4f420f + image: linuxkit/vpnkit-forwarder:1dcfbb69909086be663954809e92fa2d111fecf3 binds: - /var/vpnkit:/port net: host diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 025c4e25a..5b90bc8b3 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:89980cd551d3174b6d8528f39fbd7fd1ca049161 + image: linuxkit/vsudd:5b962bdd22524b4edb7f428de745376abe359596 binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 081633678..2945a1c72 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,12 +40,12 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true net: /run/netns/wg1 - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: nginx image: nginx:1.13.8-alpine net: /run/netns/wg0 diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc index 938920ca5..755f5863f 100644 --- a/kernel/Dockerfile.bcc +++ b/kernel/Dockerfile.bcc @@ -18,7 +18,6 @@ RUN apk update && apk upgrade -a && \ curl \ elfutils-dev \ flex-dev \ - fts-dev \ gettext-dev \ git \ iperf3 \ @@ -29,6 +28,7 @@ RUN apk update && apk upgrade -a && \ llvm-static \ luajit-dev \ m4 \ + musl-fts-dev \ python3 \ zlib-dev \ && true diff --git a/linuxkit.yml b/linuxkit.yml index 38df7131c..0055395a2 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -18,11 +18,11 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: nginx image: nginx:1.19.5-alpine capabilities: diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile index 3e09f719f..8ccb7ec76 100644 --- a/pkg/acpid/Dockerfile +++ b/pkg/acpid/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -6,10 +6,10 @@ RUN apk add --no-cache --initdb -p /out \ busybox RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror2 +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror2 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ - busybox-initscripts + acpid RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache FROM scratch diff --git a/pkg/auditd/Dockerfile b/pkg/auditd/Dockerfile index 7b7cdbded..65e62df9d 100644 --- a/pkg/auditd/Dockerfile +++ b/pkg/auditd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --initdb -p /out alpine-baselayout apk-tools audit busybox tini diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 67f62d833..060744910 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y qemu-user-static && \ mv /usr/bin/qemu-riscv64-static /usr/bin/qemu-riscv64 && \ rm /usr/bin/qemu-*-static -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/bpftrace/Dockerfile b/pkg/bpftrace/Dockerfile index b4ebb9e8d..8f8e5eddf 100644 --- a/pkg/bpftrace/Dockerfile +++ b/pkg/bpftrace/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --update \ bison \ build-base \ diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile index 8aaedb79e..99e30538e 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 as alpine +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 as alpine RUN apk add ca-certificates diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index 014a2357f..76de85e60 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 as build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 as build RUN apk add --no-cache bash go git musl-dev linux-headers make patch # Hack to work around an issue with go on arm64 requiring gcc @@ -21,7 +21,7 @@ RUN mkdir -p /go/src/${GITBASE} \ && mv cadvisor /usr/bin/ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index c4d2df8cf..f999ef668 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,9 +1,9 @@ -FROM linuxkit/alpine:5d89cd05a567f9bfbe4502be1027a422d46f4a75 as alpine +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 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:e6a8da1e270da1601ed1bb85bb44c4442e5d51be as containerd-dev +FROM linuxkit/containerd-dev:30c6ccebe92d8af06596fb33b71ec005859116cc as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index b1b5bb6ee..fc232eeea 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/dm-crypt/Dockerfile b/pkg/dm-crypt/Dockerfile index c157755bd..d4f7057b1 100644 --- a/pkg/dm-crypt/Dockerfile +++ b/pkg/dm-crypt/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/dummy/Dockerfile b/pkg/dummy/Dockerfile index 9d790b65d..ae3680d12 100644 --- a/pkg/dummy/Dockerfile +++ b/pkg/dummy/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5d89cd05a567f9bfbe4502be1027a422d46f4a75 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache --initdb make FROM scratch diff --git a/pkg/extend/Dockerfile b/pkg/extend/Dockerfile index be12a089f..96a6101a3 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/firmware-all/Dockerfile b/pkg/firmware-all/Dockerfile index 9e482fc6f..4b229da65 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache git # Make sure you also update the FW_COMMIT in ../firmware/Dockerfile diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index 0e7705518..3ebeee3ed 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -1,7 +1,7 @@ # Make modules from a recentish kernel available FROM linuxkit/kernel:5.4.28 AS kernel -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache git kmod # Clone the firmware repository diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 74a1fc7cd..42a613cae 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index 8e9f44457..06dd2894f 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/host-timesync-daemon/Dockerfile b/pkg/host-timesync-daemon/Dockerfile index 5ee4f9210..38697c47d 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN apk add --no-cache go musl-dev git ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index b5cf931a9..e5b199202 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ -FROM linuxkit/containerd-dev:e6a8da1e270da1601ed1bb85bb44c4442e5d51be AS containerd-dev -FROM linuxkit/alpine:5d89cd05a567f9bfbe4502be1027a422d46f4a75 AS build +FROM linuxkit/containerd-dev:30c6ccebe92d8af06596fb33b71ec005859116cc AS containerd-dev +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -20,7 +20,7 @@ COPY --from=containerd-dev /go/src/github.com/containerd/containerd $GOPATH/src/ RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile index 50f32cbf4..4e3ad78cb 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add curl RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/kmsg/Dockerfile b/pkg/kmsg/Dockerfile index f1154a010..767587479 100644 --- a/pkg/kmsg/Dockerfile +++ b/pkg/kmsg/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN apk add --no-cache go musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/logwrite/Dockerfile b/pkg/logwrite/Dockerfile index 532b40eca..505ef3677 100644 --- a/pkg/logwrite/Dockerfile +++ b/pkg/logwrite/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/losetup/Dockerfile b/pkg/losetup/Dockerfile index 36579c4fb..cb08a27b0 100644 --- a/pkg/losetup/Dockerfile +++ b/pkg/losetup/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/memlogd/Dockerfile b/pkg/memlogd/Dockerfile index bc22fb3a3..8ef8a3880 100644 --- a/pkg/memlogd/Dockerfile +++ b/pkg/memlogd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/metadata/Dockerfile b/pkg/metadata/Dockerfile index 71a3086f9..c612a31fb 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN apk add --no-cache go musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off diff --git a/pkg/metadata/main.go b/pkg/metadata/main.go index d23c257e1..740afd364 100644 --- a/pkg/metadata/main.go +++ b/pkg/metadata/main.go @@ -185,13 +185,15 @@ func main() { // If the userdata is a json file, create a directory/file hierarchy. // Example: -// { -// "foobar" : { -// "foo" : { -// "perm": "0644", -// "content": "hello" -// } -// } +// +// { +// "foobar" : { +// "foo" : { +// "perm": "0644", +// "content": "hello" +// } +// } +// // Will create foobar/foo with mode 0644 and content "hello" func processUserData(basePath string, data []byte) error { // Always write the raw data to a file diff --git a/pkg/metadata/provider_gcp.go b/pkg/metadata/provider_gcp.go index 332e275b7..0906eb17b 100644 --- a/pkg/metadata/provider_gcp.go +++ b/pkg/metadata/provider_gcp.go @@ -90,12 +90,15 @@ func gcpGet(url string) ([]byte, error) { // SSH keys: // TODO also retrieve the instance keys and respect block -// project keys see: -// https://cloud.google.com/compute/docs/instances/ssh-keys +// +// project keys see: +// https://cloud.google.com/compute/docs/instances/ssh-keys +// // The keys have usernames attached, but as a simplification // we are going to add them all to one root file // TODO split them into individual user files and make the ssh -// container construct those users +// +// container construct those users func (p *ProviderGCP) handleSSH() error { sshKeys, err := gcpGet(project + "attributes/ssh-keys") if err != nil { diff --git a/pkg/mkimage/Dockerfile b/pkg/mkimage/Dockerfile index d2c6cd6d2..d5e277e52 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/modprobe/Dockerfile b/pkg/modprobe/Dockerfile index a4d60ccd1..ef14dee66 100644 --- a/pkg/modprobe/Dockerfile +++ b/pkg/modprobe/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile index 09626677d..09b30198f 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -9,7 +9,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/node_exporter/Dockerfile b/pkg/node_exporter/Dockerfile index db4cd8c3f..b8a6e9a00 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 as build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 as build RUN apk add --no-cache go git musl-dev make curl gcc diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index c34012a5f..c597ad343 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile index b4108bb2a..1666d8eac 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/qemu-ga/Dockerfile b/pkg/qemu-ga/Dockerfile index 1705d7907..480283f18 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/var/run RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index be093469f..8834c9d5d 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN apk add --no-cache go gcc musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/rngd/cmd/rngd/main.go b/pkg/rngd/cmd/rngd/main.go index f2bd60cea..a43ddb410 100644 --- a/pkg/rngd/cmd/rngd/main.go +++ b/pkg/rngd/cmd/rngd/main.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package main diff --git a/pkg/rngd/cmd/rngd/rng_unsupported.go b/pkg/rngd/cmd/rngd/rng_unsupported.go index 2fa654db7..375d74415 100644 --- a/pkg/rngd/cmd/rngd/rng_unsupported.go +++ b/pkg/rngd/cmd/rngd/rng_unsupported.go @@ -1,3 +1,4 @@ +//go:build !linux || (!amd64 && !arm64) // +build !linux !amd64,!arm64 package main diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index 1789fd7d8..623c97a00 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 as alpine +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index d3f1944bd..969432b06 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/swap/Dockerfile b/pkg/swap/Dockerfile index 987223c34..f6b57d9f9 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/sysctl/Dockerfile b/pkg/sysctl/Dockerfile index d4ad13d4b..a3409cb12 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile index 9224bd637..a7e053775 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/trim-after-delete/Dockerfile b/pkg/trim-after-delete/Dockerfile index 8c11312dd..82b5ec9b4 100644 --- a/pkg/trim-after-delete/Dockerfile +++ b/pkg/trim-after-delete/Dockerfile @@ -1,5 +1,5 @@ # We need the `fstrim` binary: -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/tss/Dockerfile b/pkg/tss/Dockerfile index 5088b609b..c29cddfb4 100644 --- a/pkg/tss/Dockerfile +++ b/pkg/tss/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build ENV TROUSERS_COMMIT 94144b0a1dcef6e31845d6c319e9bd7357208eb9 ENV TPM_TOOLS_COMMIT bf43837575c5f7d31865562dce7778eae970052e diff --git a/pkg/vpnkit-expose-port/Dockerfile b/pkg/vpnkit-expose-port/Dockerfile index 3739658f8..547d8ee57 100644 --- a/pkg/vpnkit-expose-port/Dockerfile +++ b/pkg/vpnkit-expose-port/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off diff --git a/pkg/vpnkit-forwarder/Dockerfile b/pkg/vpnkit-forwarder/Dockerfile index 23e18f2e4..7b7efff8b 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off diff --git a/pkg/vsudd/Dockerfile b/pkg/vsudd/Dockerfile index 6350a72de..483e8b349 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index ae593abaa..e923c390f 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:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 6b3eb933c..f7cdab39a 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,32 +2,32 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: sysfs - image: linuxkit/sysfs:c3bdb00c5e23bf566d294bafd5f7890ca319056f + image: linuxkit/sysfs:4f58a2447d328d391143984fc4e8508b00dc6e5b - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: ntpd - image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038 + image: linuxkit/openntpd:dd353cac6cbd816008c565041cec6650090d0ad0 - name: docker image: docker:20.10.6-dind capabilities: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index c4be1dc8c..34fe2ae09 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,32 +2,32 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: sysfs - image: linuxkit/sysfs:c3bdb00c5e23bf566d294bafd5f7890ca319056f + image: linuxkit/sysfs:4f58a2447d328d391143984fc4e8508b00dc6e5b - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: ntpd - image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038 + image: linuxkit/openntpd:dd353cac6cbd816008c565041cec6650090d0ad0 - name: docker image: docker:20.10.6-dind capabilities: diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 1252d12ca..8db76cc13 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 27b7219f7..27cfb34af 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:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 6c7e79802..a643c2a3d 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,16 +2,16 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index b61c698e2..4f85ad565 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 - samoht/fdd onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 files: - path: etc/init.d/020-fdd-init mode: "0700" diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index e5b043737..18c0b9db5 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcp-client image: miragesdk/dhcp-client:22aa9d527820534295a8cd59901c0c5197af6585 net: host @@ -28,9 +28,9 @@ onboot: - /lib:/lib # for ifconfig services: - name: sshd - image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f + image: linuxkit/sshd:62036c2a279715d05e8298b9269a0659964f2619 - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index b03112c86..da95faa16 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,18 +2,18 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 services: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index d4ee6fbe2..1416ffea5 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,23 +2,23 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/src/cmd/linuxkit/moby/images.yaml b/src/cmd/linuxkit/moby/images.yaml index a0f4dbc40..936ac3826 100644 --- a/src/cmd/linuxkit/moby/images.yaml +++ b/src/cmd/linuxkit/moby/images.yaml @@ -1,13 +1,13 @@ - iso: linuxkit/mkimage-iso:3189befa740156b22c987be9cd46fd6e444b4eeb - iso-bios: linuxkit/mkimage-iso-bios:583857f93befadcc6d7dadca348bb862185e262b - iso-efi: linuxkit/mkimage-iso-efi:2e50a41e4d2ba15a005a738720b499844c0df1b4 - iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:e763a5f89c50d0d7bd5734da6a4e15c4431f9f50 - raw-bios: linuxkit/mkimage-raw-bios:88ea52ae69c5d5c15f029074b632bcd14d8c9ac5 - raw-efi: linuxkit/mkimage-raw-efi:3a923776eabab765444e89a1e2252f2677a4bf29 - squashfs: linuxkit/mkimage-squashfs:463e0db20f222810fb09d952f6710f4814515144 + iso: linuxkit/mkimage-iso:1f6fdf0ee860caf13c06a6f3f2d89413de78881e + iso-bios: linuxkit/mkimage-iso-bios:314c06ec0d72f12057c9e8d5fdf790df02dbc8c2 + iso-efi: linuxkit/mkimage-iso-efi:b74d215d594ccdf7d51fa412518b2f895aa7f9dc + iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:0e66171ffde9bb735b0e014f811f9626fc8b9bc9 + raw-bios: linuxkit/mkimage-raw-bios:6185592a62b860b01491d7f1661e79f62e6fc902 + raw-efi: linuxkit/mkimage-raw-efi:6dff9623fb4fecff05ca02123aa8bc345ab7c707 + squashfs: linuxkit/mkimage-squashfs:92dbcfe5ef69dc93276403b09a9f892f25654ed7 gcp: linuxkit/mkimage-gcp:a7416d21d4ef642bb2ba560c8f7651250823546d - qcow2-efi: linuxkit/mkimage-qcow2-efi:2ddcfc53048a409937e90f98bbe0032e0667b1aa + qcow2-efi: linuxkit/mkimage-qcow2-efi:67d5e16228dfb434ac5418bafac720bf23bbaf42 vhd: linuxkit/mkimage-vhd:4cc60c4f46b07e11c64ba618e46b81fa0096c91f dynamic-vhd: linuxkit/mkimage-dynamic-vhd:99b9009ed54a793020d3ce8322a42e0cc06da71a vmdk: linuxkit/mkimage-vmdk:b55ea46297a16d8a4448ce7f5a2df987a9602b27 - rpi3: linuxkit/mkimage-rpi3:54682f9312701afa01eaf92fa5253b76c7d5c635 + rpi3: linuxkit/mkimage-rpi3:d76bb890e1d55c2d9395e0ca58523ee076571c21 diff --git a/src/cmd/linuxkit/moby/mkimage.yaml b/src/cmd/linuxkit/moby/mkimage.yaml index a459a4457..cf705f09a 100644 --- a/src/cmd/linuxkit/moby/mkimage.yaml +++ b/src/cmd/linuxkit/moby/mkimage.yaml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: mkimage - image: linuxkit/mkimage:ef008e6ec914daf0accbb02f5319fa2435d46133 + image: linuxkit/mkimage:43a37c8c98dfb4cdf9639223fa1baacf305eb5e7 - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a trust: org: - linuxkit diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index d3ed56372..e203cb8e4 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 9387d659a..e7f1a39d8 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -3,13 +3,13 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] # Add some random unsorted caps capabilities: @@ -18,7 +18,7 @@ onboot: services: - name: testservice - image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 # Some environments env: - BENV=true diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index 565fb5a25..4f7594f16 100644 --- a/test/cases/000_build/020_binds/test.yml +++ b/test/cases/000_build/020_binds/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 binds.add: - /check.sh:/check.sh - /var/tmp:/var/tmp @@ -16,7 +16,7 @@ onboot: # - /:/hostroot command: ["sh", "-c", "/check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 574d7507e..c2f94d895 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,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 574d7507e..c2f94d895 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,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 477f0c712..4f25d4bca 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,10 +2,10 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 8a6a6aeba..8127222c7 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,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 8a6a6aeba..8127222c7 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,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 8a6a6aeba..8127222c7 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,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 8a6a6aeba..8127222c7 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,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 d52b433f0..e60103a53 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] 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 8a6a6aeba..8127222c7 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,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 8a6a6aeba..8127222c7 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,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 605793479..f4a5e17e8 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:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 services: - name: acpid - image: linuxkit/acpid:c05a368754f6436b326945dc16135ba547568d8d + image: linuxkit/acpid:548f8f1c8bda31cdbefb65bdb0747f97c17639d2 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 8a6a6aeba..8127222c7 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 fce2394e3..d1f8a04ec 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,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.172 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:dca02848703c85d896907d63325883c058c1a9d7 + image: linuxkit/test-kernel-config:6f722f5b4f25152e7cf465df79ae6b2aefd3a007 - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] 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 ede4a4eac..d6057c310 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,11 +2,11 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:dca02848703c85d896907d63325883c058c1a9d7 + image: linuxkit/test-kernel-config:6f722f5b4f25152e7cf465df79ae6b2aefd3a007 - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] 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 7738dab17..22530aaa2 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,11 +2,11 @@ kernel: image: linuxkit/kernel:5.15.27 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:dca02848703c85d896907d63325883c058c1a9d7 + image: linuxkit/test-kernel-config:6f722f5b4f25152e7cf465df79ae6b2aefd3a007 - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] 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 94d966394..4634006cf 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,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.172 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check image: kmod-test @@ -13,5 +13,5 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] 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 c04afff1b..4aab0c0ca 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,8 +2,8 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check image: kmod-test @@ -13,5 +13,5 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] 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 873d04878..596e2bac2 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,8 +2,8 @@ kernel: image: linuxkit/kernel:5.15.27 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check image: kmod-test @@ -13,5 +13,5 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index 750bd292a..a74f43dae 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index 4045aedb4..9bd93b722 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 3105039c5..4c351856e 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 3105039c5..4c351856e 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index eafbe857e..ddc0fec16 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index eafbe857e..ddc0fec16 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index 38d831fc5..f275b63b3 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index 35831f52d..b7e757f9c 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index c9fa01380..d9b2668f6 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index c9fa01380..d9b2668f6 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index d826dfb35..f4ec8559d 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index d826dfb35..f4ec8559d 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index cc48b9669..3426f94a5 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index 0cde360a4..cb1092360 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index 349249eef..9366dc9cb 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index 349249eef..9366dc9cb 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index 9a39c30ba..11a318034 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index 9a39c30ba..11a318034 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 159e18e79..0ad2295d4 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index fd31f779a..b4090a2ef 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index 9a7622a49..3ad4e0342 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index 9a7622a49..3ad4e0342 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index 70b1e1935..32a1bdc27 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index 70b1e1935..32a1bdc27 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 166d90271..bfb0bca48 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 6fe470d08..540425d83 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index f00bb475d..50eecc4b8 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index f00bb475d..50eecc4b8 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index 4ad5dd4d7..82ba7c81c 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index 4ad5dd4d7..82ba7c81c 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index 7aa6e37f2..31be43013 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index 3fefaa77d..dee6345f9 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index 5ef204bb4..9cb12e24d 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index 5ef204bb4..9cb12e24d 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index 4285f08d9..a5f6fc276 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index 4285f08d9..a5f6fc276 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index 13dd51df9..c0b403694 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index c5d38a208..be7760023 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index 6742e16a7..755a4f89c 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index 6742e16a7..755a4f89c 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index 5cba2a682..26e784bfc 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index 5cba2a682..26e784bfc 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index 2133e8f40..024983a78 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index fc18d7866..d20a363aa 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index 9483b066e..a195617ee 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index 9483b066e..a195617ee 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index 04ca8ad5f..4bc7caafd 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index 04ca8ad5f..4bc7caafd 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index 0d5b21bfa..051aebe47 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml index ed1b8caf1..ca1da5041 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index 78c17e205..34eba8e7d 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml index 78c17e205..34eba8e7d 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index c29df45fe..44a293b32 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml index c29df45fe..44a293b32 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index 1cf25a91e..90da1713c 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml index 1f37baa9c..d2ca1b7e3 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index 361246716..92e78e15d 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml index 361246716..92e78e15d 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index b53987748..6fad66503 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml index b53987748..6fad66503 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml index 0e793bb7d..982c8f2e5 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml index b71d7a858..b30cdc153 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml index 586e0e901..35b5d089a 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml index bf7657472..77a66c448 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml index f1bdf577e..c51a8ab04 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml index bb1e8a502..192bf5d02 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml index 90268e3da..1673570d7 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index ca707ebe9..32af68b9c 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:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 7a703bc8d..ec142192c 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: sysfs - image: linuxkit/sysfs:c3bdb00c5e23bf566d294bafd5f7890ca319056f + image: linuxkit/sysfs:4f58a2447d328d391143984fc4e8508b00dc6e5b - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a + image: linuxkit/rngd:331294919ba6d953d261a2694019b659a98535a4 - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 - name: docker image: docker:20.10.6-dind capabilities: @@ -34,7 +34,7 @@ services: - /run:/var/run command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] - name: test-docker-bench - image: linuxkit/test-docker-bench:41684cb587e45d9e057bb1e51e8b75c02fe4a3e3 + image: linuxkit/test-docker-bench:3b801c257ab3736361bbfb7c4c8ae3ddcfc797f7 ipc: host pid: host net: host diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index bbea9d170..438c83a9a 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: test image: alpine:3.13 @@ -12,7 +12,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/001_dummy/test.yml b/test/cases/040_packages/001_dummy/test.yml index 1c3c23dbb..2f02d6495 100644 --- a/test/cases/040_packages/001_dummy/test.yml +++ b/test/cases/040_packages/001_dummy/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dummy - image: linuxkit/dummy:611bf5a6f37a3f508c3b8c7be5fb57fd70132c3e + image: linuxkit/dummy:b3004c5c8ecf05f8a315bef99078fe0a6deffcea - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] diff --git a/test/cases/040_packages/002_bcc/test.yml b/test/cases/040_packages/002_bcc/test.yml index ff5d39b09..8ef5ead74 100644 --- a/test/cases/040_packages/002_bcc/test.yml +++ b/test/cases/040_packages/002_bcc/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - linuxkit/kernel-bcc:5.4.113 onboot: - name: check-bcc @@ -17,7 +17,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 6007264f8..03569dd0b 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: binfmt - image: linuxkit/binfmt:a17941b47f5cb262638cfb49ffc59ac5ac2bf334 + image: linuxkit/binfmt:ecd24b710cad869af6a4716809f62d7164286367 - name: test image: alpine:3.13 binds: @@ -14,7 +14,7 @@ onboot: - /proc/sys/fs/binfmt_misc:/binfmt_misc command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 99942d866..63dd53da0 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/bpftrace:a5c57a3791a87e96aea456f78fd88973ea9904d0 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/bpftrace:aa3c430a9998399875e6cf3511e38fd3ab07cc5f onboot: - name: bpftrace-test image: alpine:3.13 @@ -17,7 +17,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 9ea137b5d..b8635626e 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: test image: alpine:3.13 @@ -13,7 +13,7 @@ onboot: - /etc:/host-etc command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/003_cgroupv2/test.yml b/test/cases/040_packages/003_cgroupv2/test.yml index ac148d2d4..badff2422 100644 --- a/test/cases/040_packages/003_cgroupv2/test.yml +++ b/test/cases/040_packages/003_cgroupv2/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "linuxkit.unified_cgroup_hierarchy=1 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: test image: alpine:3.13 @@ -15,7 +15,7 @@ onboot: - /run:/run command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 8bd2dbb62..2297a103d 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,22 +2,22 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:56001736371960e8989f93e90211eaa7f1a573b3 + image: linuxkit/test-containerd:f7440607d4f022907e8fcc15fe49ffa233b7c758 - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index cfd6413c8..ef735032b 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: alpine:3.13 @@ -15,7 +15,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 bbf23d332..babd1a0e9 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,11 +2,11 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dm-crypt - image: linuxkit/dm-crypt:908d3a270650aff7388092a307673c44d86e1ed0 + image: linuxkit/dm-crypt:526d32351c8246431be8e1a168cb514ff3c365af command: ["/usr/bin/crypto", "it_is_encrypted", "/dev/sda"] - name: test image: alpine:3.13 @@ -16,7 +16,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 5108f1ea4..83480b33d 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,11 +2,11 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dm-crypt - image: linuxkit/dm-crypt:908d3a270650aff7388092a307673c44d86e1ed0 + image: linuxkit/dm-crypt:526d32351c8246431be8e1a168cb514ff3c365af command: ["/usr/bin/crypto", "-l", "it_is_encrypted", "/dev/sda"] - name: test image: alpine:3.13 @@ -16,7 +16,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 511ae6d5a..d6e6d21f3 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,11 +2,11 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dm-crypt - image: linuxkit/dm-crypt:908d3a270650aff7388092a307673c44d86e1ed0 + image: linuxkit/dm-crypt:526d32351c8246431be8e1a168cb514ff3c365af command: ["/usr/bin/crypto", "-k", "/some/other/enc_key", "it_is_encrypted", "/dev/sda"] binds: - /dev/:/dev @@ -19,7 +19,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 613272353..7b8973dc0 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,13 +2,13 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -16,5 +16,5 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 72b017833..abfc5fb2c 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: extend - image: linuxkit/extend:c83f69816832024a742395f0ae903f5cb36a54c1 + image: linuxkit/extend:d6169ddc421bcaa4281c2feda77768b29b903e58 - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -17,7 +17,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 86d757870..0d2fc3345 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,17 +2,17 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: modprobe - image: linuxkit/modprobe:1b59b4f2ebb877085ea0d8d3a41cf06f64c09a15 + image: linuxkit/modprobe:5dd4d7238f760bcd9f91b9166f414da953242f43 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -20,5 +20,5 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 a10f729d3..6adbce790 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: modprobe - image: linuxkit/modprobe:1b59b4f2ebb877085ea0d8d3a41cf06f64c09a15 + image: linuxkit/modprobe:5dd4d7238f760bcd9f91b9166f414da953242f43 command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:c83f69816832024a742395f0ae903f5cb36a54c1 + image: linuxkit/extend:d6169ddc421bcaa4281c2feda77768b29b903e58 command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -21,7 +21,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/005_extend/002_xfs/check.sh b/test/cases/040_packages/005_extend/002_xfs/check.sh index 46ebe33a0..e7777cbe4 100755 --- a/test/cases/040_packages/005_extend/002_xfs/check.sh +++ b/test/cases/040_packages/005_extend/002_xfs/check.sh @@ -9,5 +9,5 @@ function failed { [ -f /var/lib/docker/bar ] || failed touch /var/lib/docker/foo || failed -df -h | grep /var/lib/docker | grep -qE "[4-5][0-9]{2}\.[0-9]{1,}M" || failed +df -h | grep /var/lib/docker | grep -qE "[5-7][0-9]{2}\.[0-9]{1,}M" || failed printf "extend test suite PASSED\n" >&1 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 24d663a67..31cc60248 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,14 +2,14 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -17,5 +17,5 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] diff --git a/test/cases/040_packages/005_extend/002_xfs/test.sh b/test/cases/040_packages/005_extend/002_xfs/test.sh index 1a90541d3..5ba63d50b 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.sh +++ b/test/cases/040_packages/005_extend/002_xfs/test.sh @@ -9,7 +9,7 @@ set -ex #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" -NAME_CREATE=extend-xfs +NAME_CREATE=create-xfs NAME_EXTEND=extend-xfs DISK=disk.img @@ -20,11 +20,11 @@ trap clean_up EXIT # Test code goes here linuxkit build --name "${NAME_CREATE}" --format kernel+initrd test-create.yml -linuxkit run --disk file="${DISK}",format=raw,size=256M "${NAME_CREATE}" +linuxkit run --disk file="${DISK}",format=raw,size=512M "${NAME_CREATE}" [ -f "${DISK}" ] || exit 1 # osx takes issue with bs=1M dd if=/dev/zero bs=1048576 count=256 >> "${DISK}" -linuxkit build --format kernel+initrd --name ${NAME_EXTEND} test.yml +linuxkit build --name "${NAME_EXTEND}" --format kernel+initrd test.yml RESULT="$(linuxkit run --disk file=${DISK} ${NAME_EXTEND})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" 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 174846d33..67e517b60 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: extend - image: linuxkit/extend:c83f69816832024a742395f0ae903f5cb36a54c1 + image: linuxkit/extend:d6169ddc421bcaa4281c2feda77768b29b903e58 command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 b064542fe..8bf2fcee2 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,14 +2,14 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-partition", "gpt"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -17,5 +17,5 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] 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 72b017833..abfc5fb2c 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: extend - image: linuxkit/extend:c83f69816832024a742395f0ae903f5cb36a54c1 + image: linuxkit/extend:d6169ddc421bcaa4281c2feda77768b29b903e58 - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -17,7 +17,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 930e41b3c..6774f5536 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,14 +2,14 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 fc9bc0f66..9744d8cfa 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,14 +2,14 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 dddfed604..7819c64dd 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,14 +2,14 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 c5f22a726..6d24a53a6 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,17 +2,17 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: modprobe - image: linuxkit/modprobe:1b59b4f2ebb877085ea0d8d3a41cf06f64c09a15 + image: linuxkit/modprobe:5dd4d7238f760bcd9f91b9166f414da953242f43 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -21,7 +21,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 38ab90f46..b2d7f1512 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,14 +2,14 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 b858eb9b6..8b48355ff 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,23 +2,23 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] @@ -26,7 +26,7 @@ onboot: - CAP_SYS_ADMIN - CAP_MKNOD - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 95c0bcd66..ab5d8ee9a 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,14 +2,14 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-partition", "gpt"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.13 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 b98295940..4994fa25a 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,20 +2,20 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918 + image: linuxkit/format:9c40b556691c1bf47394603aeb2dbdba21e7e32e command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176 + image: linuxkit/mount:a8581e454f846690d09e2e7c6287d3c84ca53257 command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.13 @@ -25,7 +25,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index aeae2971c..989d4302d 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c + image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/test/cases/040_packages/009_init_containerd/test.yml b/test/cases/040_packages/009_init_containerd/test.yml index 5c9521506..3d9e7707d 100644 --- a/test/cases/040_packages/009_init_containerd/test.yml +++ b/test/cases/040_packages/009_init_containerd/test.yml @@ -2,10 +2,10 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 services: - name: test image: alpine:3.13 diff --git a/test/cases/040_packages/011_kmsg/test.yml b/test/cases/040_packages/011_kmsg/test.yml index d59a7d55e..4fc5c16dd 100644 --- a/test/cases/040_packages/011_kmsg/test.yml +++ b/test/cases/040_packages/011_kmsg/test.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - - linuxkit/memlogd:36758a7ab239943852c4f849283e28ba975413c6 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 + - linuxkit/memlogd:67e3bc9d0f271336567f4bffbb80a8d57d5eddba services: - name: kmsg - image: linuxkit/kmsg:b2f6cd4ce9041120e30a4b5ab36bb8db4f5eb458 + image: linuxkit/kmsg:d86e8b0b44a01195f5ca644adb25994a24703f0f - name: write-and-rotate-logs - image: linuxkit/logwrite:6100d207d36a089f322defb60e86032c6f66078c + image: linuxkit/logwrite:f3ba46a1785036931bd156996659e967b594bb83 - name: check-the-logs image: alpine:3.13 binds: diff --git a/test/cases/040_packages/012_logwrite/test.yml b/test/cases/040_packages/012_logwrite/test.yml index 6be144f93..7a94f26d1 100644 --- a/test/cases/040_packages/012_logwrite/test.yml +++ b/test/cases/040_packages/012_logwrite/test.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - - linuxkit/memlogd:36758a7ab239943852c4f849283e28ba975413c6 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 + - linuxkit/memlogd:67e3bc9d0f271336567f4bffbb80a8d57d5eddba services: # A service which generates logs of log messages - name: fill-the-logs image: alpine command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); done" ] - name: write-and-rotate-logs - image: linuxkit/logwrite:6100d207d36a089f322defb60e86032c6f66078c + image: linuxkit/logwrite:f3ba46a1785036931bd156996659e967b594bb83 command: ["/usr/bin/logwrite", "-max-log-size", "1024"] - name: check-the-logs image: alpine:3.13 diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 206602aa8..62b9e4ef0 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: losetup - image: linuxkit/losetup:43e40be0c82cbccf171ebd2a8065246e2e84f66e + image: linuxkit/losetup:fcee8e453684d45c3c411fe8c28ecb2210158638 command: ["/usr/bin/loopy", "-c", "/var/test.img"] - name: test image: alpine:3.13 @@ -20,7 +20,7 @@ onboot: type: b command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh 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 5cf12311c..00ef9d65f 100644 --- a/test/cases/040_packages/013_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/013_metadata/000_cidata/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: metadata - image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a + image: linuxkit/metadata:cd284d211eb6456961bf9988f802492b4b63d5b5 - name: test image: alpine:3.13 binds: @@ -14,7 +14,7 @@ onboot: - /run:/run command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 2abf39df5..298bcb78e 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,10 +2,10 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: mkimage - image: linuxkit/mkimage:ef008e6ec914daf0accbb02f5319fa2435d46133 + image: linuxkit/mkimage:43a37c8c98dfb4cdf9639223fa1baacf305eb5e7 - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 237f014bd..b7db95428 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index f3a20016b..838541e5d 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: sysctl - image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae + image: linuxkit/sysctl:e5959517fab7b44692ad63941eecf37486e73799 - name: test image: alpine:3.13 net: host @@ -16,7 +16,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 9ed6ce834..e768fe66e 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf + image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 net: new binds: - /etc/wireguard:/etc/wireguard diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index cf0adf808..a332ec771 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd binds: - /etc/ltp/baseline:/etc/ltp/baseline - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a files: - path: /etc/ltp/baseline contents: "100" diff --git a/test/hack/test.yml b/test/hack/test.yml index e23b04eac..8927265ba 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,15 +4,15 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 - - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e + - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 + image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: linuxkit/test-kernel-config:dca02848703c85d896907d63325883c058c1a9d7 + image: linuxkit/test-kernel-config:6f722f5b4f25152e7cf465df79ae6b2aefd3a007 - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "120"] diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index e98bb6401..817d8dd64 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,5 +1,5 @@ -FROM linuxkit/containerd-dev:e6a8da1e270da1601ed1bb85bb44c4442e5d51be as containerd-dev -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/containerd-dev:30c6ccebe92d8af06596fb33b71ec005859116cc as containerd-dev +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) diff --git a/test/pkg/containerd/build.yml b/test/pkg/containerd/build.yml index d62e24de3..cfa9679b4 100644 --- a/test/pkg/containerd/build.yml +++ b/test/pkg/containerd/build.yml @@ -12,9 +12,11 @@ config: - /usr/bin/containerd:/usr/bin/containerd - /usr/bin/containerd-shim:/usr/bin/containerd-shim devices: - # all block devices + # all block and character devices - path: all type: b + - path: all + type: c mounts: - type: cgroup options: ["rw","nosuid","noexec","nodev","relatime"] diff --git a/test/pkg/docker-bench/Dockerfile b/test/pkg/docker-bench/Dockerfile index dbf796f38..ab1e8610c 100644 --- a/test/pkg/docker-bench/Dockerfile +++ b/test/pkg/docker-bench/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/test/pkg/kernel-config/Dockerfile b/test/pkg/kernel-config/Dockerfile index d460224e9..03e013340 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl bash diff --git a/test/pkg/ns/Dockerfile b/test/pkg/ns/Dockerfile index 6edd386be..3c4a50aa6 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ @@ -8,7 +8,7 @@ RUN apk add --no-cache --initdb -p /out \ musl RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache \ build-base \ git \ diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 60626f95a..67f3f722c 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,16 +3,16 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - - linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4 + - linuxkit/init:14df799bb3b9e0eb0491da9fda7f32a108a2e2a5 + - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: test-ns - image: linuxkit/test-ns:07a17973bb80d30d5924a440a33bfaaf475500ca + image: linuxkit/test-ns:bd163e189ce4985a798aa422c5509ef44e031756 command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] # command: ["/bin/sh", "/runc-net.sh", "-l", "5", "-i", "2", "-c", "5", "-p", "unix", "-ip", "6"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c + image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile index 1833622c2..5906884bd 100644 --- a/test/pkg/poweroff/Dockerfile +++ b/test/pkg/poweroff/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile index 851d01162..db9a90c7e 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ tini RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 957619b9f..d3712ffd8 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 AS mirror +FROM alpine:3.17 AS mirror # update base image RUN apk update && apk upgrade -a @@ -32,9 +32,8 @@ RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" > COPY go-compile.sh /go/bin/ RUN apk add --no-cache git go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin -RUN go get -u golang.org/x/lint/golint -RUN go get -u github.com/gordonklaus/ineffassign -RUN go get -u github.com/LK4D4/vndr +RUN go install golang.org/x/lint/golint@latest +RUN go install github.com/gordonklaus/ineffassign@latest # Checkout and compile iucode-tool for Intel CPU microcode # On non-x86_64 create a dummy file to copy below. @@ -56,7 +55,7 @@ RUN set -e && \ cp iucode_tool /iucode_tool; \ fi -FROM alpine:3.14 +FROM alpine:3.17 ARG TARGETARCH diff --git a/tools/alpine/go-compile.sh b/tools/alpine/go-compile.sh index bc8edd421..5c84e2e5a 100755 --- a/tools/alpine/go-compile.sh +++ b/tools/alpine/go-compile.sh @@ -18,16 +18,16 @@ cd "$dir" # lint before building >&2 echo "gofmt..." -test -z $(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr) +test -z "$(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr)" >&2 echo "govet..." -test -z $(GOOS=linux go vet -printf=false . 2>&1 | grep -v "^#" | grep -v vendor/ | tee /dev/stderr) +test -z "$(GOOS=linux go vet -printf=false . 2>&1 | grep -v "^#" | grep -v vendor/ | tee /dev/stderr)" >&2 echo "golint..." -test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec golint {} \; | tee /dev/stderr) +test -z "$(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec golint {} \; | tee /dev/stderr)" >&2 echo "ineffassign..." -test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec ineffassign {} \; | tee /dev/stderr) +test -z "$(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec ineffassign {} \; | tee /dev/stderr)" >&2 echo "go test..." go test diff --git a/tools/alpine/packages b/tools/alpine/packages index 2fd471d66..5ea84fdb7 100644 --- a/tools/alpine/packages +++ b/tools/alpine/packages @@ -1,4 +1,5 @@ abuild +acpid alpine-baselayout alpine-keys apk-tools @@ -18,7 +19,6 @@ bsd-compat-headers btrfs-progs btrfs-progs-dev build-base -busybox-initscripts ca-certificates cdrkit cifs-utils @@ -42,7 +42,6 @@ expect findutils flex flex-dev -fts-dev gcc gettext gettext-dev @@ -84,6 +83,7 @@ mpfr-dev mtools multipath-tools musl-dev +musl-fts-dev ncurses-dev nfs-utils open-iscsi @@ -96,7 +96,6 @@ openssl openssl-dev patch pigz -python2 python3 qemu-aarch64 qemu-arm diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 8546379b9..38ecedfb6 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,370 +1,387 @@ -# linuxkit/alpine:6f9efe87b3c394196949985f0ed6b5263432670a-arm64 +# linuxkit/alpine:1e9d030f156213bf857e32cb824e86a834e29d5f-arm64 # automatically generated list of installed packages -abuild-3.8.0_rc4-r0 -alpine-baselayout-3.2.0-r16 -alpine-keys-2.4-r0 -apk-tools-2.12.7-r0 -argon2-libs-20190702-r1 -argp-standalone-1.3-r4 -attr-2.5.1-r0 -attr-dev-2.5.1-r0 -audit-3.0.1-r1 -audit-libs-3.0.1-r1 -audit-openrc-3.0.1-r1 -autoconf-2.71-r0 -automake-1.16.3-r0 -bash-5.1.4-r0 -bc-1.07.1-r1 -binutils-2.35.2-r2 -binutils-dev-2.35.2-r2 -binutils-gold-2.35.2-r2 -bison-3.7.6-r0 -blkid-2.37.4-r0 -bridge-utils-1.7.1-r0 -brotli-libs-1.0.9-r5 +abuild-3.10.0-r0 +acpid-2.0.34-r0 +acpid-openrc-2.0.34-r0 +agetty-2.38.1-r0 +agetty-openrc-0.45.2-r7 +alpine-baselayout-3.4.0-r0 +alpine-baselayout-data-3.4.0-r0 +alpine-keys-2.4-r1 +apk-tools-2.12.10-r1 +argon2-libs-20190702-r2 +argp-standalone-1.5.0-r0 +attr-2.5.1-r2 +attr-dev-2.5.1-r2 +audit-3.0.9-r0 +audit-libs-3.0.9-r0 +audit-openrc-3.0.9-r0 +autoconf-2.71-r1 +automake-1.16.5-r1 +bash-5.2.15-r0 +bc-1.07.1-r2 +binutils-2.39-r2 +binutils-dev-2.39-r2 +binutils-gold-2.39-r2 +bison-3.8.2-r0 +blkid-2.38.1-r0 +bridge-utils-1.7.1-r1 +brotli-libs-1.0.9-r9 bsd-compat-headers-0.7.2-r3 -btrfs-progs-5.12.1-r0 -btrfs-progs-dev-5.12.1-r0 -btrfs-progs-libs-5.12.1-r0 -build-base-0.5-r2 -busybox-1.33.1-r6 -busybox-initscripts-3.3-r1 -bzip2-1.0.8-r1 -ca-certificates-20211220-r0 -ca-certificates-bundle-20211220-r0 -cdrkit-1.1.11-r3 -cfdisk-2.37.4-r0 -cifs-utils-6.13-r0 -clang-11.1.0-r1 -clang-dev-11.1.0-r1 -clang-extra-tools-11.1.0-r1 -clang-libs-11.1.0-r1 -clang-static-11.1.0-r1 -cmake-3.20.3-r0 -coreutils-8.32-r2 -cryptsetup-2.3.7-r0 -cryptsetup-libs-2.3.7-r0 -cryptsetup-openrc-2.3.7-r0 -curl-7.79.1-r0 -dbus-libs-1.12.20-r2 -device-mapper-2.02.187-r1 -device-mapper-event-libs-2.02.187-r1 -device-mapper-libs-2.02.187-r1 -device-mapper-udev-2.02.187-r1 -dhcpcd-8.1.9-r0 -dhcpcd-openrc-8.1.9-r0 -diffutils-3.7-r0 -dosfstools-4.2-r0 -dtc-1.6.1-r0 -e2fsprogs-1.46.2-r0 -e2fsprogs-dev-1.46.2-r0 -e2fsprogs-extra-1.46.2-r0 -e2fsprogs-libs-1.46.2-r0 -elfutils-dev-0.182-r1 -ethtool-5.12-r0 -eudev-3.2.10-r0 -eudev-libs-3.2.10-r0 -eudev-openrc-3.2.10-r0 -expat-2.4.7-r0 -expect-5.45.4-r0 -fakeroot-1.25.3-r3 -file-5.40-r1 -findmnt-2.37.4-r0 -findutils-4.8.0-r1 -flex-2.6.4-r2 -flex-dev-2.6.4-r2 -flex-libs-2.6.4-r2 -flock-2.37.4-r0 +btrfs-progs-6.0.2-r0 +btrfs-progs-dev-6.0.2-r0 +btrfs-progs-libs-6.0.2-r0 +build-base-0.5-r3 +busybox-1.35.0-r29 +busybox-binsh-1.35.0-r29 +bzip2-1.0.8-r4 +ca-certificates-20220614-r3 +ca-certificates-bundle-20220614-r3 +capstone-4.0.2-r4 +cdrkit-1.1.11-r4 +cfdisk-2.38.1-r0 +cifs-utils-7.0-r0 +clang15-15.0.6-r0 +clang15-dev-15.0.6-r0 +clang15-extra-tools-15.0.6-r0 +clang15-libclang-15.0.6-r0 +clang15-libs-15.0.6-r0 +clang15-static-15.0.6-r0 +cmake-3.24.3-r0 +coreutils-9.1-r0 +cryptsetup-2.5.0-r2 +cryptsetup-libs-2.5.0-r2 +cryptsetup-openrc-2.5.0-r2 +curl-7.87.0-r0 +dbus-libs-1.14.4-r0 +device-mapper-2.03.17-r1 +device-mapper-event-libs-2.03.17-r1 +device-mapper-libs-2.03.17-r1 +device-mapper-udev-2.03.17-r1 +dhcpcd-9.4.1-r1 +dhcpcd-openrc-9.4.1-r1 +diffutils-3.8-r1 +dosfstools-4.2-r1 +dtc-1.6.1-r2 +e2fsprogs-1.46.5-r4 +e2fsprogs-dev-1.46.5-r4 +e2fsprogs-extra-1.46.5-r4 +e2fsprogs-libs-1.46.5-r4 +elfutils-dev-0.187-r2 +ethtool-6.0-r0 +eudev-3.2.11-r4 +eudev-libs-3.2.11-r4 +eudev-openrc-3.2.11-r4 +expect-5.45.4-r3 +fakeroot-1.29-r0 +file-5.43-r0 +findmnt-2.38.1-r0 +findutils-4.9.0-r2 +flex-2.6.4-r3 +flex-dev-2.6.4-r3 +flex-libs-2.6.4-r3 +flock-2.38.1-r0 fortify-headers-1.1-r1 -fts-1.2.7-r1 -fts-dev-1.2.7-r1 -g++-10.3.1_git20210424-r2 -gawk-5.1.0-r0 -gc-8.0.4-r5 -gcc-10.3.1_git20210424-r2 -gdbm-1.19-r0 -gettext-0.21-r0 -gettext-asprintf-0.21-r0 -gettext-dev-0.21-r0 -gettext-libs-0.21-r0 -git-2.32.0-r0 -git-perl-2.32.0-r0 -glib-2.68.3-r0 -gmp-6.2.1-r1 -gmp-dev-6.2.1-r1 -gnupg-2.2.31-r0 -gnutls-3.7.1-r0 -go-1.16.10-r0 -grep-3.7-r0 -guile-3.0.6-r0 -guile-libs-3.0.6-r0 -hexdump-2.37.4-r0 -hvtools-4.11.9-r1 -ifupdown-ng-0.11.3-r0 -ifupdown-ng-ethtool-0.11.3-r0 -ifupdown-ng-iproute2-0.11.3-r0 -ifupdown-ng-wifi-0.11.3-r0 -ifupdown-ng-wireguard-0.11.3-r0 -inih-53-r1 -installkernel-3.5-r1 -ip6tables-1.8.7-r1 -ip6tables-openrc-1.8.7-r1 -iperf3-3.10.1-r0 -iperf3-openrc-3.10.1-r0 -iproute2-5.12.0-r0 -iproute2-minimal-5.12.0-r0 -iproute2-ss-5.12.0-r0 -iproute2-tc-5.12.0-r0 -iptables-1.8.7-r1 -iptables-openrc-1.8.7-r1 -ipvsadm-1.31-r0 -isl22-0.22-r0 -jq-1.6-r1 -json-c-0.15-r1 -keyutils-1.6.3-r0 -keyutils-libs-1.6.3-r0 -kmod-29-r0 -kmod-libs-29-r0 -kmod-openrc-29-r0 +fstrim-2.38.1-r0 +g++-12.2.1_git20220924-r4 +gawk-5.1.1-r1 +gc-8.2.2-r0 +gcc-12.2.1_git20220924-r4 +gdbm-1.23-r0 +gettext-0.21.1-r1 +gettext-asprintf-0.21.1-r1 +gettext-dev-0.21.1-r1 +gettext-libs-0.21.1-r1 +git-2.38.2-r0 +git-perl-2.38.2-r0 +glib-2.74.4-r0 +gmp-6.2.1-r2 +gmp-dev-6.2.1-r2 +gnupg-2.2.40-r0 +gnupg-dirmngr-2.2.40-r0 +gnupg-gpgconf-2.2.40-r0 +gnupg-utils-2.2.40-r0 +gnupg-wks-client-2.2.40-r0 +gnutls-3.7.8-r2 +go-1.19.4-r0 +gpg-2.2.40-r0 +gpg-agent-2.2.40-r0 +gpg-wks-server-2.2.40-r0 +gpgsm-2.2.40-r0 +gpgv-2.2.40-r0 +grep-3.8-r1 +guile-3.0.8-r3 +guile-libs-3.0.8-r3 +hexdump-2.38.1-r0 +hvtools-4.11.9-r2 +ifupdown-ng-0.12.1-r0 +ifupdown-ng-ethtool-0.12.1-r0 +ifupdown-ng-iproute2-0.12.1-r0 +ifupdown-ng-wifi-0.12.1-r0 +ifupdown-ng-wireguard-0.12.1-r0 +ifupdown-ng-wireguard-quick-0.12.1-r0 +inih-56-r0 +installkernel-3.5-r2 +ip6tables-1.8.8-r2 +ip6tables-openrc-1.8.8-r2 +iperf3-3.12-r0 +iperf3-openrc-3.12-r0 +iproute2-6.0.0-r1 +iproute2-minimal-6.0.0-r1 +iproute2-ss-6.0.0-r1 +iproute2-tc-6.0.0-r1 +iptables-1.8.8-r2 +iptables-openrc-1.8.8-r2 +ipvsadm-1.31-r1 +isl25-0.25-r0 +jq-1.6-r2 +json-c-0.16-r0 +keyutils-1.6.3-r1 +keyutils-libs-1.6.3-r1 +kmod-30-r1 +kmod-libs-30-r1 +kmod-openrc-30-r1 krb5-conf-1.0-r2 -krb5-dev-1.18.4-r0 -krb5-libs-1.18.4-r0 -krb5-server-ldap-1.18.4-r0 -libacl-2.2.53-r0 -libaio-0.3.112-r1 -libarchive-3.5.2-r0 -libarchive-tools-3.5.2-r0 -libassuan-2.5.5-r0 -libatomic-10.3.1_git20210424-r2 -libattr-2.5.1-r0 -libblkid-2.37.4-r0 -libbsd-0.11.3-r0 -libburn-1.5.4-r0 -libbz2-1.0.8-r1 +krb5-dev-1.20.1-r0 +krb5-libs-1.20.1-r0 +krb5-server-ldap-1.20.1-r0 +libacl-2.3.1-r1 +libaio-0.3.113-r0 +libarchive-3.6.1-r2 +libarchive-tools-3.6.1-r2 +libassuan-2.5.5-r1 +libatomic-12.2.1_git20220924-r4 +libattr-2.5.1-r2 +libblkid-2.38.1-r0 +libburn-1.5.4-r2 +libbz2-1.0.8-r4 libc-dev-0.7.2-r3 libc-utils-0.7.2-r3 -libc6-compat-1.2.2-r3 -libcap-2.50-r0 -libcap-ng-0.8.2-r0 -libcap-ng-dev-0.8.2-r0 -libcom_err-1.46.2-r0 -libcrypto1.1-1.1.1n-r0 -libcurl-7.79.1-r0 -libdrm-2.4.106-r0 -libeconf-0.3.8-r1 -libedit-20210216.3.1-r0 -libedit-dev-20210216.3.1-r0 -libelf-0.182-r1 -libelf-static-0.182-r1 -libepoxy-1.5.8-r0 -libevent-2.1.12-r2 -libfdisk-2.37.4-r0 -libfdt-1.6.1-r0 -libffi-3.3-r2 -libgcc-10.3.1_git20210424-r2 -libgcrypt-1.9.4-r0 -libgmpxx-6.2.1-r1 -libgomp-10.3.1_git20210424-r2 -libgpg-error-1.42-r0 -libgphobos-10.3.1_git20210424-r2 -libintl-0.21-r0 -libisoburn-1.5.4-r0 -libisofs-1.5.4-r0 -libjpeg-turbo-2.1.0-r0 -libksba-1.5.1-r0 -libldap-2.4.58-r0 -libltdl-2.4.6-r7 -libmagic-5.40-r1 -libmd-1.0.3-r0 -libmnl-1.0.4-r1 -libmount-2.37.4-r0 -libnfsidmap-2.5.3-r0 -libnftnl-libs-1.2.0-r0 -libnl3-3.5.0-r0 -libpcap-1.10.0-r0 -libpng-1.6.37-r1 -libressl-dev-3.3.6-r0 -libressl3.3-libcrypto-3.3.6-r0 -libressl3.3-libssl-3.3.6-r0 -libressl3.3-libtls-3.3.6-r0 -libretls-3.3.3p1-r2 -libsasl-2.1.27-r12 -libseccomp-2.5.1-r2 -libseccomp-dev-2.5.1-r2 -libseccomp-static-2.5.1-r2 -libsecret-0.20.4-r1 -libsmartcols-2.37.4-r0 -libssl1.1-1.1.1n-r0 -libstdc++-10.3.1_git20210424-r2 -libtasn1-4.17.0-r0 -libtirpc-1.3.2-r0 -libtirpc-conf-1.3.2-r0 -libtirpc-dev-1.3.2-r0 -libtirpc-nokrb-1.3.2-r0 -libtool-2.4.6-r7 -libucontext-1.1-r0 -libucontext-dev-1.1-r0 -libunistring-0.9.10-r1 -libunwind-1.5.0-r1 -libunwind-dev-1.5.0-r1 -libusb-1.0.24-r2 -libuuid-2.37.4-r0 -libuv-1.41.0-r0 -libverto-0.3.2-r0 -libwbclient-4.14.12-r0 -libx11-1.7.2-r0 -libxau-1.0.9-r0 -libxcb-1.14-r2 -libxdmcp-1.1.3-r0 -libxkbcommon-1.2.1-r0 -libxml2-2.9.13-r0 -linux-headers-5.10.41-r0 -llvm11-11.1.0-r2 -llvm11-dev-11.1.0-r2 -llvm11-libs-11.1.0-r2 -llvm11-static-11.1.0-r2 -logger-2.37.4-r0 -lsblk-2.37.4-r0 -lsscsi-0.32-r0 -lua5.3-libs-5.3.6-r0 -luajit-2.1_p20210510-r0 -luajit-dev-2.1_p20210510-r0 -lvm2-2.02.187-r1 -lvm2-libs-2.02.187-r1 -lvm2-openrc-2.02.187-r1 -lz4-libs-1.9.3-r1 -lzip-1.22-r0 -lzo-2.10-r2 -m4-1.4.18-r2 -make-4.3-r0 -mcookie-2.37.4-r0 -mesa-21.1.2-r0 -mesa-gbm-21.1.2-r0 -mpc1-1.2.1-r0 -mpc1-dev-1.2.1-r0 +libc6-compat-1.2.3-r4 +libcap-ng-0.8.3-r1 +libcap-ng-dev-0.8.3-r1 +libcap2-2.66-r0 +libcom_err-1.46.5-r4 +libcrypto3-3.0.7-r0 +libcurl-7.87.0-r0 +libeconf-0.4.7-r0 +libedit-20221030.3.1-r0 +libedit-dev-20221030.3.1-r0 +libelf-0.187-r2 +libelf-static-0.187-r2 +libev-4.33-r0 +libevent-2.1.12-r5 +libexpat-2.5.0-r0 +libfdisk-2.38.1-r0 +libfdt-1.6.1-r2 +libffi-3.4.4-r0 +libffi-dev-3.4.4-r0 +libgcc-12.2.1_git20220924-r4 +libgcrypt-1.10.1-r0 +libgmpxx-6.2.1-r2 +libgomp-12.2.1_git20220924-r4 +libgpg-error-1.46-r1 +libintl-0.21.1-r1 +libisoburn-1.5.4-r2 +libisofs-1.5.4-r2 +libjpeg-turbo-2.1.4-r0 +libksba-1.6.3-r0 +libldap-2.6.3-r6 +libltdl-2.4.7-r0 +libmagic-5.43-r0 +libmnl-1.0.5-r0 +libmount-2.38.1-r0 +libnfsidmap-2.6.2-r0 +libnftnl-1.2.4-r0 +libnl3-3.7.0-r0 +libpcap-1.10.1-r1 +libpng-1.6.38-r0 +libressl-dev-3.6.1-r0 +libressl3.6-libcrypto-3.6.1-r0 +libressl3.6-libssl-3.6.1-r0 +libressl3.6-libtls-3.6.1-r0 +libretls-3.5.2-r1 +libsasl-2.1.28-r3 +libseccomp-2.5.4-r0 +libseccomp-dev-2.5.4-r0 +libseccomp-static-2.5.4-r0 +libslirp-4.7.0-r0 +libsmartcols-2.38.1-r0 +libssl3-3.0.7-r0 +libstdc++-12.2.1_git20220924-r4 +libstdc++-dev-12.2.1_git20220924-r4 +libtasn1-4.19.0-r0 +libtirpc-1.3.3-r0 +libtirpc-conf-1.3.3-r0 +libtirpc-dev-1.3.3-r0 +libtirpc-nokrb-1.3.3-r0 +libtool-2.4.7-r0 +libucontext-1.2-r0 +libucontext-dev-1.2-r0 +libunistring-1.1-r0 +libunwind-1.6.2-r0 +libunwind-dev-1.6.2-r0 +liburing-2.3-r0 +libuuid-2.38.1-r0 +libuv-1.44.2-r0 +libverto-0.3.2-r1 +libverto-dev-0.3.2-r1 +libverto-glib-0.3.2-r1 +libverto-libev-0.3.2-r1 +libverto-libevent-0.3.2-r1 +libwbclient-4.16.8-r0 +libxml2-2.10.3-r1 +linux-headers-5.19.5-r0 +linux-pam-1.5.2-r1 +llvm15-15.0.6-r0 +llvm15-dev-15.0.6-r0 +llvm15-libs-15.0.6-r0 +llvm15-static-15.0.6-r0 +llvm15-test-utils-15.0.6-r0 +logger-2.38.1-r0 +losetup-2.38.1-r0 +lsblk-2.38.1-r0 +lsscsi-0.32-r1 +luajit-2.1_p20210510-r3 +luajit-dev-2.1_p20210510-r3 +lvm2-2.03.17-r1 +lvm2-libs-2.03.17-r1 +lvm2-openrc-2.03.17-r1 +lz4-libs-1.9.4-r1 +lzip-1.23-r0 +lzo-2.10-r3 +m4-1.4.19-r1 +make-4.3-r1 +mcookie-2.38.1-r0 +mount-2.38.1-r0 +mpc1-1.2.1-r1 +mpc1-dev-1.2.1-r1 mpdecimal-2.5.1-r1 mpfr-dev-4.1.0-r0 mpfr4-4.1.0-r0 -mtools-4.0.29-r1 -multipath-tools-0.8.6-r0 -multipath-tools-openrc-0.8.6-r0 -musl-1.2.2-r3 -musl-dev-1.2.2-r3 -musl-utils-1.2.2-r3 -ncurses-dev-6.2_p20210612-r0 -ncurses-libs-6.2_p20210612-r0 -ncurses-terminfo-base-6.2_p20210612-r0 -nettle-3.7.3-r0 -nfs-utils-2.5.3-r0 -nfs-utils-openrc-2.5.3-r0 -nghttp2-libs-1.43.0-r0 -npth-1.6-r0 -numactl-2.0.14-r0 -oniguruma-6.9.7.1-r0 -open-iscsi-2.1.4-r1 -open-iscsi-libs-2.1.4-r1 -open-iscsi-openrc-2.1.4-r1 -open-isns-lib-0.101-r0 -openntpd-6.8_p1-r3 -openntpd-openrc-6.8_p1-r3 -openrc-0.43.3-r2 -openresolv-3.12.0-r0 -openssh-client-common-8.6_p1-r3 -openssh-client-default-8.6_p1-r3 -openssh-keygen-8.6_p1-r3 -openssh-server-8.6_p1-r3 -openssh-server-common-8.6_p1-r3 -openssl-1.1.1n-r0 -openssl-dev-1.1.1n-r0 -p11-kit-0.23.22-r0 -partx-2.37.4-r0 -patch-2.7.6-r7 -pcre-8.44-r0 -pcre2-10.36-r0 -pcsc-lite-libs-1.9.1-r0 -perl-5.32.1-r0 +mtools-4.0.42-r0 +multipath-tools-0.9.3-r1 +multipath-tools-openrc-0.9.3-r1 +musl-1.2.3-r4 +musl-dev-1.2.3-r4 +musl-fts-1.2.7-r3 +musl-fts-dev-1.2.7-r3 +musl-utils-1.2.3-r4 +ncurses-dev-6.3_p20221119-r0 +ncurses-libs-6.3_p20221119-r0 +ncurses-terminfo-base-6.3_p20221119-r0 +nettle-3.8.1-r0 +nfs-utils-2.6.2-r0 +nfs-utils-openrc-2.6.2-r0 +nghttp2-libs-1.51.0-r0 +npth-1.6-r2 +numactl-2.0.16-r0 +oniguruma-6.9.8-r0 +open-iscsi-2.1.8-r0 +open-iscsi-libs-2.1.8-r0 +open-iscsi-openrc-2.1.8-r0 +open-isns-lib-0.102-r0 +openntpd-6.8_p1-r7 +openntpd-openrc-6.8_p1-r7 +openrc-0.45.2-r7 +openresolv-3.12.0-r1 +openssh-client-common-9.1_p1-r1 +openssh-client-default-9.1_p1-r1 +openssh-keygen-9.1_p1-r1 +openssh-server-9.1_p1-r1 +openssh-server-common-9.1_p1-r1 +openssl-3.0.7-r0 +openssl-dev-3.0.7-r0 +p11-kit-0.24.1-r1 +partx-2.38.1-r0 +patch-2.7.6-r8 +pcre-8.45-r2 +pcre2-10.42-r0 +pcsc-lite-libs-1.9.9-r0 +perl-5.36.0-r0 perl-error-0.17029-r1 -perl-git-2.32.0-r0 -pigz-2.6-r0 -pinentry-1.1.1-r0 -pixman-0.40.0-r2 -pkgconf-1.7.4-r0 -popt-1.18-r0 -python2-2.7.18-r2 -python3-3.9.5-r2 -qemu-6.0.0-r5 -qemu-aarch64-6.0.0-r5 -qemu-arm-6.0.0-r5 -qemu-guest-agent-6.0.0-r5 -qemu-img-6.0.0-r5 -qemu-ppc64le-6.0.0-r5 -qemu-system-aarch64-6.0.0-r5 -qemu-system-arm-6.0.0-r5 -qemu-system-x86_64-6.0.0-r5 -readline-8.1.0-r0 -rhash-libs-1.4.1-r0 -rpcbind-1.2.6-r0 -rpcbind-openrc-1.2.6-r0 -rsync-3.2.3-r4 -rsync-openrc-3.2.3-r4 -s6-ipcserver-2.10.0.3-r0 -samba-util-libs-4.14.12-r0 -scanelf-1.3.2-r0 -sed-4.8-r0 -setpriv-2.37.4-r0 -sfdisk-2.37.4-r0 -sg3_utils-1.45-r0 -sgdisk-1.0.8-r0 -skalibs-2.10.0.3-r0 -slang-2.3.2-r0 -slang-dev-2.3.2-r0 -snappy-1.1.8-r2 -sntpc-0.9-r7 -sntpc-openrc-0.9-r7 -socat-1.7.4.1-r1 -sqlite-libs-3.35.5-r0 -squashfs-tools-4.5-r1 -ssl_client-1.33.1-r6 -strace-5.12-r0 -swig-4.0.2-r2 -talloc-2.3.2-r1 -tar-1.34-r0 -tcl-8.6.10-r1 -tcpdump-4.99.0-r0 -tevent-0.10.2-r1 -tini-0.19.0-r0 -tzdata-2022a-r0 -udev-init-scripts-34-r0 -udev-init-scripts-openrc-34-r0 -userspace-rcu-0.12.2-r0 -util-linux-2.37.4-r0 -util-linux-dev-2.37.4-r0 -util-linux-openrc-2.37.4-r0 -utmps-0.1.0.2-r0 -utmps-openrc-0.1.0.2-r0 -uuidgen-2.37.4-r0 -vde2-libs-2.3.2-r13 -vim-8.2.4173-r0 -virglrenderer-0.8.2-r1 -wayland-libs-server-1.19.0-r0 -wireguard-tools-1.0.20210424-r0 -wireguard-tools-wg-1.0.20210424-r0 -wireguard-tools-wg-quick-1.0.20210424-r0 -wireless-tools-30_pre9-r1 -wpa_supplicant-2.9-r14 -wpa_supplicant-openrc-2.9-r14 -xfsprogs-5.12.0-r0 -xfsprogs-extra-5.12.0-r0 -xkeyboard-config-2.33-r0 -xorriso-1.5.4-r0 -xxd-8.2.4173-r0 -xz-5.2.5-r0 -xz-dev-5.2.5-r0 -xz-libs-5.2.5-r0 -zfs-2.0.3-r1 -zfs-libs-2.0.3-r1 -zfs-openrc-2.0.3-r1 -zlib-1.2.11-r3 -zlib-dev-1.2.11-r3 -zlib-static-1.2.11-r3 -zstd-libs-1.4.9-r1 +perl-git-2.38.2-r0 +pigz-2.7-r0 +pinentry-1.2.1-r0 +pixman-0.42.2-r0 +pkgconf-1.9.3-r0 +popt-1.19-r0 +py3-capstone-4.0.2-r4 +py3-packaging-21.3-r2 +py3-parsing-3.0.9-r0 +py3-setuptools-65.6.0-r0 +python3-3.10.9-r1 +qemu-7.1.0-r7 +qemu-aarch64-7.1.0-r7 +qemu-arm-7.1.0-r7 +qemu-guest-agent-7.1.0-r7 +qemu-img-7.1.0-r7 +qemu-ppc64le-7.1.0-r7 +qemu-system-aarch64-7.1.0-r7 +qemu-system-arm-7.1.0-r7 +qemu-system-x86_64-7.1.0-r7 +readline-8.2.0-r0 +rhash-libs-1.4.3-r1 +rpcbind-1.2.6-r1 +rpcbind-openrc-1.2.6-r1 +rsync-3.2.7-r0 +rsync-openrc-3.2.7-r0 +runuser-2.38.1-r0 +scanelf-1.3.5-r1 +sed-4.9-r0 +setpriv-2.38.1-r0 +sfdisk-2.38.1-r0 +sg3_utils-1.47-r0 +sgdisk-1.0.9-r2 +skalibs-2.12.0.1-r0 +slang-2.3.3-r0 +slang-dev-2.3.3-r0 +snappy-1.1.9-r4 +sntpc-0.9-r8 +sntpc-openrc-0.9-r8 +socat-1.7.4.4-r0 +sqlite-libs-3.40.1-r0 +squashfs-tools-4.5.1-r1 +ssl_client-1.35.0-r29 +strace-6.0-r0 +swig-4.0.2-r7 +talloc-2.3.4-r0 +tar-1.34-r1 +tcl-8.6.12-r1 +tcpdump-4.99.1-r4 +tini-0.19.0-r1 +tzdata-2022f-r1 +udev-init-scripts-35-r1 +udev-init-scripts-openrc-35-r1 +umount-2.38.1-r0 +userspace-rcu-0.13.2-r0 +util-linux-2.38.1-r0 +util-linux-dev-2.38.1-r0 +util-linux-misc-2.38.1-r0 +util-linux-openrc-2.38.1-r0 +utmps-libs-0.1.2.0-r1 +uuidgen-2.38.1-r0 +vde2-libs-2.3.3-r0 +vim-9.0.0999-r0 +wipefs-2.38.1-r0 +wireguard-tools-1.0.20210914-r1 +wireguard-tools-wg-1.0.20210914-r1 +wireguard-tools-wg-quick-1.0.20210914-r1 +wireless-tools-30_pre9-r2 +wpa_supplicant-2.10-r4 +wpa_supplicant-openrc-2.10-r4 +xfsprogs-6.0.0-r0 +xfsprogs-extra-6.0.0-r0 +xorriso-1.5.4-r2 +xxd-9.0.0999-r0 +xz-5.2.9-r0 +xz-dev-5.2.9-r0 +xz-libs-5.2.9-r0 +zfs-2.1.7-r0 +zfs-libs-2.1.7-r0 +zfs-openrc-2.1.7-r0 +zlib-1.2.13-r0 +zlib-dev-1.2.13-r0 +zlib-static-1.2.13-r0 +zstd-dev-1.5.2-r9 +zstd-libs-1.5.2-r9 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index b20f1163c..6b2a376a2 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,380 +1,397 @@ -# linuxkit/alpine:c9b0f6a435b663b98952d67f4c6f105c310d0a21-amd64 +# linuxkit/alpine:1b63e5acc280c78c66142de425b0a0b20c33af43-amd64 # automatically generated list of installed packages -abuild-3.8.0_rc4-r0 -alpine-baselayout-3.2.0-r16 -alpine-keys-2.4-r0 -apk-tools-2.12.7-r0 -argon2-libs-20190702-r1 -argp-standalone-1.3-r4 -attr-2.5.1-r0 -attr-dev-2.5.1-r0 -audit-3.0.1-r1 -audit-libs-3.0.1-r1 -audit-openrc-3.0.1-r1 -autoconf-2.71-r0 -automake-1.16.3-r0 -bash-5.1.4-r0 -bc-1.07.1-r1 -binutils-2.35.2-r2 -binutils-dev-2.35.2-r2 -bison-3.7.6-r0 -blkid-2.37.4-r0 -bridge-utils-1.7.1-r0 -brotli-libs-1.0.9-r5 +abuild-3.10.0-r0 +acpid-2.0.34-r0 +acpid-openrc-2.0.34-r0 +agetty-2.38.1-r0 +agetty-openrc-0.45.2-r7 +alpine-baselayout-3.4.0-r0 +alpine-baselayout-data-3.4.0-r0 +alpine-keys-2.4-r1 +apk-tools-2.12.10-r1 +argon2-libs-20190702-r2 +argp-standalone-1.5.0-r0 +attr-2.5.1-r2 +attr-dev-2.5.1-r2 +audit-3.0.9-r0 +audit-libs-3.0.9-r0 +audit-openrc-3.0.9-r0 +autoconf-2.71-r1 +automake-1.16.5-r1 +bash-5.2.15-r0 +bc-1.07.1-r2 +binutils-2.39-r2 +binutils-dev-2.39-r2 +bison-3.8.2-r0 +blkid-2.38.1-r0 +bridge-utils-1.7.1-r1 +brotli-libs-1.0.9-r9 bsd-compat-headers-0.7.2-r3 -btrfs-progs-5.12.1-r0 -btrfs-progs-dev-5.12.1-r0 -btrfs-progs-libs-5.12.1-r0 -build-base-0.5-r2 -busybox-1.33.1-r6 -busybox-initscripts-3.3-r1 -bzip2-1.0.8-r1 -ca-certificates-20211220-r0 -ca-certificates-bundle-20211220-r0 -cdrkit-1.1.11-r3 -cfdisk-2.37.4-r0 -cifs-utils-6.13-r0 -clang-11.1.0-r1 -clang-dev-11.1.0-r1 -clang-extra-tools-11.1.0-r1 -clang-libs-11.1.0-r1 -clang-static-11.1.0-r1 -cmake-3.20.3-r0 -coreutils-8.32-r2 -cryptsetup-2.3.7-r0 -cryptsetup-libs-2.3.7-r0 -cryptsetup-openrc-2.3.7-r0 -curl-7.79.1-r0 -dbus-libs-1.12.20-r2 -device-mapper-2.02.187-r1 -device-mapper-event-libs-2.02.187-r1 -device-mapper-libs-2.02.187-r1 -device-mapper-udev-2.02.187-r1 -dhcpcd-8.1.9-r0 -dhcpcd-openrc-8.1.9-r0 -diffutils-3.7-r0 -dosfstools-4.2-r0 -dtc-1.6.1-r0 -e2fsprogs-1.46.2-r0 -e2fsprogs-dev-1.46.2-r0 -e2fsprogs-extra-1.46.2-r0 -e2fsprogs-libs-1.46.2-r0 -elfutils-dev-0.182-r1 -ethtool-5.12-r0 -eudev-3.2.10-r0 -eudev-libs-3.2.10-r0 -eudev-openrc-3.2.10-r0 -expat-2.4.7-r0 -expect-5.45.4-r0 -fakeroot-1.25.3-r3 -file-5.40-r1 -findmnt-2.37.4-r0 -findutils-4.8.0-r1 -flex-2.6.4-r2 -flex-dev-2.6.4-r2 -flex-libs-2.6.4-r2 -flock-2.37.4-r0 +btrfs-progs-6.0.2-r0 +btrfs-progs-dev-6.0.2-r0 +btrfs-progs-libs-6.0.2-r0 +build-base-0.5-r3 +busybox-1.35.0-r29 +busybox-binsh-1.35.0-r29 +bzip2-1.0.8-r4 +ca-certificates-20220614-r3 +ca-certificates-bundle-20220614-r3 +capstone-4.0.2-r4 +cdrkit-1.1.11-r4 +cfdisk-2.38.1-r0 +cifs-utils-7.0-r0 +clang15-15.0.6-r0 +clang15-dev-15.0.6-r0 +clang15-extra-tools-15.0.6-r0 +clang15-libclang-15.0.6-r0 +clang15-libs-15.0.6-r0 +clang15-static-15.0.6-r0 +cmake-3.24.3-r0 +coreutils-9.1-r0 +cryptsetup-2.5.0-r2 +cryptsetup-libs-2.5.0-r2 +cryptsetup-openrc-2.5.0-r2 +curl-7.87.0-r0 +dbus-libs-1.14.4-r0 +device-mapper-2.03.17-r1 +device-mapper-event-libs-2.03.17-r1 +device-mapper-libs-2.03.17-r1 +device-mapper-udev-2.03.17-r1 +dhcpcd-9.4.1-r1 +dhcpcd-openrc-9.4.1-r1 +diffutils-3.8-r1 +dosfstools-4.2-r1 +dtc-1.6.1-r2 +e2fsprogs-1.46.5-r4 +e2fsprogs-dev-1.46.5-r4 +e2fsprogs-extra-1.46.5-r4 +e2fsprogs-libs-1.46.5-r4 +elfutils-dev-0.187-r2 +ethtool-6.0-r0 +eudev-3.2.11-r4 +eudev-libs-3.2.11-r4 +eudev-openrc-3.2.11-r4 +expect-5.45.4-r3 +fakeroot-1.29-r0 +file-5.43-r0 +findmnt-2.38.1-r0 +findutils-4.9.0-r2 +flex-2.6.4-r3 +flex-dev-2.6.4-r3 +flex-libs-2.6.4-r3 +flock-2.38.1-r0 fortify-headers-1.1-r1 -fts-1.2.7-r1 -fts-dev-1.2.7-r1 -g++-10.3.1_git20210424-r2 -gawk-5.1.0-r0 -gc-8.0.4-r5 -gcc-10.3.1_git20210424-r2 -gdbm-1.19-r0 -gettext-0.21-r0 -gettext-asprintf-0.21-r0 -gettext-dev-0.21-r0 -gettext-libs-0.21-r0 -git-2.32.0-r0 -git-perl-2.32.0-r0 -glib-2.68.3-r0 -gmp-6.2.1-r1 -gmp-dev-6.2.1-r1 -gnupg-2.2.31-r0 -gnutls-3.7.1-r0 -go-1.16.10-r0 -grep-3.7-r0 -guile-3.0.6-r0 -guile-libs-3.0.6-r0 -hexdump-2.37.4-r0 -hvtools-4.11.9-r1 -ifupdown-ng-0.11.3-r0 -ifupdown-ng-ethtool-0.11.3-r0 -ifupdown-ng-iproute2-0.11.3-r0 -ifupdown-ng-wifi-0.11.3-r0 -ifupdown-ng-wireguard-0.11.3-r0 -inih-53-r1 -installkernel-3.5-r1 -ip6tables-1.8.7-r1 -ip6tables-openrc-1.8.7-r1 -iperf3-3.10.1-r0 -iperf3-openrc-3.10.1-r0 -iproute2-5.12.0-r0 -iproute2-minimal-5.12.0-r0 -iproute2-ss-5.12.0-r0 -iproute2-tc-5.12.0-r0 -iptables-1.8.7-r1 -iptables-openrc-1.8.7-r1 -ipvsadm-1.31-r0 -isl22-0.22-r0 -jq-1.6-r1 -json-c-0.15-r1 -keyutils-1.6.3-r0 -keyutils-libs-1.6.3-r0 -kmod-29-r0 -kmod-libs-29-r0 -kmod-openrc-29-r0 +fstrim-2.38.1-r0 +g++-12.2.1_git20220924-r4 +gawk-5.1.1-r1 +gc-8.2.2-r0 +gcc-12.2.1_git20220924-r4 +gdbm-1.23-r0 +gettext-0.21.1-r1 +gettext-asprintf-0.21.1-r1 +gettext-dev-0.21.1-r1 +gettext-libs-0.21.1-r1 +git-2.38.2-r0 +git-perl-2.38.2-r0 +glib-2.74.4-r0 +gmp-6.2.1-r2 +gmp-dev-6.2.1-r2 +gnupg-2.2.40-r0 +gnupg-dirmngr-2.2.40-r0 +gnupg-gpgconf-2.2.40-r0 +gnupg-utils-2.2.40-r0 +gnupg-wks-client-2.2.40-r0 +gnutls-3.7.8-r2 +go-1.19.4-r0 +gpg-2.2.40-r0 +gpg-agent-2.2.40-r0 +gpg-wks-server-2.2.40-r0 +gpgsm-2.2.40-r0 +gpgv-2.2.40-r0 +grep-3.8-r1 +guile-3.0.8-r3 +guile-libs-3.0.8-r3 +hexdump-2.38.1-r0 +hvtools-4.11.9-r2 +ifupdown-ng-0.12.1-r0 +ifupdown-ng-ethtool-0.12.1-r0 +ifupdown-ng-iproute2-0.12.1-r0 +ifupdown-ng-wifi-0.12.1-r0 +ifupdown-ng-wireguard-0.12.1-r0 +ifupdown-ng-wireguard-quick-0.12.1-r0 +inih-56-r0 +installkernel-3.5-r2 +ip6tables-1.8.8-r2 +ip6tables-openrc-1.8.8-r2 +iperf3-3.12-r0 +iperf3-openrc-3.12-r0 +iproute2-6.0.0-r1 +iproute2-minimal-6.0.0-r1 +iproute2-ss-6.0.0-r1 +iproute2-tc-6.0.0-r1 +iptables-1.8.8-r2 +iptables-openrc-1.8.8-r2 +ipvsadm-1.31-r1 +isl25-0.25-r0 +jq-1.6-r2 +json-c-0.16-r0 +keyutils-1.6.3-r1 +keyutils-libs-1.6.3-r1 +kmod-30-r1 +kmod-libs-30-r1 +kmod-openrc-30-r1 krb5-conf-1.0-r2 -krb5-dev-1.18.4-r0 -krb5-libs-1.18.4-r0 -krb5-server-ldap-1.18.4-r0 -lddtree-1.26-r2 -libacl-2.2.53-r0 -libaio-0.3.112-r1 -libarchive-3.5.2-r0 -libarchive-tools-3.5.2-r0 -libassuan-2.5.5-r0 -libatomic-10.3.1_git20210424-r2 -libattr-2.5.1-r0 -libblkid-2.37.4-r0 -libbsd-0.11.3-r0 -libburn-1.5.4-r0 -libbz2-1.0.8-r1 +krb5-dev-1.20.1-r0 +krb5-libs-1.20.1-r0 +krb5-server-ldap-1.20.1-r0 +lddtree-1.26-r3 +libacl-2.3.1-r1 +libaio-0.3.113-r0 +libarchive-3.6.1-r2 +libarchive-tools-3.6.1-r2 +libassuan-2.5.5-r1 +libatomic-12.2.1_git20220924-r4 +libattr-2.5.1-r2 +libblkid-2.38.1-r0 +libburn-1.5.4-r2 +libbz2-1.0.8-r4 libc-dev-0.7.2-r3 libc-utils-0.7.2-r3 -libc6-compat-1.2.2-r3 -libcap-2.50-r0 -libcap-ng-0.8.2-r0 -libcap-ng-dev-0.8.2-r0 -libcom_err-1.46.2-r0 -libcrypto1.1-1.1.1n-r0 -libcurl-7.79.1-r0 -libdrm-2.4.106-r0 -libeconf-0.3.8-r1 -libedit-20210216.3.1-r0 -libedit-dev-20210216.3.1-r0 -libelf-0.182-r1 -libelf-static-0.182-r1 -libepoxy-1.5.8-r0 -libevent-2.1.12-r2 -libfdisk-2.37.4-r0 -libfdt-1.6.1-r0 -libffi-3.3-r2 -libgcc-10.3.1_git20210424-r2 -libgcrypt-1.9.4-r0 -libgmpxx-6.2.1-r1 -libgomp-10.3.1_git20210424-r2 -libgpg-error-1.42-r0 -libgphobos-10.3.1_git20210424-r2 -libintl-0.21-r0 -libisoburn-1.5.4-r0 -libisofs-1.5.4-r0 -libjpeg-turbo-2.1.0-r0 -libksba-1.5.1-r0 -libldap-2.4.58-r0 -libltdl-2.4.6-r7 -libmagic-5.40-r1 -libmd-1.0.3-r0 -libmnl-1.0.4-r1 -libmount-2.37.4-r0 +libc6-compat-1.2.3-r4 +libcap-ng-0.8.3-r1 +libcap-ng-dev-0.8.3-r1 +libcap2-2.66-r0 +libcom_err-1.46.5-r4 +libcrypto3-3.0.7-r0 +libcurl-7.87.0-r0 +libeconf-0.4.7-r0 +libedit-20221030.3.1-r0 +libedit-dev-20221030.3.1-r0 +libelf-0.187-r2 +libelf-static-0.187-r2 +libev-4.33-r0 +libevent-2.1.12-r5 +libexpat-2.5.0-r0 +libfdisk-2.38.1-r0 +libfdt-1.6.1-r2 +libffi-3.4.4-r0 +libffi-dev-3.4.4-r0 +libgcc-12.2.1_git20220924-r4 +libgcrypt-1.10.1-r0 +libgmpxx-6.2.1-r2 +libgomp-12.2.1_git20220924-r4 +libgpg-error-1.46-r1 +libintl-0.21.1-r1 +libisoburn-1.5.4-r2 +libisofs-1.5.4-r2 +libjpeg-turbo-2.1.4-r0 +libksba-1.6.3-r0 +libldap-2.6.3-r6 +libltdl-2.4.7-r0 +libmagic-5.43-r0 +libmnl-1.0.5-r0 +libmount-2.38.1-r0 libmspack-0.10.1_alpha-r0 -libnfsidmap-2.5.3-r0 -libnftnl-libs-1.2.0-r0 -libnl3-3.5.0-r0 -libpcap-1.10.0-r0 -libpciaccess-0.16-r0 -libpng-1.6.37-r1 -libressl-dev-3.3.6-r0 -libressl3.3-libcrypto-3.3.6-r0 -libressl3.3-libssl-3.3.6-r0 -libressl3.3-libtls-3.3.6-r0 -libretls-3.3.3p1-r2 -libsasl-2.1.27-r12 -libseccomp-2.5.1-r2 -libseccomp-dev-2.5.1-r2 -libseccomp-static-2.5.1-r2 -libsecret-0.20.4-r1 -libsmartcols-2.37.4-r0 -libssl1.1-1.1.1n-r0 -libstdc++-10.3.1_git20210424-r2 -libtasn1-4.17.0-r0 -libtirpc-1.3.2-r0 -libtirpc-conf-1.3.2-r0 -libtirpc-dev-1.3.2-r0 -libtirpc-nokrb-1.3.2-r0 -libtool-2.4.6-r7 -libucontext-1.1-r0 -libucontext-dev-1.1-r0 -libunistring-0.9.10-r1 -libunwind-1.5.0-r1 -libunwind-dev-1.5.0-r1 -libusb-1.0.24-r2 -libuuid-2.37.4-r0 -libuv-1.41.0-r0 -libverto-0.3.2-r0 -libwbclient-4.14.12-r0 -libx11-1.7.2-r0 -libxau-1.0.9-r0 -libxcb-1.14-r2 -libxdmcp-1.1.3-r0 -libxkbcommon-1.2.1-r0 -libxml2-2.9.13-r0 -linux-headers-5.10.41-r0 -llvm11-11.1.0-r2 -llvm11-dev-11.1.0-r2 -llvm11-libs-11.1.0-r2 -llvm11-static-11.1.0-r2 -logger-2.37.4-r0 -lsblk-2.37.4-r0 -lsscsi-0.32-r0 -lua5.3-libs-5.3.6-r0 -luajit-2.1_p20210510-r0 -luajit-dev-2.1_p20210510-r0 -lvm2-2.02.187-r1 -lvm2-libs-2.02.187-r1 -lvm2-openrc-2.02.187-r1 -lz4-libs-1.9.3-r1 -lzip-1.22-r0 -lzo-2.10-r2 -m4-1.4.18-r2 -make-4.3-r0 -mcookie-2.37.4-r0 -mesa-21.1.2-r0 -mesa-gbm-21.1.2-r0 -mkinitfs-3.5.0-r0 -mpc1-1.2.1-r0 -mpc1-dev-1.2.1-r0 +libnfsidmap-2.6.2-r0 +libnftnl-1.2.4-r0 +libnl3-3.7.0-r0 +libpcap-1.10.1-r1 +libpng-1.6.38-r0 +libressl-dev-3.6.1-r0 +libressl3.6-libcrypto-3.6.1-r0 +libressl3.6-libssl-3.6.1-r0 +libressl3.6-libtls-3.6.1-r0 +libretls-3.5.2-r1 +libsasl-2.1.28-r3 +libseccomp-2.5.4-r0 +libseccomp-dev-2.5.4-r0 +libseccomp-static-2.5.4-r0 +libslirp-4.7.0-r0 +libsmartcols-2.38.1-r0 +libssl3-3.0.7-r0 +libstdc++-12.2.1_git20220924-r4 +libstdc++-dev-12.2.1_git20220924-r4 +libtasn1-4.19.0-r0 +libtirpc-1.3.3-r0 +libtirpc-conf-1.3.3-r0 +libtirpc-dev-1.3.3-r0 +libtirpc-nokrb-1.3.3-r0 +libtool-2.4.7-r0 +libucontext-1.2-r0 +libucontext-dev-1.2-r0 +libunistring-1.1-r0 +libunwind-1.6.2-r0 +libunwind-dev-1.6.2-r0 +liburing-2.3-r0 +libuuid-2.38.1-r0 +libuv-1.44.2-r0 +libverto-0.3.2-r1 +libverto-dev-0.3.2-r1 +libverto-glib-0.3.2-r1 +libverto-libev-0.3.2-r1 +libverto-libevent-0.3.2-r1 +libwbclient-4.16.8-r0 +libxml2-2.10.3-r1 +linux-headers-5.19.5-r0 +linux-pam-1.5.2-r1 +llvm15-15.0.6-r0 +llvm15-dev-15.0.6-r0 +llvm15-libs-15.0.6-r0 +llvm15-static-15.0.6-r0 +llvm15-test-utils-15.0.6-r0 +logger-2.38.1-r0 +losetup-2.38.1-r0 +lsblk-2.38.1-r0 +lsscsi-0.32-r1 +luajit-2.1_p20210510-r3 +luajit-dev-2.1_p20210510-r3 +lvm2-2.03.17-r1 +lvm2-libs-2.03.17-r1 +lvm2-openrc-2.03.17-r1 +lz4-libs-1.9.4-r1 +lzip-1.23-r0 +lzo-2.10-r3 +m4-1.4.19-r1 +make-4.3-r1 +mcookie-2.38.1-r0 +mdev-conf-4.3-r0 +mkinitfs-3.7.0-r0 +mount-2.38.1-r0 +mpc1-1.2.1-r1 +mpc1-dev-1.2.1-r1 mpdecimal-2.5.1-r1 mpfr-dev-4.1.0-r0 mpfr4-4.1.0-r0 -mtools-4.0.29-r1 -multipath-tools-0.8.6-r0 -multipath-tools-openrc-0.8.6-r0 -musl-1.2.2-r3 -musl-dev-1.2.2-r3 -musl-utils-1.2.2-r3 -ncurses-dev-6.2_p20210612-r0 -ncurses-libs-6.2_p20210612-r0 -ncurses-terminfo-base-6.2_p20210612-r0 -nettle-3.7.3-r0 -nfs-utils-2.5.3-r0 -nfs-utils-openrc-2.5.3-r0 -nghttp2-libs-1.43.0-r0 -npth-1.6-r0 -numactl-2.0.14-r0 -oniguruma-6.9.7.1-r0 -open-iscsi-2.1.4-r1 -open-iscsi-libs-2.1.4-r1 -open-iscsi-openrc-2.1.4-r1 -open-isns-lib-0.101-r0 -open-vm-tools-11.2.5-r0 -open-vm-tools-deploypkg-11.2.5-r0 -open-vm-tools-guestinfo-11.2.5-r0 -open-vm-tools-openrc-11.2.5-r0 -open-vm-tools-static-11.2.5-r0 -open-vm-tools-vmbackup-11.2.5-r0 -openntpd-6.8_p1-r3 -openntpd-openrc-6.8_p1-r3 -openrc-0.43.3-r2 -openresolv-3.12.0-r0 -openssh-client-common-8.6_p1-r3 -openssh-client-default-8.6_p1-r3 -openssh-keygen-8.6_p1-r3 -openssh-server-8.6_p1-r3 -openssh-server-common-8.6_p1-r3 -openssl-1.1.1n-r0 -openssl-dev-1.1.1n-r0 -ovmf-0.0.202011-r1 -p11-kit-0.23.22-r0 -partx-2.37.4-r0 -patch-2.7.6-r7 -pcre-8.44-r0 -pcre2-10.36-r0 -pcsc-lite-libs-1.9.1-r0 -perl-5.32.1-r0 +mtools-4.0.42-r0 +multipath-tools-0.9.3-r1 +multipath-tools-openrc-0.9.3-r1 +musl-1.2.3-r4 +musl-dev-1.2.3-r4 +musl-fts-1.2.7-r3 +musl-fts-dev-1.2.7-r3 +musl-utils-1.2.3-r4 +ncurses-dev-6.3_p20221119-r0 +ncurses-libs-6.3_p20221119-r0 +ncurses-terminfo-base-6.3_p20221119-r0 +nettle-3.8.1-r0 +nfs-utils-2.6.2-r0 +nfs-utils-openrc-2.6.2-r0 +nghttp2-libs-1.51.0-r0 +npth-1.6-r2 +numactl-2.0.16-r0 +oniguruma-6.9.8-r0 +open-iscsi-2.1.8-r0 +open-iscsi-libs-2.1.8-r0 +open-iscsi-openrc-2.1.8-r0 +open-isns-lib-0.102-r0 +open-vm-tools-12.1.0-r0 +open-vm-tools-deploypkg-12.1.0-r0 +open-vm-tools-guestinfo-12.1.0-r0 +open-vm-tools-openrc-12.1.0-r0 +open-vm-tools-static-12.1.0-r0 +open-vm-tools-vmbackup-12.1.0-r0 +openntpd-6.8_p1-r7 +openntpd-openrc-6.8_p1-r7 +openrc-0.45.2-r7 +openresolv-3.12.0-r1 +openssh-client-common-9.1_p1-r1 +openssh-client-default-9.1_p1-r1 +openssh-keygen-9.1_p1-r1 +openssh-server-9.1_p1-r1 +openssh-server-common-9.1_p1-r1 +openssl-3.0.7-r0 +openssl-dev-3.0.7-r0 +ovmf-0.0.202208-r0 +p11-kit-0.24.1-r1 +partx-2.38.1-r0 +patch-2.7.6-r8 +pcre-8.45-r2 +pcre2-10.42-r0 +pcsc-lite-libs-1.9.9-r0 +perl-5.36.0-r0 perl-error-0.17029-r1 -perl-git-2.32.0-r0 -pigz-2.6-r0 -pinentry-1.1.1-r0 -pixman-0.40.0-r2 -pkgconf-1.7.4-r0 -popt-1.18-r0 -python2-2.7.18-r2 -python3-3.9.5-r2 -qemu-6.0.0-r5 -qemu-aarch64-6.0.0-r5 -qemu-arm-6.0.0-r5 -qemu-guest-agent-6.0.0-r5 -qemu-img-6.0.0-r5 -qemu-ppc64le-6.0.0-r5 -qemu-system-arm-6.0.0-r5 -qemu-system-x86_64-6.0.0-r5 -readline-8.1.0-r0 -rhash-libs-1.4.1-r0 -rpcbind-1.2.6-r0 -rpcbind-openrc-1.2.6-r0 -rsync-3.2.3-r4 -rsync-openrc-3.2.3-r4 -s6-ipcserver-2.10.0.3-r0 -samba-util-libs-4.14.12-r0 -scanelf-1.3.2-r0 -sed-4.8-r0 -setpriv-2.37.4-r0 -sfdisk-2.37.4-r0 -sg3_utils-1.45-r0 -sgdisk-1.0.8-r0 -skalibs-2.10.0.3-r0 -slang-2.3.2-r0 -slang-dev-2.3.2-r0 -snappy-1.1.8-r2 -sntpc-0.9-r7 -sntpc-openrc-0.9-r7 -socat-1.7.4.1-r1 -sqlite-libs-3.35.5-r0 -squashfs-tools-4.5-r1 -ssl_client-1.33.1-r6 -strace-5.12-r0 -swig-4.0.2-r2 -syslinux-6.04_pre1-r9 -talloc-2.3.2-r1 -tar-1.34-r0 -tcl-8.6.10-r1 -tcpdump-4.99.0-r0 -tevent-0.10.2-r1 -tini-0.19.0-r0 -tzdata-2022a-r0 -udev-init-scripts-34-r0 -udev-init-scripts-openrc-34-r0 -userspace-rcu-0.12.2-r0 -util-linux-2.37.4-r0 -util-linux-dev-2.37.4-r0 -util-linux-openrc-2.37.4-r0 -utmps-0.1.0.2-r0 -utmps-openrc-0.1.0.2-r0 -uuidgen-2.37.4-r0 -vde2-libs-2.3.2-r13 -vim-8.2.4173-r0 -virglrenderer-0.8.2-r1 -wayland-libs-server-1.19.0-r0 -wireguard-tools-1.0.20210424-r0 -wireguard-tools-wg-1.0.20210424-r0 -wireguard-tools-wg-quick-1.0.20210424-r0 -wireless-tools-30_pre9-r1 -wpa_supplicant-2.9-r14 -wpa_supplicant-openrc-2.9-r14 -xfsprogs-5.12.0-r0 -xfsprogs-extra-5.12.0-r0 -xkeyboard-config-2.33-r0 -xorriso-1.5.4-r0 -xxd-8.2.4173-r0 -xz-5.2.5-r0 -xz-dev-5.2.5-r0 -xz-libs-5.2.5-r0 -zfs-2.0.3-r1 -zfs-libs-2.0.3-r1 -zfs-openrc-2.0.3-r1 -zlib-1.2.11-r3 -zlib-dev-1.2.11-r3 -zlib-static-1.2.11-r3 -zstd-libs-1.4.9-r1 +perl-git-2.38.2-r0 +pigz-2.7-r0 +pinentry-1.2.1-r0 +pixman-0.42.2-r0 +pkgconf-1.9.3-r0 +popt-1.19-r0 +py3-capstone-4.0.2-r4 +py3-packaging-21.3-r2 +py3-parsing-3.0.9-r0 +py3-setuptools-65.6.0-r0 +python3-3.10.9-r1 +qemu-7.1.0-r7 +qemu-aarch64-7.1.0-r7 +qemu-arm-7.1.0-r7 +qemu-guest-agent-7.1.0-r7 +qemu-img-7.1.0-r7 +qemu-ppc64le-7.1.0-r7 +qemu-system-arm-7.1.0-r7 +qemu-system-x86_64-7.1.0-r7 +readline-8.2.0-r0 +rhash-libs-1.4.3-r1 +rpcbind-1.2.6-r1 +rpcbind-openrc-1.2.6-r1 +rsync-3.2.7-r0 +rsync-openrc-3.2.7-r0 +runuser-2.38.1-r0 +scanelf-1.3.5-r1 +sed-4.9-r0 +setpriv-2.38.1-r0 +sfdisk-2.38.1-r0 +sg3_utils-1.47-r0 +sgdisk-1.0.9-r2 +skalibs-2.12.0.1-r0 +slang-2.3.3-r0 +slang-dev-2.3.3-r0 +snappy-1.1.9-r4 +sntpc-0.9-r8 +sntpc-openrc-0.9-r8 +socat-1.7.4.4-r0 +sqlite-libs-3.40.1-r0 +squashfs-tools-4.5.1-r1 +ssl_client-1.35.0-r29 +strace-6.0-r0 +swig-4.0.2-r7 +syslinux-6.04_pre1-r11 +talloc-2.3.4-r0 +tar-1.34-r1 +tcl-8.6.12-r1 +tcpdump-4.99.1-r4 +tini-0.19.0-r1 +tzdata-2022f-r1 +udev-init-scripts-35-r1 +udev-init-scripts-openrc-35-r1 +umount-2.38.1-r0 +userspace-rcu-0.13.2-r0 +util-linux-2.38.1-r0 +util-linux-dev-2.38.1-r0 +util-linux-misc-2.38.1-r0 +util-linux-openrc-2.38.1-r0 +utmps-libs-0.1.2.0-r1 +uuidgen-2.38.1-r0 +vde2-libs-2.3.3-r0 +vim-9.0.0999-r0 +wipefs-2.38.1-r0 +wireguard-tools-1.0.20210914-r1 +wireguard-tools-wg-1.0.20210914-r1 +wireguard-tools-wg-quick-1.0.20210914-r1 +wireless-tools-30_pre9-r2 +wpa_supplicant-2.10-r4 +wpa_supplicant-openrc-2.10-r4 +xfsprogs-6.0.0-r0 +xfsprogs-extra-6.0.0-r0 +xorriso-1.5.4-r2 +xxd-9.0.0999-r0 +xz-5.2.9-r0 +xz-dev-5.2.9-r0 +xz-libs-5.2.9-r0 +zfs-2.1.7-r0 +zfs-libs-2.1.7-r0 +zfs-openrc-2.1.7-r0 +zlib-1.2.13-r0 +zlib-dev-1.2.13-r0 +zlib-static-1.2.13-r0 +zstd-dev-1.5.2-r9 +zstd-libs-1.5.2-r9 diff --git a/tools/containerd-dev/Dockerfile b/tools/containerd-dev/Dockerfile index d347aed37..86d619a7f 100644 --- a/tools/containerd-dev/Dockerfile +++ b/tools/containerd-dev/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5d89cd05a567f9bfbe4502be1027a422d46f4a75 as builder +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 as builder # checkout and compile containerd diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile index 288f04cd2..87a6a74d0 100644 --- a/tools/go-compile/Dockerfile +++ b/tools/go-compile/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/tools/mkimage-iso-bios/Dockerfile b/tools/mkimage-iso-bios/Dockerfile index 98993f9de..4f21c3437 100644 --- a/tools/mkimage-iso-bios/Dockerfile +++ b/tools/mkimage-iso-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 as mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 as mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-iso-efi-initrd/Dockerfile b/tools/mkimage-iso-efi-initrd/Dockerfile index c2b4d91ae..a812cdce1 100644 --- a/tools/mkimage-iso-efi-initrd/Dockerfile +++ b/tools/mkimage-iso-efi-initrd/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile index ad451c426..56ae8dfab 100644 --- a/tools/mkimage-iso-efi/Dockerfile +++ b/tools/mkimage-iso-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-iso/Dockerfile b/tools/mkimage-iso/Dockerfile index bfaf30178..24bdd201a 100644 --- a/tools/mkimage-iso/Dockerfile +++ b/tools/mkimage-iso/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-qcow2-efi/Dockerfile b/tools/mkimage-qcow2-efi/Dockerfile index 4873c9162..37ebc86b3 100644 --- a/tools/mkimage-qcow2-efi/Dockerfile +++ b/tools/mkimage-qcow2-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-raw-bios/Dockerfile b/tools/mkimage-raw-bios/Dockerfile index a2ed4ca19..839b12df1 100644 --- a/tools/mkimage-raw-bios/Dockerfile +++ b/tools/mkimage-raw-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-raw-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile index f8916dbc8..a059c33cf 100644 --- a/tools/mkimage-raw-efi/Dockerfile +++ b/tools/mkimage-raw-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:4de02c056b3295f510b7fb4f9b5a2785f854ac23 AS grub -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-rpi3/Dockerfile b/tools/mkimage-rpi3/Dockerfile index 74ae78221..b4c0c4b30 100644 --- a/tools/mkimage-rpi3/Dockerfile +++ b/tools/mkimage-rpi3/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 as build +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 as build RUN apk add \ bc \ bison \ diff --git a/tools/mkimage-squashfs/Dockerfile b/tools/mkimage-squashfs/Dockerfile index 37a4d9132..458276381 100644 --- a/tools/mkimage-squashfs/Dockerfile +++ b/tools/mkimage-squashfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \