diff --git a/examples/aws.yml b/examples/aws.yml index 1dc60add2..eb9a0d78b 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index 3c52a00eb..f7a42406f 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 0b5eed75c..894012610 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index f7d69b430..eab6f3713 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.159 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index c58ef8248..8b78607a1 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.159 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 0f97985a4..16ff2698e 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:v0.7 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: # support metadata for optional config in /run/config diff --git a/examples/docker.yml b/examples/docker.yml index d1f3b9909..06fb48949 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index de3415cc7..5c6b9e05c 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 8d95973da..63fb41a6d 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/hetzner.yml b/examples/hetzner.yml index acb7e5c11..e9df55487 100644 --- a/examples/hetzner.yml +++ b/examples/hetzner.yml @@ -3,9 +3,9 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 - linuxkit/firmware:e246ab4c77bc4e70b53db091371a699fced5e01d onboot: diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index ed85417a8..3f456606a 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 5392bceed..afb3747b1 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: dhcpcd diff --git a/examples/logging.yml b/examples/logging.yml index 53fb82d89..a760502f5 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 - linuxkit/memlogd:v0.7 onboot: diff --git a/examples/minimal.yml b/examples/minimal.yml index 2f1664b64..41dbf949a 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.7 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 576710b34..a898dbf6b 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 services: - name: getty image: linuxkit/getty:v0.7 diff --git a/examples/openstack.yml b/examples/openstack.yml index a706b69fc..54e613a3c 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/packet.yml b/examples/packet.yml index e41467d01..c1dd0f877 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,9 +3,9 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 - linuxkit/firmware:e246ab4c77bc4e70b53db091371a699fced5e01d onboot: diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 699872469..55b83c595 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.7 diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index 875358743..a2d31754b 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.59-rt cmdline: "console=tty0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/scaleway.yml b/examples/scaleway.yml index c772c1cf5..be5d55a38 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/sshd.yml b/examples/sshd.yml index 2bb093b18..9d0a2145f 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/static-ip.yml b/examples/static-ip.yml index c1153e11b..6323c3cc2 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 onboot: - name: ip image: linuxkit/ip:7b1cf3150bf5d9a0df7ef07572e2d81fe3c0c3d3 diff --git a/examples/swap.yml b/examples/swap.yml index 9c9ddc1d5..2c02fba35 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index 7c1e4d3ca..8adb6280e 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index 6c6de3a20..490c293f6 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index c02204312..bab29965a 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.7 diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 1ac757f2c..e6852b6f7 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.7 diff --git a/examples/vultr.yml b/examples/vultr.yml index ebc996e6a..0542ba668 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 61453d942..6592ea154 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 1d992c37e..f52ffec09 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index a7cfc54c1..acc05c765 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,8 +1,8 @@ -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 as alpine +FROM linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd -RUN cp bin/containerd bin/ctr bin/containerd-shim /usr/bin/ +RUN cp bin/containerd bin/ctr bin/containerd-shim bin/containerd-shim-runc-v2 /usr/bin/ RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd @@ -12,7 +12,7 @@ COPY . . FROM scratch ENTRYPOINT [] WORKDIR / -COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/ +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=alpine /usr/share/zoneinfo/UTC /etc/localtime COPY --from=alpine /etc/init.d/ /etc/init.d/ diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 3e7a683ef..24e1efc43 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS build +FROM linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS mirror +FROM linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index 8db0d162c..cfffd8c92 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -11,7 +11,7 @@ RUN \ make \ && true ENV GOPATH=/go PATH=$PATH:/go/bin -ENV RUNC_COMMIT=425e105d5a03fabd737a126ad93d62a9eeede87f +ENV RUNC_COMMIT=d736ef14f0288d6993a1845745d6756cfc9ddd5a RUN mkdir -p $GOPATH/src/github.com/opencontainers && \ cd $GOPATH/src/github.com/opencontainers && \ git clone https://github.com/opencontainers/runc.git diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index c3724b13e..1ee500d51 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:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 768348ffb..7ef4b83e5 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index e8a96bb37..6c51de473 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 7cc66072d..777e39264 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:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index d6cf94fac..445e01f50 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:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 907a1601a..ef2cb85f3 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:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.7 diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index d3c4f15bc..2153ebcb8 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:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 9e99f38af..a0b7c51ef 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 onboot: - name: sysctl image: linuxkit/sysctl:v0.7 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index a8371b5e0..03a7601b5 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:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 6e2f7f355..452417b1f 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:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index c84a95042..91710af26 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -17,8 +17,8 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: mkimage image: linuxkit/mkimage:v0.7 diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index f8082bad1..04a35ea41 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.7 diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 51d9c0228..5edf16946 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:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 onboot: - name: dhcpcd 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 92fdb31ff..13de86bed 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 92fdb31ff..13de86bed 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 75f8a0305..635cfed87 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 fa463234e..15ebc3869 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 fa463234e..15ebc3869 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 fa463234e..15ebc3869 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 fa463234e..15ebc3869 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 a78304e04..4601362f9 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 fa463234e..15ebc3869 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 fa463234e..15ebc3869 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 01878fd80..bd04d9e99 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:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 services: - name: acpid image: linuxkit/acpid:v0.7 diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index 9cd5552a4..4cd648fc8 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.206 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:94fdeb494e09200fc05b6da39822aabfaca234e4 diff --git a/test/cases/020_kernel/002_config_4.14.x/test.yml b/test/cases/020_kernel/002_config_4.14.x/test.yml index b2795120a..2fc24389a 100644 --- a/test/cases/020_kernel/002_config_4.14.x/test.yml +++ b/test/cases/020_kernel/002_config_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.159 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:94fdeb494e09200fc05b6da39822aabfaca234e4 diff --git a/test/cases/020_kernel/005_config_4.19.x/test.yml b/test/cases/020_kernel/005_config_4.19.x/test.yml index 004340ee0..b80c94f76 100644 --- a/test/cases/020_kernel/005_config_4.19.x/test.yml +++ b/test/cases/020_kernel/005_config_4.19.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:94fdeb494e09200fc05b6da39822aabfaca234e4 diff --git a/test/cases/020_kernel/010_config_5.3.x/test.yml b/test/cases/020_kernel/010_config_5.3.x/test.yml index 134185667..95d47c58a 100644 --- a/test/cases/020_kernel/010_config_5.3.x/test.yml +++ b/test/cases/020_kernel/010_config_5.3.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.3.17 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:94fdeb494e09200fc05b6da39822aabfaca234e4 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 21c138cef..3bd8b1ed7 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,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.4 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:94fdeb494e09200fc05b6da39822aabfaca234e4 diff --git a/test/cases/020_kernel/101_kmod_4.9.x/test.yml b/test/cases/020_kernel/101_kmod_4.9.x/test.yml index 8a7ea80c3..ecdcdaf4d 100644 --- a/test/cases/020_kernel/101_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/101_kmod_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.206 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/102_kmod_4.14.x/test.yml b/test/cases/020_kernel/102_kmod_4.14.x/test.yml index 0d34fd6c0..70b4171c9 100644 --- a/test/cases/020_kernel/102_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/102_kmod_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.159 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/105_kmod_4.19.x/test.yml b/test/cases/020_kernel/105_kmod_4.19.x/test.yml index 496250716..96d56e46a 100644 --- a/test/cases/020_kernel/105_kmod_4.19.x/test.yml +++ b/test/cases/020_kernel/105_kmod_4.19.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/110_kmod_5.3.x/test.yml b/test/cases/020_kernel/110_kmod_5.3.x/test.yml index ef3d7d939..8fbb2a4e7 100644 --- a/test/cases/020_kernel/110_kmod_5.3.x/test.yml +++ b/test/cases/020_kernel/110_kmod_5.3.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.3.17 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check image: kmod-test 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 0781b8885..b4aa85b02 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.yml +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.4 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index f631a25e1..ffada0630 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 trust: org: - linuxkit diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index bb895f468..d3a0da44f 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:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index f40b7d62a..b23b7bcb4 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 158cd4718..76a82b9f4 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: binfmt image: linuxkit/binfmt:v0.7 diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index c03fb9f56..2ea358f7e 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - linuxkit/bpftrace:v0.7 onboot: - name: bpftrace-test diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index f2d383f94..ed4491293 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - linuxkit/ca-certificates:v0.7 onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.sh b/test/cases/040_packages/003_containerd/test.sh index c0b40dcec..a47be12dc 100644 --- a/test/cases/040_packages/003_containerd/test.sh +++ b/test/cases/040_packages/003_containerd/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build -format kernel+initrd -name "${NAME}" test.yml -RESULT="$(linuxkit run -mem 2048 -disk size=2G ${NAME})" +RESULT="$(linuxkit run -mem 3072 -disk size=2G ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 182e9d157..d83d6f5ea 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:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: dhcpcd @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:ac28577db835db4a87b6ba390ad15f3369c1585a + image: linuxkit/test-containerd:f70b41d120e4593a5e09bed1072268489f120535 - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 trust: diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 1827b5b0a..21f42f0ed 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.7 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 7e98c0572..8e36f8d04 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.159 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: dm-crypt image: linuxkit/dm-crypt:v0.7 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 e22275531..9199c36ac 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.159 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: dm-crypt image: linuxkit/dm-crypt:v0.7 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 79eacd6aa..d0e888604 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.159 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: dm-crypt image: linuxkit/dm-crypt:v0.7 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 0e796b6ce..a41522767 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: format image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 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 d12836db0..54d211b60 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: extend image: linuxkit/extend:79475e430851110b39d93dfb4a7e8ea041b57dc0 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 d4607944e..ad0ba0a5a 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: modprobe image: linuxkit/modprobe:v0.7 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 0bb3be1f9..b1251f2d2 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: modprobe image: linuxkit/modprobe:v0.7 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 1166b7943..acf38b516 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: format image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 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 3756c2ff9..29d01cdcb 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: extend image: linuxkit/extend:79475e430851110b39d93dfb4a7e8ea041b57dc0 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 b42a25b38..ec897bbef 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: format image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 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 1b61bf75a..3e292fc88 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: format image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 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 e9f9658eb..e98a32359 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: format image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 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 fca92a1ce..d4a29749c 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: modprobe image: linuxkit/modprobe:v0.7 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 de91ab0ea..70e02aba4 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: format image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 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 2d2ee13e4..2942d3413 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: format image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 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 8fc2e9308..8757ec794 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: format image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 1f36c84f0..6c23604f1 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:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 37cc9ae47..29a19018a 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.159 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: losetup image: linuxkit/losetup:v0.7 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 14e1dbd22..a7804f717 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: mkimage image: linuxkit/mkimage:v0.7 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 4701e02d9..9922912f9 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 03e7f39fd..b29a8451e 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: sysctl image: linuxkit/sysctl:v0.7 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index f774f758c..296629d34 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:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index 0dd086a39..5f09f0547 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 - linuxkit/memlogd:v0.7 services: diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 7286f67d7..68bc3fbc4 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - linuxkit/ca-certificates:v0.7 - linuxkit/memlogd:v0.7 services: diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index e8552a089..ceee13558 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - linuxkit/kernel-bcc:4.19.90 onboot: - name: check-bcc diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 3d683c90c..bb00c819c 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index 2cf374723..a494e0a0f 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - - linuxkit/containerd:751de142273e1b5d2d247d2832d654ab92e907bc + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.7 diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index ebe73a109..363cc0904 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS mirror +FROM linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) diff --git a/test/pkg/containerd/run.sh b/test/pkg/containerd/run.sh index a08e4bffa..adedb52a7 100755 --- a/test/pkg/containerd/run.sh +++ b/test/pkg/containerd/run.sh @@ -15,5 +15,7 @@ export TMPDIR=/var/lib/tmp # unset -race (does not work on alpine; see golang/go#14481) export TESTFLAGS= +# disable devmapper tests +export SKIPTESTS="github.com/containerd/containerd/snapshots/devmapper github.com/containerd/containerd/snapshots/devmapper/dmsetup github.com/containerd/containerd/snapshots/devmapper/losetup" make root-test || failed printf "containerd test suite PASSED\n" diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 32d12327e..a743a76d3 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:4.19.90 cmdline: "console=ttyS0" init: - - linuxkit/init:1d8e0532ca588c5ad0d9ca6038349a70bb7ac626 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:a4fcf333298f644dfac6adf680b83140927aa85e + - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: test-ns image: linuxkit/test-ns: diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 54c9b3a41..136004de7 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -54,16 +54,20 @@ 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. +# For v1.3.x cherry-pick a upstream commit to allow disabling some tests. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.2.8 +ENV CONTAINERD_COMMIT=v1.3.2 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 + git checkout $CONTAINERD_COMMIT && \ + git config --global user.email "you@example.com" && \ + git config --global user.name "Your Name" && \ + git cherry-pick 94d499843c0202af9636cad522d30eaf9ffed798 RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev RUN cd $GOPATH/src/github.com/containerd/containerd && \ - make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILD_TAGS="static_build" + 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. diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index c798412c4..832821e5d 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:db53af94f3377c2ecc78b0168f4ae7be8b9c5d6d-arm64 +# linuxkit/alpine:dac4b3c8e27e76075127b3ce45df7fdf75943f54-arm64 # automatically generated list of installed packages abuild-3.3.1-r0 alpine-baselayout-3.1.0-r3 @@ -300,9 +300,9 @@ vde2-libs-2.3.2-r10 vim-8.1.1365-r0 virglrenderer-0.7.0-r1 wayland-libs-server-1.16.0-r0 -wireguard-tools-0.0.20191219-r0 -wireguard-tools-wg-0.0.20191219-r0 -wireguard-tools-wg-quick-0.0.20191219-r0 +wireguard-tools-1.0.20200102-r0 +wireguard-tools-wg-1.0.20200102-r0 +wireguard-tools-wg-quick-1.0.20200102-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.7-r5 wpa_supplicant-openrc-2.7-r5 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index 5605c2b57..a9de8af1e 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:99c9ee06075b6919b067d67f998ba02f8adc426e-s390x +# linuxkit/alpine:53d529742dd92e941f2dd5e551e114dc45022e73-s390x # automatically generated list of installed packages abuild-3.3.1-r0 alpine-baselayout-3.1.0-r3 @@ -293,9 +293,9 @@ vde2-libs-2.3.2-r10 vim-8.1.1365-r0 virglrenderer-0.7.0-r1 wayland-libs-server-1.16.0-r0 -wireguard-tools-0.0.20191219-r0 -wireguard-tools-wg-0.0.20191219-r0 -wireguard-tools-wg-quick-0.0.20191219-r0 +wireguard-tools-1.0.20200102-r0 +wireguard-tools-wg-1.0.20200102-r0 +wireguard-tools-wg-quick-1.0.20200102-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.7-r5 wpa_supplicant-openrc-2.7-r5 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index e56d288ca..143a0fb27 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:129009483d68d7d396b8014cddcd22c0f1601e02-amd64 +# linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a-amd64 # automatically generated list of installed packages abuild-3.3.1-r0 alpine-baselayout-3.1.0-r3 @@ -312,9 +312,9 @@ vde2-libs-2.3.2-r10 vim-8.1.1365-r0 virglrenderer-0.7.0-r1 wayland-libs-server-1.16.0-r0 -wireguard-tools-0.0.20191219-r0 -wireguard-tools-wg-0.0.20191219-r0 -wireguard-tools-wg-quick-0.0.20191219-r0 +wireguard-tools-1.0.20200102-r0 +wireguard-tools-wg-1.0.20200102-r0 +wireguard-tools-wg-quick-1.0.20200102-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.7-r5 wpa_supplicant-openrc-2.7-r5