diff --git a/examples/addbinds.yml b/examples/addbinds.yml index 8b54a7057..904cd1329 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 0e4e3538a..15b0fc388 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index e652b2d14..8977b00cc 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index 46269d6bc..ea738e8c1 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index a455f4713..0e55f1520 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:87ac61469247b2a0483cbd1fd2915f220e078b78 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: # support metadata for optional config in /run/config diff --git a/examples/docker.yml b/examples/docker.yml index 6929bcec5..b50c7f95c 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 074dd9ac2..bb130d963 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 3eb3b0940..31f58ed9e 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 8cf2660cb..30483a72a 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: dhcpcd diff --git a/examples/logging.yml b/examples/logging.yml index e573e59cc..6f1aece77 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - linuxkit/memlogd:014f86dce2ea4bb2ec13e92ae5c1e854bcefec40 onboot: diff --git a/examples/minimal.yml b/examples/minimal.yml index dd26126a6..d29deea10 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da onboot: - name: dhcpcd image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index b08a9e6be..a84eb38ce 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da services: - name: getty image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8 diff --git a/examples/openstack.yml b/examples/openstack.yml index e11b0dc02..48c722a00 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,9 +2,13 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 +<<<<<<< HEAD + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 +======= + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 +>>>>>>> 01725ea17 (update dependencies of pkg/init and pkg/containerd) - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index ec6522f0d..d46c4205f 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index 5756966cf..b198923cb 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index 15589b727..7c4e87c4c 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index 253204c56..5b106efbb 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - linuxkit/firmware:8f89601312327c78999a880ee104ceae9a25d20e onboot: diff --git a/examples/platform-packet.yml b/examples/platform-packet.yml index 17a49fd8b..25b62a5cf 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - linuxkit/firmware:8f89601312327c78999a880ee104ceae9a25d20e onboot: diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index b13a9e722..ca7325db0 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index 2b5da088b..1f47b1d24 100644 --- a/examples/platform-scaleway.yml +++ b/examples/platform-scaleway.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index cf918b397..c5ab8e141 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index ddd1619f0..2c88574b5 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 4fa9eec4a..9ef7debff 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da onboot: - name: dhcpcd image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 diff --git a/examples/sshd.yml b/examples/sshd.yml index a06f799b5..4bf656dfe 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 41f6b2c25..fc1118b3c 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da onboot: - name: ip image: linuxkit/ip:6cc44dd4e18ddb02de01bc4b34b5799971b6a7bf diff --git a/examples/swap.yml b/examples/swap.yml index acef75a13..68ce6345e 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index f4c26fdb8..eb350ae4a 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index d7ebaf83f..6a2472cb7 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da onboot: - name: dhcpcd image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 32e033a3a..19956a711 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da onboot: - name: dhcpcd image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 2efade1a4..26dd07ea6 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 441fee32e..f93009492 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index aaa215283..c4d2df8cf 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,21 +1,14 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 as alpine +FROM linuxkit/alpine:5d89cd05a567f9bfbe4502be1027a422d46f4a75 as alpine + RUN apk add tzdata binutils - -WORKDIR $GOPATH/src/github.com/containerd/containerd -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 - RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd -WORKDIR / -COPY . . +FROM linuxkit/containerd-dev:e6a8da1e270da1601ed1bb85bb44c4442e5d51be as containerd-dev FROM scratch ENTRYPOINT [] WORKDIR / -COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/ -COPY --from=alpine /etc/containerd/config.toml /etc/containerd/ +COPY --from=containerd-dev /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/ COPY --from=alpine /usr/share/zoneinfo/UTC /etc/localtime COPY --from=alpine /etc/init.d/ /etc/init.d/ COPY etc etc/ diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 3c9e12c47..b5cf931a9 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,5 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/containerd-dev:e6a8da1e270da1601ed1bb85bb44c4442e5d51be AS containerd-dev +FROM linuxkit/alpine:5d89cd05a567f9bfbe4502be1027a422d46f4a75 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -15,6 +16,7 @@ RUN go-compile.sh /go/src/cmd/rc.init # this makes sure that the multi stage build copies as a symlink RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.shutdown +COPY --from=containerd-dev /go/src/github.com/containerd/containerd $GOPATH/src/github.com/containerd/containerd RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index f7e909eb2..ae593abaa 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 9c58b3968..fc8a9f9a9 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 9166e8dab..10010384b 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index d532de596..d234bee21 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index ec2ba072d..27b7219f7 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index c3d88b653..c9d7940d6 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da onboot: - name: dhcpcd image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 56251a66b..f09d7d7a7 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 3bfe2474d..065f33b7d 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.92 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da onboot: - name: sysctl image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index ac92d52ba..b20891005 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 146b7e990..d1250c291 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/src/cmd/linuxkit/moby/mkimage.yaml b/src/cmd/linuxkit/moby/mkimage.yaml index 651e10cf4..def2a7118 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: mkimage diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index bd60f8ec2..1924e8a60 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: dhcpcd diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index e1481952c..9f9b5a6eb 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da onboot: - name: dhcpcd diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index 1af8c06b4..4362dfe5a 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 987804cf2..d9f0493ff 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 987804cf2..d9f0493ff 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 7b36bf277..fb27005ca 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 cfbf66ea0..1d3617bb9 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 cfbf66ea0..1d3617bb9 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 cfbf66ea0..1d3617bb9 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 cfbf66ea0..1d3617bb9 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 9f7da033e..c34cdb1fe 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 cfbf66ea0..1d3617bb9 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 cfbf66ea0..1d3617bb9 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 c37a3e322..276fb0f89 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da services: - name: acpid image: linuxkit/acpid:c05a368754f6436b326945dc16135ba547568d8d 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 cfbf66ea0..1d3617bb9 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 030adab16..e65cd5a77 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 5e919d7f8..aebb0e9cd 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 2eec7d7dc..753b29b5b 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.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 fb277a1cc..c2f378542 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:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 c55a7fb15..53f128971 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 19bcd695f..4ad4e3643 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.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: check diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index d28fa928f..b95b4eaa0 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 83894279a..00c3953b6 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.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 74e87926a..650c5185c 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.92 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: test diff --git a/test/cases/040_packages/002_bcc/test.yml b/test/cases/040_packages/002_bcc/test.yml index 4c3496c48..c429b2e23 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - 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 10ba1eb55..6242efe56 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: binfmt diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 6b67211a8..c00c58dfc 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - linuxkit/bpftrace:a5c57a3791a87e96aea456f78fd88973ea9904d0 onboot: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 124ebbc63..5cb7eaa26 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: diff --git a/test/cases/040_packages/003_cgroupv2/test.yml b/test/cases/040_packages/003_cgroupv2/test.yml index dce124671..318e68162 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.92 cmdline: "linuxkit.unified_cgroup_hierarchy=1 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 1dc8e5a20..11dd3e38b 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index d8abb40e1..88e37fe25 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 d79159921..881b0a118 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 e7bee4ac3..3e4091e4e 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 ba8802ddb..328f82ff0 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 43e7a4247..71d56c912 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 2fc1f17d5..7b409bd0b 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 143fe0f7b..d597e3161 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 e37b14f4a..b65ff9a9e 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 d4bbfbfa4..1532f9ab5 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 19b3ab502..62164b3a5 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 adcb7b185..36d37396e 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 2fc1f17d5..7b409bd0b 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 9d9300344..aa9103fce 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 8f6992a54..4889c120b 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 60815fee7..315a8578e 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 bc601e4d5..7ca36d83a 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 e3eec53cf..33d4058c2 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 c5feca5f0..bf5dbab92 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 c874593ab..0cc16a45b 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 9922960ae..1e5aa64ba 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 44748b624..a083a2182 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 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 0e488fb78..03c487eca 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 services: - name: test diff --git a/test/cases/040_packages/011_kmsg/test.yml b/test/cases/040_packages/011_kmsg/test.yml index 36f2f7dd0..faec73d69 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - linuxkit/memlogd:014f86dce2ea4bb2ec13e92ae5c1e854bcefec40 services: diff --git a/test/cases/040_packages/012_logwrite/test.yml b/test/cases/040_packages/012_logwrite/test.yml index cade6082a..a38baa630 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 - linuxkit/memlogd:014f86dce2ea4bb2ec13e92ae5c1e854bcefec40 services: diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 86b50ab0f..b5898929b 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 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 4b24dce3d..5bc925d93 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: metadata diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index b5ad16ac2..ab5e676a8 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 46286f593..bc0e0df25 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 347e238b9..e576faab8 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 3b7894698..a1b9e45ca 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4 onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 8b6f4368d..cdf009f3f 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index 0a72530e3..95b68338c 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 - - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e + - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da onboot: - name: dhcpcd image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 50d8e9b34..e98bb6401 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,3 +1,4 @@ +FROM linuxkit/containerd-dev:e6a8da1e270da1601ed1bb85bb44c4442e5d51be as containerd-dev FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) @@ -23,7 +24,7 @@ RUN cp /out/usr/share/zoneinfo/UTC /out/etc/localtime FROM scratch COPY --from=mirror /out/ / -COPY --from=mirror /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd/ +COPY --from=containerd-dev /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd/ # containerd 1.4.x does not support go modules; remove GO111MODULE=off when we switch to 1.5.x ENV GOPATH=/go GO111MODULE=off diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 9b9e9a06d..8ceb2740f 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:5.10.92 cmdline: "console=ttyS0" init: - - linuxkit/init:cc3132885af876a247bc99199b4cc788f3173896 + - linuxkit/init:8f1e6a0747acbbb4d7e24dc98f97faa8d1c6cec7 - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 onboot: - name: test-ns diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index be9cf01c1..957619b9f 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -36,22 +36,6 @@ RUN go get -u golang.org/x/lint/golint RUN go get -u github.com/gordonklaus/ineffassign RUN go get -u github.com/LK4D4/vndr -# 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.4.11 -RUN mkdir -p $GOPATH/src/github.com/containerd && \ - cd $GOPATH/src/github.com/containerd && \ - git clone https://github.com/containerd/containerd.git && \ - cd $GOPATH/src/github.com/containerd/containerd && \ - git checkout $CONTAINERD_COMMIT -RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev -RUN cd $GOPATH/src/github.com/containerd/containerd && \ - GO111MODULE=off make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper" - # Checkout and compile iucode-tool for Intel CPU microcode # On non-x86_64 create a dummy file to copy below. ENV IUCODE_REPO=https://gitlab.com/iucode-tool/iucode-tool @@ -82,7 +66,6 @@ COPY --from=mirror /etc/apk/keys /etc/apk/keys/ COPY --from=mirror /mirror /mirror/ COPY --from=mirror /go/bin /go/bin/ COPY --from=mirror /Dockerfile /Dockerfile -COPY --from=mirror /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd/ COPY --from=mirror /iucode_tool /usr/bin/ RUN apk update && apk upgrade -a diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index bf8776c36..8546379b9 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:1efed58cf4b0d01dbca768b28c2869723e1cd569- +# linuxkit/alpine:6f9efe87b3c394196949985f0ed6b5263432670a-arm64 # automatically generated list of installed packages abuild-3.8.0_rc4-r0 alpine-baselayout-3.2.0-r16 @@ -19,7 +19,7 @@ binutils-2.35.2-r2 binutils-dev-2.35.2-r2 binutils-gold-2.35.2-r2 bison-3.7.6-r0 -blkid-2.37-r0 +blkid-2.37.4-r0 bridge-utils-1.7.1-r0 brotli-libs-1.0.9-r5 bsd-compat-headers-0.7.2-r3 @@ -27,13 +27,13 @@ btrfs-progs-5.12.1-r0 btrfs-progs-dev-5.12.1-r0 btrfs-progs-libs-5.12.1-r0 build-base-0.5-r2 -busybox-1.33.1-r3 +busybox-1.33.1-r6 busybox-initscripts-3.3-r1 bzip2-1.0.8-r1 -ca-certificates-20191127-r5 -ca-certificates-bundle-20191127-r5 +ca-certificates-20211220-r0 +ca-certificates-bundle-20211220-r0 cdrkit-1.1.11-r3 -cfdisk-2.37-r0 +cfdisk-2.37.4-r0 cifs-utils-6.13-r0 clang-11.1.0-r1 clang-dev-11.1.0-r1 @@ -42,9 +42,9 @@ clang-libs-11.1.0-r1 clang-static-11.1.0-r1 cmake-3.20.3-r0 coreutils-8.32-r2 -cryptsetup-2.3.6-r0 -cryptsetup-libs-2.3.6-r0 -cryptsetup-openrc-2.3.6-r0 +cryptsetup-2.3.7-r0 +cryptsetup-libs-2.3.7-r0 +cryptsetup-openrc-2.3.7-r0 curl-7.79.1-r0 dbus-libs-1.12.20-r2 device-mapper-2.02.187-r1 @@ -65,16 +65,16 @@ ethtool-5.12-r0 eudev-3.2.10-r0 eudev-libs-3.2.10-r0 eudev-openrc-3.2.10-r0 -expat-2.4.1-r0 +expat-2.4.7-r0 expect-5.45.4-r0 fakeroot-1.25.3-r3 file-5.40-r1 -findmnt-2.37-r0 +findmnt-2.37.4-r0 findutils-4.8.0-r1 flex-2.6.4-r2 flex-dev-2.6.4-r2 flex-libs-2.6.4-r2 -flock-2.37-r0 +flock-2.37.4-r0 fortify-headers-1.1-r1 fts-1.2.7-r1 fts-dev-1.2.7-r1 @@ -90,15 +90,15 @@ gettext-libs-0.21-r0 git-2.32.0-r0 git-perl-2.32.0-r0 glib-2.68.3-r0 -gmp-6.2.1-r0 -gmp-dev-6.2.1-r0 +gmp-6.2.1-r1 +gmp-dev-6.2.1-r1 gnupg-2.2.31-r0 gnutls-3.7.1-r0 go-1.16.10-r0 grep-3.7-r0 guile-3.0.6-r0 guile-libs-3.0.6-r0 -hexdump-2.37-r0 +hexdump-2.37.4-r0 hvtools-4.11.9-r1 ifupdown-ng-0.11.3-r0 ifupdown-ng-ethtool-0.11.3-r0 @@ -132,12 +132,12 @@ krb5-libs-1.18.4-r0 krb5-server-ldap-1.18.4-r0 libacl-2.2.53-r0 libaio-0.3.112-r1 -libarchive-3.5.1-r0 -libarchive-tools-3.5.1-r0 +libarchive-3.5.2-r0 +libarchive-tools-3.5.2-r0 libassuan-2.5.5-r0 libatomic-10.3.1_git20210424-r2 libattr-2.5.1-r0 -libblkid-2.37-r0 +libblkid-2.37.4-r0 libbsd-0.11.3-r0 libburn-1.5.4-r0 libbz2-1.0.8-r1 @@ -148,7 +148,7 @@ libcap-2.50-r0 libcap-ng-0.8.2-r0 libcap-ng-dev-0.8.2-r0 libcom_err-1.46.2-r0 -libcrypto1.1-1.1.1l-r0 +libcrypto1.1-1.1.1n-r0 libcurl-7.79.1-r0 libdrm-2.4.106-r0 libeconf-0.3.8-r1 @@ -158,12 +158,12 @@ libelf-0.182-r1 libelf-static-0.182-r1 libepoxy-1.5.8-r0 libevent-2.1.12-r2 -libfdisk-2.37-r0 +libfdisk-2.37.4-r0 libfdt-1.6.1-r0 libffi-3.3-r2 libgcc-10.3.1_git20210424-r2 libgcrypt-1.9.4-r0 -libgmpxx-6.2.1-r0 +libgmpxx-6.2.1-r1 libgomp-10.3.1_git20210424-r2 libgpg-error-1.42-r0 libgphobos-10.3.1_git20210424-r2 @@ -177,24 +177,24 @@ libltdl-2.4.6-r7 libmagic-5.40-r1 libmd-1.0.3-r0 libmnl-1.0.4-r1 -libmount-2.37-r0 +libmount-2.37.4-r0 libnfsidmap-2.5.3-r0 libnftnl-libs-1.2.0-r0 libnl3-3.5.0-r0 libpcap-1.10.0-r0 libpng-1.6.37-r1 -libressl-dev-3.3.3-r0 -libressl3.3-libcrypto-3.3.3-r0 -libressl3.3-libssl-3.3.3-r0 -libressl3.3-libtls-3.3.3-r0 +libressl-dev-3.3.6-r0 +libressl3.3-libcrypto-3.3.6-r0 +libressl3.3-libssl-3.3.6-r0 +libressl3.3-libtls-3.3.6-r0 libretls-3.3.3p1-r2 libsasl-2.1.27-r12 libseccomp-2.5.1-r2 libseccomp-dev-2.5.1-r2 libseccomp-static-2.5.1-r2 libsecret-0.20.4-r1 -libsmartcols-2.37-r0 -libssl1.1-1.1.1l-r0 +libsmartcols-2.37.4-r0 +libssl1.1-1.1.1n-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtirpc-1.3.2-r0 @@ -208,23 +208,23 @@ libunistring-0.9.10-r1 libunwind-1.5.0-r1 libunwind-dev-1.5.0-r1 libusb-1.0.24-r2 -libuuid-2.37-r0 +libuuid-2.37.4-r0 libuv-1.41.0-r0 libverto-0.3.2-r0 -libwbclient-4.14.8-r0 +libwbclient-4.14.12-r0 libx11-1.7.2-r0 libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxkbcommon-1.2.1-r0 -libxml2-2.9.12-r1 +libxml2-2.9.13-r0 linux-headers-5.10.41-r0 llvm11-11.1.0-r2 llvm11-dev-11.1.0-r2 llvm11-libs-11.1.0-r2 llvm11-static-11.1.0-r2 -logger-2.37-r0 -lsblk-2.37-r0 +logger-2.37.4-r0 +lsblk-2.37.4-r0 lsscsi-0.32-r0 lua5.3-libs-5.3.6-r0 luajit-2.1_p20210510-r0 @@ -232,12 +232,12 @@ luajit-dev-2.1_p20210510-r0 lvm2-2.02.187-r1 lvm2-libs-2.02.187-r1 lvm2-openrc-2.02.187-r1 -lz4-libs-1.9.3-r0 +lz4-libs-1.9.3-r1 lzip-1.22-r0 lzo-2.10-r2 m4-1.4.18-r2 make-4.3-r0 -mcookie-2.37-r0 +mcookie-2.37.4-r0 mesa-21.1.2-r0 mesa-gbm-21.1.2-r0 mpc1-1.2.1-r0 @@ -274,10 +274,10 @@ openssh-client-default-8.6_p1-r3 openssh-keygen-8.6_p1-r3 openssh-server-8.6_p1-r3 openssh-server-common-8.6_p1-r3 -openssl-1.1.1l-r0 -openssl-dev-1.1.1l-r0 +openssl-1.1.1n-r0 +openssl-dev-1.1.1n-r0 p11-kit-0.23.22-r0 -partx-2.37-r0 +partx-2.37.4-r0 patch-2.7.6-r7 pcre-8.44-r0 pcre2-10.36-r0 @@ -291,7 +291,7 @@ pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 python2-2.7.18-r2 -python3-3.9.5-r1 +python3-3.9.5-r2 qemu-6.0.0-r5 qemu-aarch64-6.0.0-r5 qemu-arm-6.0.0-r5 @@ -308,11 +308,11 @@ rpcbind-openrc-1.2.6-r0 rsync-3.2.3-r4 rsync-openrc-3.2.3-r4 s6-ipcserver-2.10.0.3-r0 -samba-util-libs-4.14.8-r0 +samba-util-libs-4.14.12-r0 scanelf-1.3.2-r0 sed-4.8-r0 -setpriv-2.37-r0 -sfdisk-2.37-r0 +setpriv-2.37.4-r0 +sfdisk-2.37.4-r0 sg3_utils-1.45-r0 sgdisk-1.0.8-r0 skalibs-2.10.0.3-r0 @@ -323,8 +323,8 @@ sntpc-0.9-r7 sntpc-openrc-0.9-r7 socat-1.7.4.1-r1 sqlite-libs-3.35.5-r0 -squashfs-tools-4.5-r0 -ssl_client-1.33.1-r3 +squashfs-tools-4.5-r1 +ssl_client-1.33.1-r6 strace-5.12-r0 swig-4.0.2-r2 talloc-2.3.2-r1 @@ -333,18 +333,18 @@ tcl-8.6.10-r1 tcpdump-4.99.0-r0 tevent-0.10.2-r1 tini-0.19.0-r0 -tzdata-2021e-r0 +tzdata-2022a-r0 udev-init-scripts-34-r0 udev-init-scripts-openrc-34-r0 userspace-rcu-0.12.2-r0 -util-linux-2.37-r0 -util-linux-dev-2.37-r0 -util-linux-openrc-2.37-r0 +util-linux-2.37.4-r0 +util-linux-dev-2.37.4-r0 +util-linux-openrc-2.37.4-r0 utmps-0.1.0.2-r0 utmps-openrc-0.1.0.2-r0 -uuidgen-2.37-r0 +uuidgen-2.37.4-r0 vde2-libs-2.3.2-r13 -vim-8.2.3437-r0 +vim-8.2.4173-r0 virglrenderer-0.8.2-r1 wayland-libs-server-1.19.0-r0 wireguard-tools-1.0.20210424-r0 @@ -357,7 +357,7 @@ xfsprogs-5.12.0-r0 xfsprogs-extra-5.12.0-r0 xkeyboard-config-2.33-r0 xorriso-1.5.4-r0 -xxd-8.2.3437-r0 +xxd-8.2.4173-r0 xz-5.2.5-r0 xz-dev-5.2.5-r0 xz-libs-5.2.5-r0 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index f780a93ca..e3198d4a2 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:980844e7096d47d2c88f9f762b41ecf512dc4081-s390x +# linuxkit/alpine:b5e3e740974c2304f2eb8b71def4a91f18cf5a65-s390x # automatically generated list of installed packages abuild-3.8.0_rc4-r0 alpine-baselayout-3.2.0-r16 @@ -18,7 +18,7 @@ bc-1.07.1-r1 binutils-2.35.2-r2 binutils-dev-2.35.2-r2 bison-3.7.6-r0 -blkid-2.37-r0 +blkid-2.37.4-r0 bridge-utils-1.7.1-r0 brotli-libs-1.0.9-r5 bsd-compat-headers-0.7.2-r3 @@ -26,13 +26,13 @@ btrfs-progs-5.12.1-r0 btrfs-progs-dev-5.12.1-r0 btrfs-progs-libs-5.12.1-r0 build-base-0.5-r2 -busybox-1.33.1-r3 +busybox-1.33.1-r6 busybox-initscripts-3.3-r1 bzip2-1.0.8-r1 -ca-certificates-20191127-r5 -ca-certificates-bundle-20191127-r5 +ca-certificates-20211220-r0 +ca-certificates-bundle-20211220-r0 cdrkit-1.1.11-r3 -cfdisk-2.37-r0 +cfdisk-2.37.4-r0 cifs-utils-6.13-r0 clang-11.1.0-r1 clang-dev-11.1.0-r1 @@ -41,9 +41,9 @@ clang-libs-11.1.0-r1 clang-static-11.1.0-r1 cmake-3.20.3-r0 coreutils-8.32-r2 -cryptsetup-2.3.6-r0 -cryptsetup-libs-2.3.6-r0 -cryptsetup-openrc-2.3.6-r0 +cryptsetup-2.3.7-r0 +cryptsetup-libs-2.3.7-r0 +cryptsetup-openrc-2.3.7-r0 curl-7.79.1-r0 dbus-libs-1.12.20-r2 device-mapper-2.02.187-r1 @@ -64,16 +64,16 @@ ethtool-5.12-r0 eudev-3.2.10-r0 eudev-libs-3.2.10-r0 eudev-openrc-3.2.10-r0 -expat-2.4.1-r0 +expat-2.4.7-r0 expect-5.45.4-r0 fakeroot-1.25.3-r3 file-5.40-r1 -findmnt-2.37-r0 +findmnt-2.37.4-r0 findutils-4.8.0-r1 flex-2.6.4-r2 flex-dev-2.6.4-r2 flex-libs-2.6.4-r2 -flock-2.37-r0 +flock-2.37.4-r0 fortify-headers-1.1-r1 fts-1.2.7-r1 fts-dev-1.2.7-r1 @@ -89,15 +89,15 @@ gettext-libs-0.21-r0 git-2.32.0-r0 git-perl-2.32.0-r0 glib-2.68.3-r0 -gmp-6.2.1-r0 -gmp-dev-6.2.1-r0 +gmp-6.2.1-r1 +gmp-dev-6.2.1-r1 gnupg-2.2.31-r0 gnutls-3.7.1-r0 go-1.16.10-r0 grep-3.7-r0 guile-3.0.6-r0 guile-libs-3.0.6-r0 -hexdump-2.37-r0 +hexdump-2.37.4-r0 hvtools-4.11.9-r1 ifupdown-ng-0.11.3-r0 ifupdown-ng-ethtool-0.11.3-r0 @@ -131,12 +131,12 @@ krb5-libs-1.18.4-r0 krb5-server-ldap-1.18.4-r0 libacl-2.2.53-r0 libaio-0.3.112-r1 -libarchive-3.5.1-r0 -libarchive-tools-3.5.1-r0 +libarchive-3.5.2-r0 +libarchive-tools-3.5.2-r0 libassuan-2.5.5-r0 libatomic-10.3.1_git20210424-r2 libattr-2.5.1-r0 -libblkid-2.37-r0 +libblkid-2.37.4-r0 libbsd-0.11.3-r0 libburn-1.5.4-r0 libbz2-1.0.8-r1 @@ -147,7 +147,7 @@ libcap-2.50-r0 libcap-ng-0.8.2-r0 libcap-ng-dev-0.8.2-r0 libcom_err-1.46.2-r0 -libcrypto1.1-1.1.1l-r0 +libcrypto1.1-1.1.1n-r0 libcurl-7.79.1-r0 libdrm-2.4.106-r0 libeconf-0.3.8-r1 @@ -157,12 +157,12 @@ libelf-0.182-r1 libelf-static-0.182-r1 libepoxy-1.5.8-r0 libevent-2.1.12-r2 -libfdisk-2.37-r0 +libfdisk-2.37.4-r0 libfdt-1.6.1-r0 libffi-3.3-r2 libgcc-10.3.1_git20210424-r2 libgcrypt-1.9.4-r0 -libgmpxx-6.2.1-r0 +libgmpxx-6.2.1-r1 libgomp-10.3.1_git20210424-r2 libgpg-error-1.42-r0 libgphobos-10.3.1_git20210424-r2 @@ -176,24 +176,24 @@ libltdl-2.4.6-r7 libmagic-5.40-r1 libmd-1.0.3-r0 libmnl-1.0.4-r1 -libmount-2.37-r0 +libmount-2.37.4-r0 libnfsidmap-2.5.3-r0 libnftnl-libs-1.2.0-r0 libnl3-3.5.0-r0 libpcap-1.10.0-r0 libpng-1.6.37-r1 -libressl-dev-3.3.3-r0 -libressl3.3-libcrypto-3.3.3-r0 -libressl3.3-libssl-3.3.3-r0 -libressl3.3-libtls-3.3.3-r0 +libressl-dev-3.3.6-r0 +libressl3.3-libcrypto-3.3.6-r0 +libressl3.3-libssl-3.3.6-r0 +libressl3.3-libtls-3.3.6-r0 libretls-3.3.3p1-r2 libsasl-2.1.27-r12 libseccomp-2.5.1-r2 libseccomp-dev-2.5.1-r2 libseccomp-static-2.5.1-r2 libsecret-0.20.4-r1 -libsmartcols-2.37-r0 -libssl1.1-1.1.1l-r0 +libsmartcols-2.37.4-r0 +libssl1.1-1.1.1n-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtirpc-1.3.2-r0 @@ -204,34 +204,34 @@ libtool-2.4.6-r7 libucontext-1.1-r0 libunistring-0.9.10-r1 libusb-1.0.24-r2 -libuuid-2.37-r0 +libuuid-2.37.4-r0 libuv-1.41.0-r0 libverto-0.3.2-r0 -libwbclient-4.14.8-r0 +libwbclient-4.14.12-r0 libx11-1.7.2-r0 libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxkbcommon-1.2.1-r0 -libxml2-2.9.12-r1 +libxml2-2.9.13-r0 linux-headers-5.10.41-r0 llvm11-11.1.0-r2 llvm11-dev-11.1.0-r2 llvm11-libs-11.1.0-r2 llvm11-static-11.1.0-r2 -logger-2.37-r0 -lsblk-2.37-r0 +logger-2.37.4-r0 +lsblk-2.37.4-r0 lsscsi-0.32-r0 lua5.3-libs-5.3.6-r0 lvm2-2.02.187-r1 lvm2-libs-2.02.187-r1 lvm2-openrc-2.02.187-r1 -lz4-libs-1.9.3-r0 +lz4-libs-1.9.3-r1 lzip-1.22-r0 lzo-2.10-r2 m4-1.4.18-r2 make-4.3-r0 -mcookie-2.37-r0 +mcookie-2.37.4-r0 mesa-21.1.2-r0 mesa-gbm-21.1.2-r0 mpc1-1.2.1-r0 @@ -268,10 +268,10 @@ openssh-client-default-8.6_p1-r3 openssh-keygen-8.6_p1-r3 openssh-server-8.6_p1-r3 openssh-server-common-8.6_p1-r3 -openssl-1.1.1l-r0 -openssl-dev-1.1.1l-r0 +openssl-1.1.1n-r0 +openssl-dev-1.1.1n-r0 p11-kit-0.23.22-r0 -partx-2.37-r0 +partx-2.37.4-r0 patch-2.7.6-r7 pcre-8.44-r0 pcre2-10.36-r0 @@ -285,7 +285,7 @@ pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 python2-2.7.18-r2 -python3-3.9.5-r1 +python3-3.9.5-r2 qemu-6.0.0-r5 qemu-aarch64-6.0.0-r5 qemu-arm-6.0.0-r5 @@ -302,11 +302,11 @@ rpcbind-openrc-1.2.6-r0 rsync-3.2.3-r4 rsync-openrc-3.2.3-r4 s6-ipcserver-2.10.0.3-r0 -samba-util-libs-4.14.8-r0 +samba-util-libs-4.14.12-r0 scanelf-1.3.2-r0 sed-4.8-r0 -setpriv-2.37-r0 -sfdisk-2.37-r0 +setpriv-2.37.4-r0 +sfdisk-2.37.4-r0 sg3_utils-1.45-r0 sgdisk-1.0.8-r0 skalibs-2.10.0.3-r0 @@ -317,8 +317,8 @@ sntpc-0.9-r7 sntpc-openrc-0.9-r7 socat-1.7.4.1-r1 sqlite-libs-3.35.5-r0 -squashfs-tools-4.5-r0 -ssl_client-1.33.1-r3 +squashfs-tools-4.5-r1 +ssl_client-1.33.1-r6 swig-4.0.2-r2 talloc-2.3.2-r1 tar-1.34-r0 @@ -326,18 +326,18 @@ tcl-8.6.10-r1 tcpdump-4.99.0-r0 tevent-0.10.2-r1 tini-0.19.0-r0 -tzdata-2021e-r0 +tzdata-2022a-r0 udev-init-scripts-34-r0 udev-init-scripts-openrc-34-r0 userspace-rcu-0.12.2-r0 -util-linux-2.37-r0 -util-linux-dev-2.37-r0 -util-linux-openrc-2.37-r0 +util-linux-2.37.4-r0 +util-linux-dev-2.37.4-r0 +util-linux-openrc-2.37.4-r0 utmps-0.1.0.2-r0 utmps-openrc-0.1.0.2-r0 -uuidgen-2.37-r0 +uuidgen-2.37.4-r0 vde2-libs-2.3.2-r13 -vim-8.2.3437-r0 +vim-8.2.4173-r0 virglrenderer-0.8.2-r1 wayland-libs-server-1.19.0-r0 wireguard-tools-1.0.20210424-r0 @@ -350,7 +350,7 @@ xfsprogs-5.12.0-r0 xfsprogs-extra-5.12.0-r0 xkeyboard-config-2.33-r0 xorriso-1.5.4-r0 -xxd-8.2.3437-r0 +xxd-8.2.4173-r0 xz-5.2.5-r0 xz-dev-5.2.5-r0 xz-libs-5.2.5-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 8f09c8aa6..b20f1163c 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:d16ba10bd0430d48b57566754325215e5dd10865-amd64 +# linuxkit/alpine:c9b0f6a435b663b98952d67f4c6f105c310d0a21-amd64 # automatically generated list of installed packages abuild-3.8.0_rc4-r0 alpine-baselayout-3.2.0-r16 @@ -18,7 +18,7 @@ bc-1.07.1-r1 binutils-2.35.2-r2 binutils-dev-2.35.2-r2 bison-3.7.6-r0 -blkid-2.37-r0 +blkid-2.37.4-r0 bridge-utils-1.7.1-r0 brotli-libs-1.0.9-r5 bsd-compat-headers-0.7.2-r3 @@ -26,13 +26,13 @@ btrfs-progs-5.12.1-r0 btrfs-progs-dev-5.12.1-r0 btrfs-progs-libs-5.12.1-r0 build-base-0.5-r2 -busybox-1.33.1-r3 +busybox-1.33.1-r6 busybox-initscripts-3.3-r1 bzip2-1.0.8-r1 -ca-certificates-20191127-r5 -ca-certificates-bundle-20191127-r5 +ca-certificates-20211220-r0 +ca-certificates-bundle-20211220-r0 cdrkit-1.1.11-r3 -cfdisk-2.37-r0 +cfdisk-2.37.4-r0 cifs-utils-6.13-r0 clang-11.1.0-r1 clang-dev-11.1.0-r1 @@ -41,9 +41,9 @@ clang-libs-11.1.0-r1 clang-static-11.1.0-r1 cmake-3.20.3-r0 coreutils-8.32-r2 -cryptsetup-2.3.6-r0 -cryptsetup-libs-2.3.6-r0 -cryptsetup-openrc-2.3.6-r0 +cryptsetup-2.3.7-r0 +cryptsetup-libs-2.3.7-r0 +cryptsetup-openrc-2.3.7-r0 curl-7.79.1-r0 dbus-libs-1.12.20-r2 device-mapper-2.02.187-r1 @@ -64,16 +64,16 @@ ethtool-5.12-r0 eudev-3.2.10-r0 eudev-libs-3.2.10-r0 eudev-openrc-3.2.10-r0 -expat-2.4.1-r0 +expat-2.4.7-r0 expect-5.45.4-r0 fakeroot-1.25.3-r3 file-5.40-r1 -findmnt-2.37-r0 +findmnt-2.37.4-r0 findutils-4.8.0-r1 flex-2.6.4-r2 flex-dev-2.6.4-r2 flex-libs-2.6.4-r2 -flock-2.37-r0 +flock-2.37.4-r0 fortify-headers-1.1-r1 fts-1.2.7-r1 fts-dev-1.2.7-r1 @@ -89,15 +89,15 @@ gettext-libs-0.21-r0 git-2.32.0-r0 git-perl-2.32.0-r0 glib-2.68.3-r0 -gmp-6.2.1-r0 -gmp-dev-6.2.1-r0 +gmp-6.2.1-r1 +gmp-dev-6.2.1-r1 gnupg-2.2.31-r0 gnutls-3.7.1-r0 go-1.16.10-r0 grep-3.7-r0 guile-3.0.6-r0 guile-libs-3.0.6-r0 -hexdump-2.37-r0 +hexdump-2.37.4-r0 hvtools-4.11.9-r1 ifupdown-ng-0.11.3-r0 ifupdown-ng-ethtool-0.11.3-r0 @@ -132,12 +132,12 @@ krb5-server-ldap-1.18.4-r0 lddtree-1.26-r2 libacl-2.2.53-r0 libaio-0.3.112-r1 -libarchive-3.5.1-r0 -libarchive-tools-3.5.1-r0 +libarchive-3.5.2-r0 +libarchive-tools-3.5.2-r0 libassuan-2.5.5-r0 libatomic-10.3.1_git20210424-r2 libattr-2.5.1-r0 -libblkid-2.37-r0 +libblkid-2.37.4-r0 libbsd-0.11.3-r0 libburn-1.5.4-r0 libbz2-1.0.8-r1 @@ -148,7 +148,7 @@ libcap-2.50-r0 libcap-ng-0.8.2-r0 libcap-ng-dev-0.8.2-r0 libcom_err-1.46.2-r0 -libcrypto1.1-1.1.1l-r0 +libcrypto1.1-1.1.1n-r0 libcurl-7.79.1-r0 libdrm-2.4.106-r0 libeconf-0.3.8-r1 @@ -158,12 +158,12 @@ libelf-0.182-r1 libelf-static-0.182-r1 libepoxy-1.5.8-r0 libevent-2.1.12-r2 -libfdisk-2.37-r0 +libfdisk-2.37.4-r0 libfdt-1.6.1-r0 libffi-3.3-r2 libgcc-10.3.1_git20210424-r2 libgcrypt-1.9.4-r0 -libgmpxx-6.2.1-r0 +libgmpxx-6.2.1-r1 libgomp-10.3.1_git20210424-r2 libgpg-error-1.42-r0 libgphobos-10.3.1_git20210424-r2 @@ -177,7 +177,7 @@ libltdl-2.4.6-r7 libmagic-5.40-r1 libmd-1.0.3-r0 libmnl-1.0.4-r1 -libmount-2.37-r0 +libmount-2.37.4-r0 libmspack-0.10.1_alpha-r0 libnfsidmap-2.5.3-r0 libnftnl-libs-1.2.0-r0 @@ -185,18 +185,18 @@ libnl3-3.5.0-r0 libpcap-1.10.0-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 -libressl-dev-3.3.3-r0 -libressl3.3-libcrypto-3.3.3-r0 -libressl3.3-libssl-3.3.3-r0 -libressl3.3-libtls-3.3.3-r0 +libressl-dev-3.3.6-r0 +libressl3.3-libcrypto-3.3.6-r0 +libressl3.3-libssl-3.3.6-r0 +libressl3.3-libtls-3.3.6-r0 libretls-3.3.3p1-r2 libsasl-2.1.27-r12 libseccomp-2.5.1-r2 libseccomp-dev-2.5.1-r2 libseccomp-static-2.5.1-r2 libsecret-0.20.4-r1 -libsmartcols-2.37-r0 -libssl1.1-1.1.1l-r0 +libsmartcols-2.37.4-r0 +libssl1.1-1.1.1n-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtirpc-1.3.2-r0 @@ -210,23 +210,23 @@ libunistring-0.9.10-r1 libunwind-1.5.0-r1 libunwind-dev-1.5.0-r1 libusb-1.0.24-r2 -libuuid-2.37-r0 +libuuid-2.37.4-r0 libuv-1.41.0-r0 libverto-0.3.2-r0 -libwbclient-4.14.8-r0 +libwbclient-4.14.12-r0 libx11-1.7.2-r0 libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxkbcommon-1.2.1-r0 -libxml2-2.9.12-r1 +libxml2-2.9.13-r0 linux-headers-5.10.41-r0 llvm11-11.1.0-r2 llvm11-dev-11.1.0-r2 llvm11-libs-11.1.0-r2 llvm11-static-11.1.0-r2 -logger-2.37-r0 -lsblk-2.37-r0 +logger-2.37.4-r0 +lsblk-2.37.4-r0 lsscsi-0.32-r0 lua5.3-libs-5.3.6-r0 luajit-2.1_p20210510-r0 @@ -234,12 +234,12 @@ luajit-dev-2.1_p20210510-r0 lvm2-2.02.187-r1 lvm2-libs-2.02.187-r1 lvm2-openrc-2.02.187-r1 -lz4-libs-1.9.3-r0 +lz4-libs-1.9.3-r1 lzip-1.22-r0 lzo-2.10-r2 m4-1.4.18-r2 make-4.3-r0 -mcookie-2.37-r0 +mcookie-2.37.4-r0 mesa-21.1.2-r0 mesa-gbm-21.1.2-r0 mkinitfs-3.5.0-r0 @@ -283,11 +283,11 @@ openssh-client-default-8.6_p1-r3 openssh-keygen-8.6_p1-r3 openssh-server-8.6_p1-r3 openssh-server-common-8.6_p1-r3 -openssl-1.1.1l-r0 -openssl-dev-1.1.1l-r0 +openssl-1.1.1n-r0 +openssl-dev-1.1.1n-r0 ovmf-0.0.202011-r1 p11-kit-0.23.22-r0 -partx-2.37-r0 +partx-2.37.4-r0 patch-2.7.6-r7 pcre-8.44-r0 pcre2-10.36-r0 @@ -301,7 +301,7 @@ pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 python2-2.7.18-r2 -python3-3.9.5-r1 +python3-3.9.5-r2 qemu-6.0.0-r5 qemu-aarch64-6.0.0-r5 qemu-arm-6.0.0-r5 @@ -317,11 +317,11 @@ rpcbind-openrc-1.2.6-r0 rsync-3.2.3-r4 rsync-openrc-3.2.3-r4 s6-ipcserver-2.10.0.3-r0 -samba-util-libs-4.14.8-r0 +samba-util-libs-4.14.12-r0 scanelf-1.3.2-r0 sed-4.8-r0 -setpriv-2.37-r0 -sfdisk-2.37-r0 +setpriv-2.37.4-r0 +sfdisk-2.37.4-r0 sg3_utils-1.45-r0 sgdisk-1.0.8-r0 skalibs-2.10.0.3-r0 @@ -332,8 +332,8 @@ sntpc-0.9-r7 sntpc-openrc-0.9-r7 socat-1.7.4.1-r1 sqlite-libs-3.35.5-r0 -squashfs-tools-4.5-r0 -ssl_client-1.33.1-r3 +squashfs-tools-4.5-r1 +ssl_client-1.33.1-r6 strace-5.12-r0 swig-4.0.2-r2 syslinux-6.04_pre1-r9 @@ -343,18 +343,18 @@ tcl-8.6.10-r1 tcpdump-4.99.0-r0 tevent-0.10.2-r1 tini-0.19.0-r0 -tzdata-2021e-r0 +tzdata-2022a-r0 udev-init-scripts-34-r0 udev-init-scripts-openrc-34-r0 userspace-rcu-0.12.2-r0 -util-linux-2.37-r0 -util-linux-dev-2.37-r0 -util-linux-openrc-2.37-r0 +util-linux-2.37.4-r0 +util-linux-dev-2.37.4-r0 +util-linux-openrc-2.37.4-r0 utmps-0.1.0.2-r0 utmps-openrc-0.1.0.2-r0 -uuidgen-2.37-r0 +uuidgen-2.37.4-r0 vde2-libs-2.3.2-r13 -vim-8.2.3437-r0 +vim-8.2.4173-r0 virglrenderer-0.8.2-r1 wayland-libs-server-1.19.0-r0 wireguard-tools-1.0.20210424-r0 @@ -367,7 +367,7 @@ xfsprogs-5.12.0-r0 xfsprogs-extra-5.12.0-r0 xkeyboard-config-2.33-r0 xorriso-1.5.4-r0 -xxd-8.2.3437-r0 +xxd-8.2.4173-r0 xz-5.2.5-r0 xz-dev-5.2.5-r0 xz-libs-5.2.5-r0 diff --git a/tools/containerd-dev/Dockerfile b/tools/containerd-dev/Dockerfile new file mode 100644 index 000000000..d347aed37 --- /dev/null +++ b/tools/containerd-dev/Dockerfile @@ -0,0 +1,29 @@ +FROM linuxkit/alpine:5d89cd05a567f9bfbe4502be1027a422d46f4a75 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 GOPATH=/go +RUN apk add go git +RUN mkdir -p $GOPATH/src/github.com/containerd && \ + cd $GOPATH/src/github.com/containerd && \ + git clone https://github.com/containerd/containerd.git && \ + cd $GOPATH/src/github.com/containerd/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 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 + +FROM scratch +ENTRYPOINT [] +WORKDIR / +COPY --from=builder /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/ +COPY --from=builder /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd diff --git a/tools/containerd-dev/build.yml b/tools/containerd-dev/build.yml new file mode 100644 index 000000000..e6b676b93 --- /dev/null +++ b/tools/containerd-dev/build.yml @@ -0,0 +1,2 @@ +image: containerd-dev +network: true