diff --git a/examples/addbinds.yml b/examples/addbinds.yml index 80945681b..7afc1cdfb 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index d462e561e..40818a6f4 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index cc22ca3fe..ed1032a6b 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index 1c4dc118b..3d8b01e4b 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index d2edb1070..6f87a8a5a 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -4,9 +4,9 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:c61565ee34e58823aaf7c05fd6359a8fd889137f # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: # support metadata for optional config in /run/config diff --git a/examples/docker.yml b/examples/docker.yml index e294193c1..4e88464f1 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 0a0c1a321..f3f101258 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 42d15a67d..2774da4c0 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 62af15e69..8694acf12 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: dhcpcd diff --git a/examples/logging.yml b/examples/logging.yml index 1daf78494..39f930ca9 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 - linuxkit/memlogd:cf7ea20e6b68aacaa888aa178f267dcad602ed05 onboot: diff --git a/examples/minimal.yml b/examples/minimal.yml index 4b1ea4951..a0143e816 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a onboot: - name: dhcpcd image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 4812765f3..217c4d977 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a services: - name: getty image: linuxkit/getty:06f34bce0facea79161566d67345c3ea49965437 diff --git a/examples/openstack.yml b/examples/openstack.yml index ee34a2a96..aabd06d43 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index 8424cbd54..691fa2d3f 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index 65c000f6e..aa9049100 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index 520b42319..1ef1d4f1e 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index 8cfaf3fb1..4caedf5a4 100644 --- a/examples/platform-hetzner.yml +++ b/examples/platform-hetzner.yml @@ -3,9 +3,9 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 - linuxkit/firmware:a17106a98940006529c714a3783eb03238c335a7 onboot: diff --git a/examples/platform-packet.yml b/examples/platform-packet.yml index f9d6d6c36..444af2972 100644 --- a/examples/platform-packet.yml +++ b/examples/platform-packet.yml @@ -3,9 +3,9 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 - linuxkit/firmware:a17106a98940006529c714a3783eb03238c335a7 onboot: diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index dc2d263b5..47ae2ed08 100644 --- a/examples/platform-rt-for-vmware.yml +++ b/examples/platform-rt-for-vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.11.4-rt cmdline: "console=tty0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index 6503bb552..93a87b735 100644 --- a/examples/platform-scaleway.yml +++ b/examples/platform-scaleway.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index a6b10e460..258fd73bb 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index 50933f364..7843193a0 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 368f08d1f..0cbddd3d6 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a onboot: - name: dhcpcd image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 diff --git a/examples/sshd.yml b/examples/sshd.yml index d92713ca2..379cb70ff 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/static-ip.yml b/examples/static-ip.yml index f152b8a9b..53b939a72 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a onboot: - name: ip image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 diff --git a/examples/swap.yml b/examples/swap.yml index aaad717f1..91e75b5bd 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index 7decf0b30..b36c3135a 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 1b311a26f..44f0ce59f 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a onboot: - name: dhcpcd image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 8e61dd2e7..e5a284100 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a onboot: - name: dhcpcd image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index f56cafc74..d72ea7da1 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 89070bb9d..fd0ee14f5 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.15.27 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 9487e51ad..60611a2bc 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -3,7 +3,7 @@ FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 as alpine RUN apk add tzdata binutils RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd -FROM linuxkit/containerd-dev:30c6ccebe92d8af06596fb33b71ec005859116cc as containerd-dev +FROM linuxkit/containerd-dev:ee5755eb38c0a6b6aef2658b757652d82556c30c as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index f88cf903a..dcad26fce 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:30c6ccebe92d8af06596fb33b71ec005859116cc AS containerd-dev +FROM linuxkit/containerd-dev:ee5755eb38c0a6b6aef2658b757652d82556c30c AS containerd-dev FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 83460bfd7..034064339 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-clear-containers:4.9.x cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 88df1412c..d4ce26318 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 254fb2168..d5a724251 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 5276ce31c..6b53469ad 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index efc6652ea..f1982ffee 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: mobylinux/kernel-landlock:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index e347b87f3..1dce8fd51 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a onboot: - name: dhcpcd image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 089b47268..5203498d5 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 6f54472a6..c2db36222 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a onboot: - name: sysctl image: linuxkit/sysctl:a88a50c104d538b58da5e1441f6f0b4b738f76a6 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 5482a05b3..3ae43e129 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,9 +2,9 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index cdf775604..a64b241f9 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,9 +2,9 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/src/cmd/linuxkit/moby/mkimage.yaml b/src/cmd/linuxkit/moby/mkimage.yaml index 761e2ea55..bfdf1811c 100644 --- a/src/cmd/linuxkit/moby/mkimage.yaml +++ b/src/cmd/linuxkit/moby/mkimage.yaml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: mkimage diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index e54d657fb..a738be2d3 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dhcpcd diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 29b2f47cf..6458d1e56 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a onboot: - name: dhcpcd diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index dd1932b23..184bdb2e8 100644 --- a/test/cases/000_build/020_binds/test.yml +++ b/test/cases/000_build/020_binds/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: mount 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 0e7ba552e..e7702d394 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index 0e7ba552e..e7702d394 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index dcb9f3e56..4e7be3e83 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index e8a189e81..fa2eab231 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index e8a189e81..fa2eab231 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index e8a189e81..fa2eab231 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index e8a189e81..fa2eab231 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index f5fdf7eef..0db9738ba 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index e8a189e81..fa2eab231 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index e8a189e81..fa2eab231 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index a0eab81df..962edc7b7 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a services: - name: acpid image: linuxkit/acpid:548f8f1c8bda31cdbefb65bdb0747f97c17639d2 diff --git a/test/cases/010_platforms/110_gcp/000_run/test.yml b/test/cases/010_platforms/110_gcp/000_run/test.yml index e8a189e81..fa2eab231 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/020_kernel/011_config_5.4.x/test.yml b/test/cases/020_kernel/011_config_5.4.x/test.yml index aa6adc87f..9405dc2b6 100644 --- a/test/cases/020_kernel/011_config_5.4.x/test.yml +++ b/test/cases/020_kernel/011_config_5.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.172 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/013_config_5.10.x/test.yml b/test/cases/020_kernel/013_config_5.10.x/test.yml index d68d53b54..45b5ffd6d 100644 --- a/test/cases/020_kernel/013_config_5.10.x/test.yml +++ b/test/cases/020_kernel/013_config_5.10.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/016_config_5.15.x/test.yml b/test/cases/020_kernel/016_config_5.15.x/test.yml index 8ec4756dd..9c7b33e43 100644 --- a/test/cases/020_kernel/016_config_5.15.x/test.yml +++ b/test/cases/020_kernel/016_config_5.15.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.15.27 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.yml b/test/cases/020_kernel/111_kmod_5.4.x/test.yml index a2176d85e..cdbb017f4 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.yml +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.172 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check diff --git a/test/cases/020_kernel/113_kmod_5.10.x/test.yml b/test/cases/020_kernel/113_kmod_5.10.x/test.yml index 76e2e8bfc..06e8e70d9 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/test.yml +++ b/test/cases/020_kernel/113_kmod_5.10.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check diff --git a/test/cases/020_kernel/116_kmod_5.15.x/test.yml b/test/cases/020_kernel/116_kmod_5.15.x/test.yml index 545aeb1ea..054e29e0b 100644 --- a/test/cases/020_kernel/116_kmod_5.15.x/test.yml +++ b/test/cases/020_kernel/116_kmod_5.15.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.15.27 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: check diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index 0a27ea6d8..4a31290e4 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -2,5 +2,5 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 3a0ea5e48..2e60115ca 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 9788ff112..ad61513fb 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: test diff --git a/test/cases/040_packages/001_dummy/test.yml b/test/cases/040_packages/001_dummy/test.yml index 049167f3e..aed16ee70 100644 --- a/test/cases/040_packages/001_dummy/test.yml +++ b/test/cases/040_packages/001_dummy/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dummy diff --git a/test/cases/040_packages/002_bcc/test.yml b/test/cases/040_packages/002_bcc/test.yml index 4379f0156..ab41cf47d 100644 --- a/test/cases/040_packages/002_bcc/test.yml +++ b/test/cases/040_packages/002_bcc/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - linuxkit/kernel-bcc:5.4.113 onboot: diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 2d7c84400..1a3c42f8b 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: binfmt diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 7a1b937c8..3b8bbf37e 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - linuxkit/bpftrace:aa3c430a9998399875e6cf3511e38fd3ab07cc5f onboot: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index ddbd14579..49d170cf6 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: diff --git a/test/cases/040_packages/003_cgroupv2/test.yml b/test/cases/040_packages/003_cgroupv2/test.yml index 82d3bc30d..797a64739 100644 --- a/test/cases/040_packages/003_cgroupv2/test.yml +++ b/test/cases/040_packages/003_cgroupv2/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "linuxkit.unified_cgroup_hierarchy=1 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index d8e15d622..c60cccd2b 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: dhcpcd @@ -18,6 +18,6 @@ onboot: image: linuxkit/mount:f671cb94a8999a65e33b3fe79f3def58e3d58b07 command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:f7440607d4f022907e8fcc15fe49ffa233b7c758 + image: linuxkit/test-containerd:95300ba5dac0d934ccca3e028450a645e67489da - name: poweroff image: linuxkit/poweroff:992d9c7531166fe071d945e8b2728d8b61eb8d5a diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 74fa5ed64..709c2013f 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dhcpcd diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index 6f5bbfdfd..7d2b54c95 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dm-crypt diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index 090548905..47fefbc47 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dm-crypt diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index a38d392db..8326c4d7a 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: dm-crypt diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 0e26f2d8c..66f6808ef 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index 08b779ea3..75985605c 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 25b63d34e..f324fe554 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index b03d62830..1f71d3ae8 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index a350cbb01..8e67b13c9 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index dcf427fc2..5677844a9 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/003_gpt/test-create.yml b/test/cases/040_packages/005_extend/003_gpt/test-create.yml index d9fd1f09b..b2d7ec6a3 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test-create.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format diff --git a/test/cases/040_packages/005_extend/003_gpt/test.yml b/test/cases/040_packages/005_extend/003_gpt/test.yml index 08b779ea3..75985605c 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: extend diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index 4cc54a525..9a672f22e 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 37d6675fc..e9772cf65 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 3c878b882..135597519 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index d1418eb40..9deed5e38 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: modprobe diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 26f997901..f1ba9c69f 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index dc81a7838..80d814868 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.yml b/test/cases/040_packages/006_format_mount/006_gpt/test.yml index f99228651..546ba8e06 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 7517b9289..f29754e83 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: format diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 4b4a1d5e4..5b7af2dba 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/009_init_containerd/test.yml b/test/cases/040_packages/009_init_containerd/test.yml index 1e1d2d4c3..91ca1e7df 100644 --- a/test/cases/040_packages/009_init_containerd/test.yml +++ b/test/cases/040_packages/009_init_containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 services: - name: test diff --git a/test/cases/040_packages/011_kmsg/test.yml b/test/cases/040_packages/011_kmsg/test.yml index da6a4066b..4e309d39b 100644 --- a/test/cases/040_packages/011_kmsg/test.yml +++ b/test/cases/040_packages/011_kmsg/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 - linuxkit/memlogd:cf7ea20e6b68aacaa888aa178f267dcad602ed05 services: diff --git a/test/cases/040_packages/012_logwrite/test.yml b/test/cases/040_packages/012_logwrite/test.yml index 50a53d868..a381ffad5 100644 --- a/test/cases/040_packages/012_logwrite/test.yml +++ b/test/cases/040_packages/012_logwrite/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 - linuxkit/memlogd:cf7ea20e6b68aacaa888aa178f267dcad602ed05 services: diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 470c3c166..9f3977262 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: losetup diff --git a/test/cases/040_packages/013_metadata/000_cidata/test.yml b/test/cases/040_packages/013_metadata/000_cidata/test.yml index 0b12a769e..562c6f7d3 100644 --- a/test/cases/040_packages/013_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/013_metadata/000_cidata/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: metadata diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index a4facbd90..9156d80bc 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 52529c184..198105e1e 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 5e9d050a2..b0d2136be 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 795fbccbc..5dd318d87 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a - linuxkit/ca-certificates:4de36e93dc87f7ccebd20db616ed10d381911d32 onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index ca939ef08..7854c569e 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index 16c5a336b..10bc20c1d 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e - - linuxkit/containerd:eeb3aaf497c0b3f6c67f3a245d61ea5a568ca718 + - linuxkit/containerd:d445de33c7f08470187b068d247b1c0dea240f0a onboot: - name: dhcpcd image: linuxkit/dhcpcd:2a8ed08fea442909ba10f950d458191ed3647115 diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 817d8dd64..29b71e88b 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:30c6ccebe92d8af06596fb33b71ec005859116cc as containerd-dev +FROM linuxkit/containerd-dev:ee5755eb38c0a6b6aef2658b757652d82556c30c as containerd-dev FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index d6e29dcb8..84b570f3b 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:5.10.104 cmdline: "console=ttyS0" init: - - linuxkit/init:6542ad0457ac153861870bfe2d036b6647cdc69f + - linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda - linuxkit/runc:436357ce16dd663e24f595bcec26d5ae476c998e onboot: - name: test-ns diff --git a/tools/containerd-dev/Dockerfile b/tools/containerd-dev/Dockerfile index 86d619a7f..594e22448 100644 --- a/tools/containerd-dev/Dockerfile +++ b/tools/containerd-dev/Dockerfile @@ -4,10 +4,9 @@ FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 as builder # checkout and compile containerd # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # `test/pkg/containerd/Dockerfile` when changing this. -# when building, note that containerd does not use go modules in the below commit, -# while go1.16 defaults to using it, so must disable with GO111MODULE=off ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.6.1 + +ENV CONTAINERD_COMMIT=v1.7.2 ENV GOPATH=/go RUN apk add go git RUN mkdir -p $GOPATH/src/github.com/containerd && \ @@ -17,7 +16,7 @@ RUN mkdir -p $GOPATH/src/github.com/containerd && \ git checkout $CONTAINERD_COMMIT RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev WORKDIR $GOPATH/src/github.com/containerd/containerd -RUN GO111MODULE=off make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper" +RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper" RUN cp bin/containerd bin/ctr bin/containerd-shim bin/containerd-shim-runc-v2 /usr/bin/ RUN strip /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2