From f52c7f17c800ea25c5b838ea57b799e14c437f4b Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 10 Aug 2021 00:07:13 +0100 Subject: [PATCH 1/3] yaml: Remove trust section from examples and tests With 561ce6f4beec ("Remove Notary and Content Trust") we removed support for content trust. No need to have it in the YAMLs either. Signed-off-by: Rolf Neugebauer --- examples/addbinds.yml | 3 --- examples/aws.yml | 4 ---- examples/azure.yml | 3 --- examples/cadvisor.yml | 4 ---- examples/dm-crypt-loop.yml | 3 --- examples/dm-crypt.yml | 3 --- examples/docker-for-mac.yml | 5 ----- examples/docker.yml | 4 ---- examples/gcp.yml | 4 ---- examples/getty.yml | 3 --- examples/hetzner.yml | 3 --- examples/hostmount-writeable-overlay.yml | 4 ---- examples/influxdb-os.yml | 4 ---- examples/logging.yml | 4 ---- examples/minimal.yml | 3 --- examples/node_exporter.yml | 3 --- examples/openstack.yml | 4 ---- examples/packet.yml | 3 --- examples/redis-os.yml | 4 ---- examples/rt-for-vmware.yml | 4 ---- examples/scaleway.yml | 3 --- examples/sshd.yml | 3 --- examples/static-ip.yml | 3 --- examples/swap.yml | 4 ---- examples/tpm.yml | 3 --- examples/vmware.yml | 4 ---- examples/vpnkit-forwarder.yml | 4 ---- examples/vsudd-containerd.yml | 4 ---- examples/vultr.yml | 4 ---- examples/wireguard.yml | 4 ---- linuxkit.yml | 4 ---- test/cases/000_build/000_formats/test.yml | 3 --- test/cases/000_build/010_reproducible/test.yml | 5 ----- test/cases/000_build/020_binds/test.yml | 4 ---- .../010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 3 --- .../010_platforms/000_qemu/005_run_kernel+squashfs/test.yml | 3 --- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 3 --- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 3 --- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml | 3 --- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 3 --- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 3 --- test/cases/010_platforms/000_qemu/100_container/test.yml | 3 --- .../010_hyperkit/000_run_kernel+initrd/test.yml | 3 --- .../010_hyperkit/005_run_kernel+squashfs/test.yml | 3 --- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 3 --- test/cases/010_platforms/110_gcp/000_run/test.yml | 3 --- test/cases/020_kernel/011_config_5.4.x/test.yml | 3 --- test/cases/020_kernel/013_config_5.10.x/test.yml | 3 --- test/cases/020_kernel/015_config_5.12.x/test.yml | 3 --- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 3 --- test/cases/020_kernel/113_kmod_5.10.x/test.yml | 3 --- test/cases/020_kernel/115_kmod_5.12.x/test.yml | 3 --- test/cases/020_kernel/200_namespace/common.yml | 3 --- test/cases/030_security/000_docker-bench/test.yml | 3 --- test/cases/030_security/010_ports/test.yml | 3 --- test/cases/040_packages/002_binfmt/test.yml | 5 ----- test/cases/040_packages/002_bpftrace/test.yml | 5 ----- test/cases/040_packages/003_ca-certificates/test.yml | 5 ----- test/cases/040_packages/003_containerd/test.yml | 3 --- test/cases/040_packages/004_dhcpcd/test.yml | 5 ----- test/cases/040_packages/004_dm-crypt/000_simple/test.yml | 5 ----- test/cases/040_packages/004_dm-crypt/001_luks/test.yml | 5 ----- test/cases/040_packages/004_dm-crypt/002_key/test.yml | 5 ----- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 4 ---- test/cases/040_packages/005_extend/000_ext4/test.yml | 4 ---- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 4 ---- test/cases/040_packages/005_extend/001_btrfs/test.yml | 4 ---- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 4 ---- test/cases/040_packages/005_extend/002_xfs/test.yml | 4 ---- test/cases/040_packages/005_extend/003_gpt/test-create.yml | 4 ---- test/cases/040_packages/005_extend/003_gpt/test.yml | 4 ---- test/cases/040_packages/006_format_mount/000_auto/test.yml | 4 ---- .../040_packages/006_format_mount/001_by_label/test.yml | 4 ---- .../040_packages/006_format_mount/002_by_name/test.yml.in | 4 ---- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 4 ---- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 4 ---- .../006_format_mount/005_by_device_force/test.yml | 4 ---- test/cases/040_packages/006_format_mount/006_gpt/test.yml | 4 ---- .../040_packages/006_format_mount/010_multiple/test.yml | 4 ---- test/cases/040_packages/007_getty-containerd/test.yml | 3 --- test/cases/040_packages/008_metadata/000_cidata/test.yml | 4 ---- test/cases/040_packages/012_losetup/test.yml | 5 ----- test/cases/040_packages/013_mkimage/mkimage.yml | 3 --- test/cases/040_packages/013_mkimage/run.yml | 3 --- test/cases/040_packages/019_sysctl/test.yml | 5 ----- test/cases/040_packages/020_init_containerd/test.yml | 5 ----- test/cases/040_packages/023_wireguard/test.yml | 4 ---- test/cases/040_packages/030_logwrite/test.yml | 5 ----- test/cases/040_packages/031_kmsg/test.yml | 5 ----- test/cases/040_packages/032_bcc/test.yml | 5 ----- test/hack/test-ltp.yml | 3 --- test/hack/test.yml | 3 --- test/pkg/ns/template.yml | 3 --- 93 files changed, 345 deletions(-) diff --git a/examples/addbinds.yml b/examples/addbinds.yml index fd3643886..1557a0d3c 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -24,6 +24,3 @@ files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) contents: 'root:$6$6tPd2uhHrecCEKug$8mKfcgfwguP7f.BLdZsT1Wz7WIIJOBY1oUFHzIv9/O71M2J0EPdtFqFGTxB1UK5ejqQxRFQ.ZSG9YXR0SNsc11:17322:0:::::' -trust: - org: - - linuxkit diff --git a/examples/aws.yml b/examples/aws.yml index d73fda0f4..544eafe1b 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -31,7 +31,3 @@ services: - CAP_DAC_OVERRIDE binds: - /etc/resolv.conf:/etc/resolv.conf -trust: - org: - - linuxkit - - library diff --git a/examples/azure.yml b/examples/azure.yml index 2aa44a97b..aece00507 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -21,6 +21,3 @@ files: source: ~/.ssh/id_rsa.pub mode: "0600" optional: true -trust: - org: - - linuxkit diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index c2be9287c..16184a8d4 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -53,7 +53,3 @@ files: - path: etc/docker/daemon.json contents: '{"debug": true, "hosts": ["unix:///var/run/docker.sock"]}' mode: "0644" -trust: - org: - - linuxkit - - library diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 4bdbb0dd2..b04b0783c 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -44,6 +44,3 @@ files: # the below key is just to keep the example self-contained # !!! provide a proper key for production use here !!! contents: "abcdefghijklmnopqrstuvwxyz123456" -trust: - org: - - linuxkit diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index 5fbaf2e6e..978db7530 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -38,6 +38,3 @@ files: # the below key is just to keep the example self-contained # !!! provide a proper key for production use here !!! contents: "abcdefghijklmnopqrstuvwxyz123456" -trust: - org: - - linuxkit diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index bfcd5ca7b..416f8fac2 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -106,8 +106,3 @@ services: "--storage-driver", "overlay2" ] runtime: mkdir: ["/var/lib/docker"] - -trust: - org: - - linuxkit - - library diff --git a/examples/docker.yml b/examples/docker.yml index c41d3fba7..79bdbb3b9 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -46,7 +46,3 @@ files: directory: true - path: etc/docker/daemon.json contents: '{"debug": true}' -trust: - org: - - linuxkit - - library diff --git a/examples/gcp.yml b/examples/gcp.yml index cbeb6bc40..dd35238e5 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -35,7 +35,3 @@ services: - CAP_DAC_OVERRIDE binds: - /etc/resolv.conf:/etc/resolv.conf -trust: - org: - - linuxkit - - library diff --git a/examples/getty.yml b/examples/getty.yml index 163a9c0eb..778bfae47 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -24,6 +24,3 @@ files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) contents: 'root:$6$6tPd2uhHrecCEKug$8mKfcgfwguP7f.BLdZsT1Wz7WIIJOBY1oUFHzIv9/O71M2J0EPdtFqFGTxB1UK5ejqQxRFQ.ZSG9YXR0SNsc11:17322:0:::::' -trust: - org: - - linuxkit diff --git a/examples/hetzner.yml b/examples/hetzner.yml index 1d4dd42ae..60ba9eb1b 100644 --- a/examples/hetzner.yml +++ b/examples/hetzner.yml @@ -34,6 +34,3 @@ files: source: ~/.ssh/id_rsa.pub mode: "0600" optional: true -trust: - org: - - linuxkit diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 3d742669b..64b299850 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -41,7 +41,3 @@ services: - CAP_DAC_OVERRIDE binds: - /etc/resolv.conf:/etc/resolv.conf -trust: - org: - - linuxkit - - library diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 44b419b27..c81cc6e60 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -42,7 +42,3 @@ services: env: - INFLUXDB_URL=http://127.0.0.1:8086 - KAPACITOR_URL=http://127.0.0.1:9092 -trust: - org: - - linuxkit - - library diff --git a/examples/logging.yml b/examples/logging.yml index 52b17f2be..95e0a7a3c 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -28,7 +28,3 @@ services: image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208 - name: kmsg image: linuxkit/kmsg:df84eda2a82d5e24ddfe241831af3efb13a1a557 -trust: - org: - - linuxkit - - library diff --git a/examples/minimal.yml b/examples/minimal.yml index d8e4f719a..6ef7a622d 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -14,6 +14,3 @@ services: image: linuxkit/getty:ed32c71531f5998aa510847bb07bd847492d4101 env: - INSECURE=true -trust: - org: - - linuxkit diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index f607a9abd..da83f0a6d 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -16,6 +16,3 @@ services: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 - name: node_exporter image: linuxkit/node_exporter:f2e8d89c950dada9a1ff497f312abd79a00292f8 -trust: - org: - - linuxkit diff --git a/examples/openstack.yml b/examples/openstack.yml index bd4c52fa6..564cb8e9d 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -32,7 +32,3 @@ services: - CAP_DAC_OVERRIDE binds: - /etc/resolv.conf:/etc/resolv.conf -trust: - org: - - linuxkit - - library diff --git a/examples/packet.yml b/examples/packet.yml index 56347b4f9..6bfd6aff7 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -34,6 +34,3 @@ files: source: ~/.ssh/id_rsa.pub mode: "0600" optional: true -trust: - org: - - linuxkit diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 133e4e662..0894c8182 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -27,7 +27,3 @@ services: - CAP_SETGID - CAP_DAC_OVERRIDE net: host -trust: - org: - - linuxkit - - library diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index 2ae7971c0..1df7caeb0 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -30,7 +30,3 @@ services: - CAP_DAC_OVERRIDE binds: - /etc/resolv.conf:/etc/resolv.conf -trust: - org: - - linuxkit - - library diff --git a/examples/scaleway.yml b/examples/scaleway.yml index 2db7f224f..23e7285cc 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -24,6 +24,3 @@ services: - INSECURE=true - name: rngd image: linuxkit/rngd:bdabfe138f05f7d48396d2f435af16f5a6ccaa45 -trust: - org: - - linuxkit diff --git a/examples/sshd.yml b/examples/sshd.yml index 4696988fd..f02e72fb9 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -28,6 +28,3 @@ files: source: ~/.ssh/id_rsa.pub mode: "0600" optional: true -trust: - org: - - linuxkit diff --git a/examples/static-ip.yml b/examples/static-ip.yml index e411484e7..8ab25df0f 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -27,6 +27,3 @@ files: # domain test.local nameserver 10.10.1.101 nameserver 10.10.1.100 -trust: - org: - - linuxkit diff --git a/examples/swap.yml b/examples/swap.yml index f99b52037..238201ab1 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -29,7 +29,3 @@ services: - INSECURE=true - name: rngd image: linuxkit/rngd:bdabfe138f05f7d48396d2f435af16f5a6ccaa45 -trust: - org: - - linuxkit - - library diff --git a/examples/tpm.yml b/examples/tpm.yml index 75b0c2576..5cfd0f44f 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -25,6 +25,3 @@ files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) contents: 'root:$6$6tPd2uhHrecCEKug$8mKfcgfwguP7f.BLdZsT1Wz7WIIJOBY1oUFHzIv9/O71M2J0EPdtFqFGTxB1UK5ejqQxRFQ.ZSG9YXR0SNsc11:17322:0:::::' -trust: - org: - - linuxkit diff --git a/examples/vmware.yml b/examples/vmware.yml index 1a805f50a..de8fc8cda 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -28,7 +28,3 @@ services: - CAP_DAC_OVERRIDE binds: - /etc/resolv.conf:/etc/resolv.conf -trust: - org: - - linuxkit - - library diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index a1701e83f..60085e961 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -32,7 +32,3 @@ files: source: ~/.ssh/id_rsa.pub mode: "0600" optional: true - -trust: - org: - - linuxkit diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index e1f6e2fd0..74fe63396 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -16,7 +16,3 @@ services: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", "-inport", "2374:unix:/run/containerd/containerd.sock"] - -trust: - org: - - linuxkit diff --git a/examples/vultr.yml b/examples/vultr.yml index 10ab0160f..527eb25f9 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -36,7 +36,3 @@ services: - CAP_DAC_OVERRIDE binds: - /etc/resolv.conf:/etc/resolv.conf -trust: - org: - - linuxkit - - library diff --git a/examples/wireguard.yml b/examples/wireguard.yml index e352b7958..49ff7f4db 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -77,7 +77,3 @@ files: PublicKey = AcS5t3PC5nL/oj0sYhc3yFpDlRaXoJ0mfEq6iq0rFF4= AllowedIPs = 0.0.0.0/0 Endpoint = 127.0.0.1:51820 -trust: - org: - - linuxkit - - library diff --git a/linuxkit.yml b/linuxkit.yml index c62fc6ebd..5766d642a 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -36,7 +36,3 @@ services: files: - path: etc/linuxkit-config metadata: yaml -trust: - org: - - linuxkit - - library diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 078a9c02e..5eade05f8 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -8,6 +8,3 @@ onboot: - name: dhcpcd image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] -trust: - org: - - linuxkit diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 3b7364be4..79f4ee630 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -45,8 +45,3 @@ services: files: - path: etc/linuxkit-config metadata: yaml - -trust: - org: - - linuxkit - - library diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index 9be534b5c..ae67c52c3 100644 --- a/test/cases/000_build/020_binds/test.yml +++ b/test/cases/000_build/020_binds/test.yml @@ -22,7 +22,3 @@ files: - path: check.sh source: ./check.sh mode: "0700" -trust: - org: - - linuxkit - - library 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 34405dcfa..d5df1277a 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 @@ -8,6 +8,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit 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 34405dcfa..d5df1277a 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 @@ -8,6 +8,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit 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 44fd31df3..c351eef36 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 @@ -8,7 +8,4 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit 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 8abe4595b..2a892b576 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 @@ -8,6 +8,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit 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 8abe4595b..2a892b576 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 @@ -8,6 +8,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit 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 8abe4595b..2a892b576 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 @@ -8,6 +8,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit 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 8abe4595b..2a892b576 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 @@ -8,6 +8,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit 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 2f8fe5181..b4bda6066 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -8,6 +8,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit 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 8abe4595b..2a892b576 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 @@ -8,6 +8,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit 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 8abe4595b..2a892b576 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 @@ -8,6 +8,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit 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 e84acffe0..5137f2b47 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -8,6 +8,3 @@ init: services: - name: acpid image: linuxkit/acpid:d2ddd88c7918466f875e7c5c3e527b51dfb0b0ea -trust: - org: - - linuxkit 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 8abe4595b..2a892b576 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.yml @@ -8,6 +8,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit 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 b20f3a652..547d65a18 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 @@ -10,6 +10,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit 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 b7db7ea81..5abb575ab 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 @@ -10,6 +10,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/015_config_5.12.x/test.yml b/test/cases/020_kernel/015_config_5.12.x/test.yml index 54b0b194a..9a42e6937 100644 --- a/test/cases/020_kernel/015_config_5.12.x/test.yml +++ b/test/cases/020_kernel/015_config_5.12.x/test.yml @@ -10,6 +10,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit 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 553f3b5bb..b7db0a5dc 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 @@ -15,6 +15,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit 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 8c6ea08aa..078e43e5f 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 @@ -15,6 +15,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/115_kmod_5.12.x/test.yml b/test/cases/020_kernel/115_kmod_5.12.x/test.yml index 1824bdc5a..1ecf39b38 100644 --- a/test/cases/020_kernel/115_kmod_5.12.x/test.yml +++ b/test/cases/020_kernel/115_kmod_5.12.x/test.yml @@ -15,6 +15,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index 636d29096..f1715327c 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -4,6 +4,3 @@ kernel: init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d -trust: - org: - - linuxkit diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index f52cc0900..f8ed97af0 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -42,6 +42,3 @@ services: - /run:/var/run capabilities: - all -trust: - org: - - linuxkit diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 4748f8e53..20d196c9c 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -17,6 +17,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index efaf77c06..95c082f74 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -19,8 +19,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - image: - - alpine:3.11 diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 14d2e95fa..60711257d 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -22,8 +22,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - image: - - alpine:3.11 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 61283707e..90ac0b237 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -18,8 +18,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - image: - - alpine:3.11 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 1e109f6cf..592f1b4f4 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -21,6 +21,3 @@ onboot: image: linuxkit/test-containerd:701421314e1b114c4787255431e066a681e80f16 - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f -trust: - org: - - linuxkit diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 47ea5b1b3..7a65c668b 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -20,8 +20,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - image: - - alpine:3.11 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 2fa92764d..73bac832e 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 @@ -23,8 +23,3 @@ files: source: ./check.sh - path: etc/dm-crypt/key contents: "abcdefghijklmnopqrstuvwxyz123456" -trust: - org: - - linuxkit - image: - - alpine:3.11 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 1804be63c..e372ac24b 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 @@ -23,8 +23,3 @@ files: source: ./check.sh - path: etc/dm-crypt/key contents: "abcdefghijklmnopqrstuvwxyz123456" -trust: - org: - - linuxkit - image: - - alpine:3.11 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 4a9041fdf..ec5bc6b94 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 @@ -26,8 +26,3 @@ files: source: ./check.sh - path: some/other/enc_key contents: "abcdefghijklmnopqrstuvwxyz123456" -trust: - org: - - linuxkit - image: - - alpine:3.11 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 31bff0ad8..24a78ac3b 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 @@ -18,7 +18,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit - - library 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 7caa99e2d..6499b685c 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -22,7 +22,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 3f3dbbabf..fbb959814 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 @@ -22,7 +22,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit - - library 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 138999b3c..90208382a 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -26,7 +26,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 89bbd0be2..406244e16 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 @@ -19,7 +19,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit - - library 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 61912d394..76d842ad3 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -23,7 +23,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 e980badc3..5b7e11c83 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 @@ -19,7 +19,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "10"] -trust: - org: - - linuxkit - - library 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 7caa99e2d..6499b685c 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -22,7 +22,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 4a72598e0..539e4745d 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 @@ -23,7 +23,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 50569cf5b..fd7b7568f 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 @@ -23,7 +23,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 adaa72e2b..06141b5f0 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 @@ -23,7 +23,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 983b90a5a..e561ba297 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 @@ -26,7 +26,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 540d11e12..5b5ed1ab3 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 @@ -23,7 +23,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 6a1461882..609279c3f 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 @@ -31,7 +31,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 aa4f99ba6..c3d055e48 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 @@ -23,7 +23,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library 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 1d17268dc..8ba7bd258 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 @@ -30,7 +30,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 7dcf3130f..7f7b15d0a 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -17,6 +17,3 @@ files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) contents: 'root:$6$6tPd2uhHrecCEKug$8mKfcgfwguP7f.BLdZsT1Wz7WIIJOBY1oUFHzIv9/O71M2J0EPdtFqFGTxB1UK5ejqQxRFQ.ZSG9YXR0SNsc11:17322:0:::::' -trust: - org: - - linuxkit diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.yml b/test/cases/040_packages/008_metadata/000_cidata/test.yml index aa90f9f36..8521fc01f 100644 --- a/test/cases/040_packages/008_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/008_metadata/000_cidata/test.yml @@ -19,7 +19,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 305baee33..a6f7bf457 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -21,8 +21,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - image: - - alpine:3.11 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 3f62c5a4b..6fcd8fb48 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -9,6 +9,3 @@ onboot: image: linuxkit/mkimage:6a13c5814c95ccfb02518f8824a7c09bcea266fe - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f -trust: - org: - - linuxkit diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 4f58d8f83..2f90ea6b2 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -7,6 +7,3 @@ init: onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f -trust: - org: - - linuxkit diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index f1fcf1d67..4d211c8ae 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -21,8 +21,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - image: - - alpine:3.11 diff --git a/test/cases/040_packages/020_init_containerd/test.yml b/test/cases/040_packages/020_init_containerd/test.yml index 73208789d..ed8a3b6c4 100644 --- a/test/cases/040_packages/020_init_containerd/test.yml +++ b/test/cases/040_packages/020_init_containerd/test.yml @@ -21,8 +21,3 @@ files: source: ./check.sh - path: /etc/containerd/runtime-config.toml source: ./runtime-config.toml -trust: - org: - - linuxkit - image: - - alpine:3.11 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 6812ffb93..e9dbb034b 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -87,7 +87,3 @@ files: Endpoint = 127.0.0.1:51820 - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - - library diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index ac38fb9b0..42b5657a7 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -28,8 +28,3 @@ services: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - image: - - alpine:3.11 diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index aaca8d41d..87579644a 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -25,8 +25,3 @@ services: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - image: - - alpine:3.11 diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index b15264034..e6fe1a2cf 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -22,8 +22,3 @@ onboot: files: - path: check.sh source: ./check.sh -trust: - org: - - linuxkit - image: - - alpine:3.11 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 712815588..d5f399d07 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -15,6 +15,3 @@ onboot: files: - path: /etc/ltp/baseline contents: "100" -trust: - org: - - linuxkit diff --git a/test/hack/test.yml b/test/hack/test.yml index f05db71b3..31d78110d 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -16,6 +16,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "120"] -trust: - org: - - linuxkit diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 916e3db47..80b59629e 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -16,6 +16,3 @@ onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit From ce73340d6c6fd91dc66b1ab4eabe64c2f3c9fa1e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 10 Aug 2021 00:11:48 +0100 Subject: [PATCH 2/3] examples: Prefix examples for platforms with platform- Signed-off-by: Rolf Neugebauer --- examples/{aws.yml => platform-aws.yml} | 0 examples/{azure.yml => platform-azure.yml} | 0 examples/{gcp.yml => platform-gcp.yml} | 0 examples/{hetzner.yml => platform-hetzner.yml} | 0 examples/{packet.arm64.yml => platform-packet.arm64.yml} | 0 examples/{packet.yml => platform-packet.yml} | 0 examples/{rt-for-vmware.yml => platform-rt-for-vmware.yml} | 0 examples/{scaleway.yml => platform-scaleway.yml} | 0 examples/{vmware.yml => platform-vmware.yml} | 0 examples/{vultr.yml => platform-vultr.yml} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename examples/{aws.yml => platform-aws.yml} (100%) rename examples/{azure.yml => platform-azure.yml} (100%) rename examples/{gcp.yml => platform-gcp.yml} (100%) rename examples/{hetzner.yml => platform-hetzner.yml} (100%) rename examples/{packet.arm64.yml => platform-packet.arm64.yml} (100%) rename examples/{packet.yml => platform-packet.yml} (100%) rename examples/{rt-for-vmware.yml => platform-rt-for-vmware.yml} (100%) rename examples/{scaleway.yml => platform-scaleway.yml} (100%) rename examples/{vmware.yml => platform-vmware.yml} (100%) rename examples/{vultr.yml => platform-vultr.yml} (100%) diff --git a/examples/aws.yml b/examples/platform-aws.yml similarity index 100% rename from examples/aws.yml rename to examples/platform-aws.yml diff --git a/examples/azure.yml b/examples/platform-azure.yml similarity index 100% rename from examples/azure.yml rename to examples/platform-azure.yml diff --git a/examples/gcp.yml b/examples/platform-gcp.yml similarity index 100% rename from examples/gcp.yml rename to examples/platform-gcp.yml diff --git a/examples/hetzner.yml b/examples/platform-hetzner.yml similarity index 100% rename from examples/hetzner.yml rename to examples/platform-hetzner.yml diff --git a/examples/packet.arm64.yml b/examples/platform-packet.arm64.yml similarity index 100% rename from examples/packet.arm64.yml rename to examples/platform-packet.arm64.yml diff --git a/examples/packet.yml b/examples/platform-packet.yml similarity index 100% rename from examples/packet.yml rename to examples/platform-packet.yml diff --git a/examples/rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml similarity index 100% rename from examples/rt-for-vmware.yml rename to examples/platform-rt-for-vmware.yml diff --git a/examples/scaleway.yml b/examples/platform-scaleway.yml similarity index 100% rename from examples/scaleway.yml rename to examples/platform-scaleway.yml diff --git a/examples/vmware.yml b/examples/platform-vmware.yml similarity index 100% rename from examples/vmware.yml rename to examples/platform-vmware.yml diff --git a/examples/vultr.yml b/examples/platform-vultr.yml similarity index 100% rename from examples/vultr.yml rename to examples/platform-vultr.yml From 4eb60514c91cf831d3b9f6c0fe3d3cf203af797c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 10 Aug 2021 00:13:52 +0100 Subject: [PATCH 3/3] yaml: Update use of alpine:3.11 to alpine:3.13 Seceral YAML files used alpine:3:11. Update them to 3.13 Signed-off-by: Rolf Neugebauer --- docs/image-cache.md | 4 ++-- examples/docker-for-mac.yml | 4 ++-- examples/logging.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- test/cases/020_kernel/111_kmod_5.4.x/Dockerfile | 2 +- test/cases/020_kernel/113_kmod_5.10.x/Dockerfile | 2 +- test/cases/020_kernel/115_kmod_5.12.x/Dockerfile | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/002_bpftrace/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/000_simple/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/001_luks/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/002_key/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test-create.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- .../cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/006_gpt/test.yml | 2 +- .../cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/008_metadata/000_cidata/test.sh | 2 +- test/cases/040_packages/008_metadata/000_cidata/test.yml | 2 +- test/cases/040_packages/012_losetup/test.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- test/cases/040_packages/020_init_containerd/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 4 ++-- test/cases/040_packages/030_logwrite/test.yml | 2 +- test/cases/040_packages/031_kmsg/test.yml | 2 +- test/cases/040_packages/032_bcc/test.yml | 2 +- 39 files changed, 42 insertions(+), 42 deletions(-) diff --git a/docs/image-cache.md b/docs/image-cache.md index cadc5ea0e..780047f5f 100644 --- a/docs/image-cache.md +++ b/docs/image-cache.md @@ -7,7 +7,7 @@ linuxkit does not use the docker image cache to store these images. This is for two key reasons. First, docker does not provide support for different architecture versions. For -example, if you want to pull down `docker.io/library/alpine:3.11` by manifest, +example, if you want to pull down `docker.io/library/alpine:3.13` by manifest, with its signature, but get the `arm64` version while you are on an `amd64` device, it is not supported. @@ -40,7 +40,7 @@ Image names are kept in `index.json` in the [annotation](https://github.com/open "size": 1638, "digest": "sha256:9a839e63dad54c3a6d1834e29692c8492d93f90c59c978c1ed79109ea4fb9a54", "annotations": { - "org.opencontainers.image.ref.name": "docker.io/library/alpine:3.11" + "org.opencontainers.image.ref.name": "docker.io/library/alpine:3.13" } } ] diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 416f8fac2..f2d9f03af 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -30,7 +30,7 @@ onboot: 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 - image: alpine:3.11 + image: alpine:3.13 binds: - /var/:/host_var:rbind,rshared capabilities: @@ -39,7 +39,7 @@ onboot: command: ["sh", "-c", "mkdir -p /host_var/vpnkit/port && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] # move logs to the mounted disk (this is a temporary fix until we can limit the log sizes) - name: move-logs - image: alpine:3.11 + image: alpine:3.13 binds: - /var:/host_var command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] diff --git a/examples/logging.yml b/examples/logging.yml index 95e0a7a3c..9295c993c 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -22,7 +22,7 @@ services: - INSECURE=true # A service which generates log messages for testing - name: write-to-the-logs - image: alpine:3.11 + 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:e64e0f06e485e3542b58f3517da3bc13f246d208 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 60085e961..4bb49a8c8 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -10,7 +10,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit - image: alpine:3.11 + image: alpine:3.13 binds: - /var/:/host_var:rbind,rshared capabilities: diff --git a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile index 84d952c60..7a9edbc83 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile +++ b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.11 +FROM alpine:3.13 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile b/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile index 79e45325b..0b67e7f07 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile +++ b/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.11 +FROM alpine:3.13 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/115_kmod_5.12.x/Dockerfile b/test/cases/020_kernel/115_kmod_5.12.x/Dockerfile index 756b95170..5510e53d3 100644 --- a/test/cases/020_kernel/115_kmod_5.12.x/Dockerfile +++ b/test/cases/020_kernel/115_kmod_5.12.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.11 +FROM alpine:3.13 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 20d196c9c..cbe313855 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d onboot: - name: test - image: alpine:3.11 + image: alpine:3.13 readonly: true binds: - /check.sh:/check.sh diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 95c082f74..47a138ab5 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -8,7 +8,7 @@ onboot: - name: binfmt image: linuxkit/binfmt:5567917e7de481e4867d31c7490a0ebdb70e04a5 - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /check.sh:/check.sh - /proc/sys/fs/binfmt_misc:/binfmt_misc diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 60711257d..b2eba7d12 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -7,7 +7,7 @@ init: - linuxkit/bpftrace:a5c57a3791a87e96aea456f78fd88973ea9904d0 onboot: - name: bpftrace-test - image: alpine:3.11 + image: alpine:3.13 binds: - /check.sh:/check.sh command: ["sh", "./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 90ac0b237..15498294a 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -7,7 +7,7 @@ init: - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /check.sh:/check.sh - /etc:/host-etc diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 7a65c668b..296894c3e 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test - image: alpine:3.11 + image: alpine:3.13 net: host binds: - /check.sh:/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 73bac832e..4bb193e37 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 @@ -9,7 +9,7 @@ onboot: image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb command: ["/usr/bin/crypto", "it_is_encrypted", "/dev/sda"] - name: test - image: alpine:3.11 + image: alpine:3.13 net: host binds: - /check.sh:/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 e372ac24b..646715971 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 @@ -9,7 +9,7 @@ onboot: image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb command: ["/usr/bin/crypto", "-l", "it_is_encrypted", "/dev/sda"] - name: test - image: alpine:3.11 + image: alpine:3.13 net: host binds: - /check.sh:/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 ec5bc6b94..006ea44ba 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 @@ -12,7 +12,7 @@ onboot: - /dev/:/dev - /some/other/enc_key:/some/other/enc_key - name: test - image: alpine:3.11 + image: alpine:3.13 net: host binds: - /check.sh:/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 24a78ac3b..a3a98b577 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 @@ -11,7 +11,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] 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 6499b685c..6d9fbbc87 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/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 fbb959814..310220ee8 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 @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] 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 90208382a..8f159d219 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh 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 406244e16..9d06a9b94 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] 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 76d842ad3..2ce6a3777 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/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 5b7e11c83..3b86c6fbe 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] 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 6499b685c..6d9fbbc87 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/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 539e4745d..d0791f39d 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/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 fd7b7568f..33960a4d5 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/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 06141b5f0..ab0cb640f 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/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 e561ba297..75543ecfb 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 @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/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 5b5ed1ab3..9b873b62b 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/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 c3d055e48..37f385d62 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/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 8ba7bd258..7ab2af8ab 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 @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /var/lib/docker:/var/lib/docker - /var/foo:/var/foo diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.sh b/test/cases/040_packages/008_metadata/000_cidata/test.sh index 47df9e12c..33f0b0241 100755 --- a/test/cases/040_packages/008_metadata/000_cidata/test.sh +++ b/test/cases/040_packages/008_metadata/000_cidata/test.sh @@ -22,7 +22,7 @@ trap clean_up EXIT # generate our cdrom image ISOFILE=/tmp/cidata.iso -docker run -i --rm -v $(pwd)/geniso.sh:/geniso.sh:ro alpine:3.11 /geniso.sh > ${ISOFILE} +docker run -i --rm -v $(pwd)/geniso.sh:/geniso.sh:ro alpine:3.13 /geniso.sh > ${ISOFILE} linuxkit build -format kernel+initrd -name ${NAME} test.yml RESULT="$(linuxkit run -disk file=${DISK},size=32M -disk file=${ISOFILE} ${NAME})" diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.yml b/test/cases/040_packages/008_metadata/000_cidata/test.yml index 8521fc01f..06289ffdf 100644 --- a/test/cases/040_packages/008_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/008_metadata/000_cidata/test.yml @@ -8,7 +8,7 @@ onboot: - name: metadata image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d - name: test - image: alpine:3.11 + image: alpine:3.13 binds: - /check.sh:/check.sh - /run:/run diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index a6f7bf457..3cfc1e7cc 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/losetup:db35344a21e44a55195540a8670886f60aa77201 command: ["/usr/bin/loopy", "-c", "/var/test.img"] - name: test - image: alpine:3.11 + image: alpine:3.13 net: host binds: - /check.sh:/check.sh diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 4d211c8ae..dc256d3ef 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -8,7 +8,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a - name: test - image: alpine:3.11 + image: alpine:3.13 net: host pid: host ipc: host diff --git a/test/cases/040_packages/020_init_containerd/test.yml b/test/cases/040_packages/020_init_containerd/test.yml index ed8a3b6c4..6fd6104a2 100644 --- a/test/cases/040_packages/020_init_containerd/test.yml +++ b/test/cases/040_packages/020_init_containerd/test.yml @@ -8,7 +8,7 @@ init: - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a services: - name: test - image: alpine:3.11 + image: alpine:3.13 pid: host binds: - /check.sh:/check.sh diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index e9dbb034b..c13224bad 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -38,7 +38,7 @@ onboot: net: /run/netns/wg1 onshutdown: - name: test2 - image: alpine:3.11 + image: alpine:3.13 binds: - /tmp:/tmp - /check.sh:/check.sh @@ -55,7 +55,7 @@ services: - CAP_SETGID - CAP_DAC_OVERRIDE - name: test - image: alpine:3.11 + image: alpine:3.13 net: /run/netns/wg1 pid: host capabilities: diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index 42b5657a7..e27cf9ba5 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -16,7 +16,7 @@ services: image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208 command: ["/usr/bin/logwrite", "-max-log-size", "1024"] - name: check-the-logs - image: alpine:3.11 + image: alpine:3.13 binds: - /check.sh:/check.sh - /dev/console:/dev/console diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 87579644a..b2987523e 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -13,7 +13,7 @@ services: - name: write-and-rotate-logs image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208 - name: check-the-logs - image: alpine:3.11 + image: alpine:3.13 binds: - /check.sh:/check.sh - /dev/console:/dev/console diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index e6fe1a2cf..cc29e731e 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -7,7 +7,7 @@ init: - linuxkit/kernel-bcc:5.4.113 onboot: - name: check-bcc - image: alpine:3.11 + image: alpine:3.13 binds: - /check.sh:/check.sh command: ["sh", "./check.sh"]