Merge pull request #3713 from rn/notrust

Update YAML files

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"
       }
     }
   ]

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

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

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

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

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"]
@@ -106,8 +106,3 @@ services:
             "--storage-driver", "overlay2" ]
     runtime:
       mkdir: ["/var/lib/docker"]
-
-trust:
-    org:
-        - linuxkit
-        - library

examples/docker.yml

@@ -46,7 +46,3 @@ files:
     directory: true
   - path: etc/docker/daemon.json
     contents: '{"debug": true}'
-trust:
-  org:
-    - linuxkit
-    - library

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

examples/hostmount-writeable-overlay.yml

@@ -41,7 +41,3 @@ services:
      - CAP_DAC_OVERRIDE
     binds:
      - /etc/resolv.conf:/etc/resolv.conf
-trust:
-  org:
-    - linuxkit
-    - library

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

examples/logging.yml

@@ -22,13 +22,9 @@ 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
   - name: kmsg
     image: linuxkit/kmsg:df84eda2a82d5e24ddfe241831af3efb13a1a557
-trust:
-  org:
-    - linuxkit
-    - library

examples/minimal.yml

@@ -14,6 +14,3 @@ services:
     image: linuxkit/getty:ed32c71531f5998aa510847bb07bd847492d4101
     env:
      - INSECURE=true
-trust:
-  org:
-    - linuxkit

examples/node_exporter.yml

@@ -16,6 +16,3 @@ services:
     image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388
   - name: node_exporter
     image: linuxkit/node_exporter:f2e8d89c950dada9a1ff497f312abd79a00292f8
-trust:
-  org:
-    - linuxkit

examples/openstack.yml

@@ -32,7 +32,3 @@ services:
      - CAP_DAC_OVERRIDE
     binds:
      - /etc/resolv.conf:/etc/resolv.conf
-trust:
-  org:
-    - linuxkit
-    - library

examples/platform-aws.yml

@@ -31,7 +31,3 @@ services:
      - CAP_DAC_OVERRIDE
     binds:
      - /etc/resolv.conf:/etc/resolv.conf
-trust:
-  org:
-    - linuxkit
-    - library

examples/platform-azure.yml

@@ -21,6 +21,3 @@ files:
     source: ~/.ssh/id_rsa.pub
     mode: "0600"
     optional: true
-trust:
-  org:
-    - linuxkit

examples/platform-gcp.yml

@@ -35,7 +35,3 @@ services:
      - CAP_DAC_OVERRIDE
     binds:
      - /etc/resolv.conf:/etc/resolv.conf
-trust:
-  org:
-    - linuxkit
-    - library

examples/platform-hetzner.yml

@@ -34,6 +34,3 @@ files:
     source: ~/.ssh/id_rsa.pub
     mode: "0600"
     optional: true
-trust:
-  org:
-    - linuxkit

examples/platform-packet.yml

@@ -34,6 +34,3 @@ files:
     source: ~/.ssh/id_rsa.pub
     mode: "0600"
     optional: true
-trust:
-  org:
-    - linuxkit

examples/platform-rt-for-vmware.yml

@@ -30,7 +30,3 @@ services:
      - CAP_DAC_OVERRIDE
     binds:
      - /etc/resolv.conf:/etc/resolv.conf
-trust:
-  org:
-    - linuxkit
-    - library

examples/platform-scaleway.yml

@@ -24,6 +24,3 @@ services:
      - INSECURE=true
   - name: rngd
     image: linuxkit/rngd:bdabfe138f05f7d48396d2f435af16f5a6ccaa45
-trust:
-  org:
-    - linuxkit

examples/platform-vmware.yml

@@ -28,7 +28,3 @@ services:
      - CAP_DAC_OVERRIDE
     binds:
      - /etc/resolv.conf:/etc/resolv.conf
-trust:
-  org:
-    - linuxkit
-    - library

examples/platform-vultr.yml

@@ -36,7 +36,3 @@ services:
      - CAP_DAC_OVERRIDE
     binds:
      - /etc/resolv.conf:/etc/resolv.conf
-trust:
-  org:
-    - linuxkit
-    - library

examples/redis-os.yml

@@ -27,7 +27,3 @@ services:
      - CAP_SETGID
      - CAP_DAC_OVERRIDE
     net: host
-trust:
-  org:
-    - linuxkit
-    - library

examples/sshd.yml

@@ -28,6 +28,3 @@ files:
     source: ~/.ssh/id_rsa.pub
     mode: "0600"
     optional: true
-trust:
-  org:
-    - linuxkit

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

examples/swap.yml

@@ -29,7 +29,3 @@ services:
      - INSECURE=true
   - name: rngd
     image: linuxkit/rngd:bdabfe138f05f7d48396d2f435af16f5a6ccaa45
-trust:
-  org:
-    - linuxkit
-    - library

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

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:
@@ -32,7 +32,3 @@ files:
     source: ~/.ssh/id_rsa.pub
     mode: "0600"
     optional: true
-
-trust:
-  org:
-    - linuxkit

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

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

linuxkit.yml

@@ -36,7 +36,3 @@ services:
 files:
   - path: etc/linuxkit-config
     metadata: yaml
-trust:
-  org:
-    - linuxkit
-    - library

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

test/cases/000_build/010_reproducible/test.yml

@@ -45,8 +45,3 @@ services:
 files:
   - path: etc/linuxkit-config
     metadata: yaml
-
-trust:
-  org:
-    - linuxkit
-    - library

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

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

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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"]

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

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"]

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

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"]

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

test/cases/020_kernel/200_namespace/common.yml

@@ -4,6 +4,3 @@ kernel:
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6
   - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d
-trust:
-  org:
-    - linuxkit

test/cases/030_security/000_docker-bench/test.yml

@@ -42,6 +42,3 @@ services:
      - /run:/var/run
     capabilities:
      - all
-trust:
-  org:
-    - linuxkit

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
@@ -17,6 +17,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit

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
@@ -19,8 +19,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

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"]
@@ -22,8 +22,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

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
@@ -18,8 +18,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

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

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
@@ -20,8 +20,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

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
@@ -23,8 +23,3 @@ files:
     source: ./check.sh
   - path: etc/dm-crypt/key
     contents: "abcdefghijklmnopqrstuvwxyz123456"
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

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
@@ -23,8 +23,3 @@ files:
     source: ./check.sh
   - path: etc/dm-crypt/key
     contents: "abcdefghijklmnopqrstuvwxyz123456"
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

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
@@ -26,8 +26,3 @@ files:
     source: ./check.sh
   - path: some/other/enc_key
     contents: "abcdefghijklmnopqrstuvwxyz123456"
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

test/cases/040_packages/005_extend/000_ext4/test-create.yml

@@ -11,14 +11,10 @@ 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"]
   - name: poweroff
     image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
     command: ["/bin/sh", "/poweroff.sh", "10"]
-trust:
-  org: 
-    - linuxkit
-    - library

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
@@ -22,7 +22,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

test/cases/040_packages/005_extend/001_btrfs/test-create.yml

@@ -15,14 +15,10 @@ 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"]
   - name: poweroff
     image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
     command: ["/bin/sh", "/poweroff.sh", "10"]
-trust:
-  org: 
-    - linuxkit
-    - library

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
@@ -26,7 +26,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

test/cases/040_packages/005_extend/002_xfs/test-create.yml

@@ -12,14 +12,10 @@ 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"]
   - name: poweroff
     image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
     command: ["/bin/sh", "/poweroff.sh", "10"]
-trust:
-  org: 
-    - linuxkit
-    - library

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
@@ -23,7 +23,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

test/cases/040_packages/005_extend/003_gpt/test-create.yml

@@ -12,14 +12,10 @@ 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"]
   - name: poweroff
     image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
     command: ["/bin/sh", "/poweroff.sh", "10"]
-trust:
-  org: 
-    - linuxkit
-    - library

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
@@ -22,7 +22,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

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
@@ -23,7 +23,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

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
@@ -23,7 +23,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

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
@@ -23,7 +23,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

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
@@ -26,7 +26,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

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
@@ -23,7 +23,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

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

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
@@ -23,7 +23,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

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
@@ -30,7 +30,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

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

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})"

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
@@ -19,7 +19,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

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
@@ -21,8 +21,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

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

test/cases/040_packages/013_mkimage/run.yml

@@ -7,6 +7,3 @@ init:
 onboot:
   - name: poweroff
     image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
-trust:
-  org:
-    - linuxkit

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
@@ -21,8 +21,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

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
@@ -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

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:
@@ -87,7 +87,3 @@ files:
       Endpoint = 127.0.0.1:51820
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-    - library

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
@@ -28,8 +28,3 @@ services:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

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
@@ -25,8 +25,3 @@ services:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

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"]
@@ -22,8 +22,3 @@ onboot:
 files:
   - path: check.sh
     source: ./check.sh
-trust:
-  org:
-    - linuxkit
-  image:
-    - alpine:3.11

test/hack/test-ltp.yml

@@ -15,6 +15,3 @@ onboot:
 files:
   - path: /etc/ltp/baseline
     contents: "100"
-trust:
-  org:
-    - linuxkit

test/hack/test.yml

@@ -16,6 +16,3 @@ onboot:
   - name: poweroff
     image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
     command: ["/bin/sh", "/poweroff.sh", "120"]
-trust:
-  org:
-    - linuxkit

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