From aa3db640af776e93b149a4fdc0fdfb8162c23aa4 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 6 Jul 2017 14:50:52 +0100 Subject: [PATCH 01/11] Update alpine base to containerd v1.0.0-alpha0 New hash is linuxkit/alpine:8bb8664eec04e02a8a131c53aa7d5d94119270ef Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 2 +- tools/alpine/versions | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index e264188f3..a758a377c 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -49,4 +49,4 @@ COPY --from=mirror /Dockerfile /Dockerfile RUN apk update && apk upgrade -a -ENV CONTAINERD_COMMIT=c215531a8f63a98a69134e804fea4ee6d354bb90 +ENV CONTAINERD_COMMIT=v1.0.0-alpha0 diff --git a/tools/alpine/versions b/tools/alpine/versions index cee399cad..b14adcee4 100644 --- a/tools/alpine/versions +++ b/tools/alpine/versions @@ -57,7 +57,7 @@ gmp-6.1.2-r0 gmp-dev-6.1.2-r0 gnupg-2.1.20-r0 gnutls-3.5.13-r0 -go-1.8.1-r2 +go-1.8.3-r0 guile-2.0.13-r0 guile-libs-2.0.13-r0 gummiboot-48.1-r0 @@ -85,13 +85,13 @@ libattr-2.4.47-r6 libblkid-2.28.2-r2 libburn-1.4.6-r0 libbz2-1.0.6-r5 -libc-dev-0.7.1-r0 -libc-utils-0.7.1-r0 libcap-2.25-r1 libcap-ng-0.7.8-r0 libcap-ng-dev-0.7.8-r0 +libc-dev-0.7.1-r0 libcom_err-1.43.4-r0 libcurl-7.54.0-r0 +libc-utils-0.7.1-r0 libdrm-2.4.80-r0 libedit-20170329.3.1-r2 libelf-0.8.13-r2 @@ -124,10 +124,10 @@ libpcap-1.8.1-r0 libpciaccess-0.13.4-r1 libpng-1.6.29-r1 libressl-2.5.4-r0 -libressl-dev-2.5.4-r0 libressl2.5-libcrypto-2.5.4-r0 libressl2.5-libssl-2.5.4-r0 libressl2.5-libtls-2.5.4-r0 +libressl-dev-2.5.4-r0 libsasl-2.1.26-r10 libseccomp-2.3.2-r0 libseccomp-dev-2.3.2-r0 @@ -165,11 +165,11 @@ ncurses-terminfo-base-6.0-r7 nettle-3.3-r0 npth-1.2-r0 oniguruma-6.2.0-r0 -open-vm-tools-10.1.0-r7 openntpd-6.0_p1-r3 openrc-0.24.1-r2 openssh-keygen-7.5_p1-r1 openssh-server-7.5_p1-r1 +open-vm-tools-10.1.0-r7 opus-1.1.4-r0 p11-kit-0.23.2-r1 patch-2.7.5-r1 From a2d3be0e6fe63a2a9601c3bf86554e8077590ca3 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 6 Jul 2017 14:54:24 +0100 Subject: [PATCH 02/11] Update runc and containerd pull in newer containerd v1.0.0-alpha0 via updated alpine base, update runc to 429a5387123625040bacfbb60d96b1cbd02293ab which is vendored by that version of containerd (and also update alpine base for runc) Signed-off-by: Ian Campbell --- blueprints/docker-for-mac/base.yml | 4 ++-- examples/aws.yml | 4 ++-- examples/azure.yml | 4 ++-- examples/docker.yml | 4 ++-- examples/gcp.yml | 4 ++-- examples/getty.yml | 4 ++-- examples/minimal.yml | 4 ++-- examples/node_exporter.yml | 4 ++-- examples/packet.yml | 4 ++-- examples/redis-os.yml | 4 ++-- examples/sshd.yml | 4 ++-- examples/swap.yml | 4 ++-- examples/vmware.yml | 4 ++-- examples/vpnkit-forwarder.yml | 4 ++-- examples/vsudd.yml | 4 ++-- examples/vultr.yml | 4 ++-- linuxkit.yml | 4 ++-- pkg/containerd/Dockerfile | 2 +- pkg/runc/Dockerfile | 4 ++-- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/etcd/etcd.yml | 4 ++-- projects/ima-namespace/ima-namespace.yml | 4 ++-- projects/kubernetes/kube-master.yml | 4 ++-- projects/kubernetes/kube-node.yml | 4 ++-- projects/logging/examples/logging.yml | 4 ++-- projects/miragesdk/examples/fdd.yml | 4 ++-- projects/miragesdk/examples/mirage-dhcp.yml | 4 ++-- projects/okernel/examples/okernel_simple.yaml | 2 +- projects/shiftfs/shiftfs.yml | 4 ++-- projects/swarmd/swarmd.yml | 4 ++-- projects/wireguard/wireguard.yml | 2 +- test/cases/000_build/000_outputs/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/030_run_qcow/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/040_run_raw/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/100_container/test.yml | 4 ++-- test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml | 4 ++-- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml | 4 ++-- test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml | 4 ++-- .../cases/020_kernel/003_config_4.11.x/test-kernel-config.yml | 4 ++-- test/cases/020_kernel/010_kmod_4.9.x/kmod.yml | 4 ++-- .../110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml | 2 +- .../110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml | 2 +- .../110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml | 2 +- .../110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml | 2 +- .../110_netns/000_4.4.x/050_udp4_veth/test-netns.yml | 2 +- .../110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/000_4.4.x/060_udp6_veth/test-netns.yml | 2 +- .../110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml | 2 +- .../110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml | 2 +- .../110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml | 2 +- .../110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml | 2 +- .../110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml | 2 +- .../110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml | 2 +- .../110_netns/001_4.9.x/050_udp4_veth/test-netns.yml | 2 +- .../110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/001_4.9.x/060_udp6_veth/test-netns.yml | 2 +- .../110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml | 2 +- .../110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml | 2 +- .../110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml | 2 +- .../110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml | 2 +- .../110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml | 2 +- .../110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml | 2 +- .../110_netns/003_4.11.x/050_udp4_veth/test-netns.yml | 2 +- .../110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/003_4.11.x/060_udp6_veth/test-netns.yml | 2 +- .../110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml | 2 +- .../110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml | 2 +- .../cases/030_security/000_docker-bench/test-docker-bench.yml | 4 ++-- test/cases/030_security/010_ports/test.yml | 4 ++-- test/cases/040_packages/002_binfmt/test-binfmt.yml | 4 ++-- .../040_packages/003_ca-certificates/test-ca-certificates.yml | 4 ++-- test/cases/040_packages/003_containerd/test-containerd.yml | 4 ++-- test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml | 4 ++-- test/cases/040_packages/007_getty-containerd/test-ctr.yml | 4 ++-- test/cases/040_packages/013_mkimage/mkimage.yml | 4 ++-- test/cases/040_packages/013_mkimage/run.yml | 4 ++-- test/cases/040_packages/019_sysctl/test-sysctl.yml | 4 ++-- test/hack/test-ltp.yml | 4 ++-- test/hack/test.yml | 4 ++-- 93 files changed, 144 insertions(+), 144 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index fbcb07087..21584869f 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -5,8 +5,8 @@ kernel: init: - linuxkit/vpnkit-expose-port:e2b49a6c56fbf876ea24f0a5ce4ccae5f940d1be # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: # support metadata for optional config in /var/config - name: metadata diff --git a/examples/aws.yml b/examples/aws.yml index dc43cd975..3af39605a 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index 8614ace06..73285d3de 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/docker.yml b/examples/docker.yml index e55a64d4f..319327df9 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index da8490972..8dd1d0a92 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index cf5cfd492..b6b0f0b61 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index 7e569da90..a7d337a10 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 6c95289e3..7d5697c9a 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 services: - name: getty image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f diff --git a/examples/packet.yml b/examples/packet.yml index a4a52bfe0..35ee90326 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 1c68022b2..a307e52b8 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -5,8 +5,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/sshd.yml b/examples/sshd.yml index c43add642..b8da2802a 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index 0d9874ebd..a5dc996e0 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index 37c7892d2..f81d1bf57 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index feb397461..eeab25c42 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 1fd7b17f3..b69efbf01 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/vultr.yml b/examples/vultr.yml index af4aadd73..74794dfd1 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index de7420205..b3e3bc8eb 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 028ab62f5..0d50960fd 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 as alpine +FROM linuxkit/alpine:8bb8664eec04e02a8a131c53aa7d5d94119270ef as alpine RUN \ apk add \ btrfs-progs-dev \ diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index cd1932599..51517a5a1 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 as alpine +FROM linuxkit/alpine:8bb8664eec04e02a8a131c53aa7d5d94119270ef as alpine RUN \ apk add \ bash \ @@ -11,7 +11,7 @@ RUN \ make \ && true ENV GOPATH=/root/go -ENV RUNC_COMMIT=ac50e77bbb440dcab354a328c79754e2502b79ca +ENV RUNC_COMMIT=429a5387123625040bacfbb60d96b1cbd02293ab 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/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 018d7a142..7200aaa23 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 62b3c223e..6608c7ae6 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index d6e8d4b51..2e7879f2e 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 0b3887ac8..37e777355 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 4fe1b4843..365024180 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 26c311537..49c9c341f 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 0100c3d37..61714844d 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e # with runc, logwrite, startmemlogd - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 8841cd59f..1d98e6762 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index e31b3d5e1..6faa8b6d6 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 9fe7f9c19..e5e810d00 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index b9f92baa9..fb24bc15f 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 8039adb17..7a149e0c7 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/wireguard/wireguard.yml b/projects/wireguard/wireguard.yml index 8f5a1c37c..d66a3ad52 100644 --- a/projects/wireguard/wireguard.yml +++ b/projects/wireguard/wireguard.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:cbd7ae748f0a082516501a3e914fa0c924ee941e - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:f1130450206d4f64f0ddc13d15bb68435aa1ff61 - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 - linuxkit/wireguard-utils:26fe3d38455f2d441549e3c54bdec1b26ac819b8 diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 82c16cd0c..c4d46e16b 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 6df9c1858..ea296a4f0 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 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 f87cf1401..92e554de8 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 @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 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 6df9c1858..ea296a4f0 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 @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index 6df9c1858..ea296a4f0 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index 6df9c1858..ea296a4f0 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 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 4a6265568..39c683579 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index 6df9c1858..ea296a4f0 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 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 df0431f58..73a319bb4 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 services: - name: acpid diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index 50ae5785c..480a0db93 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index 6e92368bb..abfcebc3f 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index 5f8b000c3..afb6c850a 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml index 5fc2cbd74..7c64d7d3e 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml index e27570caa..899f459f7 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml index 5dcd3504f..780d9ecc6 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml index d928604bb..cb4db8ab8 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml index 42f64e205..72d687946 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml index 0a84ecc0f..6e566c839 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml index 3fafe3969..0d67846a6 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml index 94e0835f0..a60ab04ca 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml index 50d67acfc..c4f8b83ce 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml index e322398ad..6fc879230 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml index f6fe5f8f9..db16f756c 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml index 4109fadbe..be0feb7e7 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml index c094b1883..f181af2d5 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml index 8e7379796..351f9aa71 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml index ba64a107d..d3a2617cc 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml index 03d39fc11..f13784861 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml index 3b9bf2763..5587b98f3 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml index d34313ec9..9a0e0eba6 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml index 9fef0e6f7..c47ce1ba9 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml index 7470d2a1e..0ee4f0ffa 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml index 23a0e805f..b4f72f5ba 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml index b792a955e..de0967e6e 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml index 40764eac3..131620d2e 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml index dc1652f36..7c74fd1bf 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml index 391f5445a..91d47cfb3 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml index 94cd655dc..522052a1d 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml index 0769280e8..f9bcbbd5d 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml index 8b053580f..4c535f3c5 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml index 9aee121ca..9297b9ed2 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml index 43dc9d08c..3cc9b466f 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml index 7a6a7bccb..1052608d9 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml index 4b8f2a8d2..eb962d1ac 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml index a8c1b497b..ecf2f10a6 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml index 55cb240b5..888253546 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml index 06bb01245..6c6afd982 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml index 3aea36e17..4908ac7a8 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml index b4316814b..66ea2e034 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 onboot: - name: test-netns diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml index ba25c18f7..a54c5932f 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 0fb7081f6..3b6d14f08 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index f8f4a143a..a6de47500 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml index b50f086bb..ca716cf7b 100644 --- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml +++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test-containerd.yml b/test/cases/040_packages/003_containerd/test-containerd.yml index 12c4fae35..f180ba8fd 100644 --- a/test/cases/040_packages/003_containerd/test-containerd.yml +++ b/test/cases/040_packages/003_containerd/test-containerd.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index 2dfca494d..1def18e99 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/test/cases/040_packages/007_getty-containerd/test-ctr.yml b/test/cases/040_packages/007_getty-containerd/test-ctr.yml index bd13f7bbc..a1f4cbc79 100644 --- a/test/cases/040_packages/007_getty-containerd/test-ctr.yml +++ b/test/cases/040_packages/007_getty-containerd/test-ctr.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: dhcpcd diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 5730b0860..f5f3e8261 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: mkimage image: linuxkit/mkimage:a63b8ee4c5de335afc32ba850e0af319b25b96c0 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index db8e473b0..c565333c3 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index 4f5aa3fc8..05154064a 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 3fa26877b..6cdb2ec3f 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: ltp image: linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d diff --git a/test/hack/test.yml b/test/hack/test.yml index d126f7846..c50cc18d9 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -5,8 +5,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 + - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 From a82ec031201c6dbf2dbfdb68d49e472c9135240f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 6 Jul 2017 16:14:10 +0100 Subject: [PATCH 03/11] Update to moby tool 51b4e201544f $ git log --no-merges --oneline d8cc1b3f08df..51b4e201544f 6c6499b Update docker/docker vendor to 6978a6e25a2e6063f280ec842bd0f3eae99426e1 3ee4fdc Error if there are duplicate service names 3c5fad4 Remove dependency on docker/docker/cli 5e75f8c Only run `go test` and `go vet` if not cross building (i.e. ${GOOS} unset) 48f1dd0 Build for Darwin and Windows in CI c3edfec revendor runc + runtime-spec to match containerd 8e1a04ff9ee3 a73c3d3 Add partial user namespace support 0acaaa7 Assign each container a uid and gid it can use c5070df Add docs for ambient capabilities 66b4aed Add support for ambient capabilities c2e460f check that caps are valid b605e61 Adding dynamic-vhd Output Format e7ebabd Split out into a small stub command line and a library 4401e7d Rename the docker run function c5cccad Return errors from build internal function 618dc42 Allow creation of empty files ad3de8f Add support for rlimits 13da5e0 Use hyperkit to make raw disks Signed-off-by: Ian Campbell --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 76732cb14..ed445c78b 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ endif PREFIX?=/usr/local/ -MOBY_COMMIT=d8cc1b3f08df02ad563d3f548ac2527931a925a6 +MOBY_COMMIT=51b4e201544f7a5ccfbe53406e131dde63ffdab1 MOBY_VERSION=0.0 bin/moby: tmp_moby_bin.tar | bin tar xf $< From 0c6af4b3bea649e2a4f02d555f9c156237942133 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 6 Jul 2017 16:15:14 +0100 Subject: [PATCH 04/11] Add a helper script for bulk updating component sha's Signed-off-by: Ian Campbell --- scripts/update-component-sha.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 scripts/update-component-sha.sh diff --git a/scripts/update-component-sha.sh b/scripts/update-component-sha.sh new file mode 100755 index 000000000..63fb811a5 --- /dev/null +++ b/scripts/update-component-sha.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -e +if [ $# -ne 2 ] ; then + echo "Need and as arguments" >&2 + exit 1 +fi +old=$1 +new=$2 + +git grep -l "$old" | xargs sed -i -e "s,$old,$new,g" From c5634c4650b77aca39c6eb4f93b1caf7107d4871 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 12 Jul 2017 15:51:23 +0100 Subject: [PATCH 05/11] Define CONTAINERD_REPO alongside CONTAINERD_COMMIT in tools/alpine This will make it simpler to temporarily in PRs which are not yet merged (but are expected to be soon). Tools alpine is not rebuilt here since we are going to do just that in the next commit. Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 4 ++-- tools/alpine/Dockerfile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 0d50960fd..65ff2a05b 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -11,11 +11,11 @@ RUN \ tzdata \ && true ENV GOPATH=/go PATH=$PATH:/go/bin +# CONTAINERD_REPO and CONTAINERD_COMMIT are defined in linuxkit/alpine RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ - git clone https://github.com/containerd/containerd.git + git clone $CONTAINERD_REPO WORKDIR $GOPATH/src/github.com/containerd/containerd -# CONTAINERD_COMMIT is defined in linuxkit/alpine RUN git checkout $CONTAINERD_COMMIT RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\"" RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/ diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index a758a377c..65f207038 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -49,4 +49,5 @@ COPY --from=mirror /Dockerfile /Dockerfile RUN apk update && apk upgrade -a +ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git ENV CONTAINERD_COMMIT=v1.0.0-alpha0 From 902e6182b0cd95dabfef4c3fda98ba349f92988c Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 12 Jul 2017 15:53:36 +0100 Subject: [PATCH 06/11] Temporarily use https://github.com/containerd/containerd/pull/1141 We expect this (or something very similar) to be merged soon, it fixes #2131 so moving ahead now. The new alpine mirror is linuxkit/alpine:6832775a7e861ee2d7842e157688ece52d007142 Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 2 +- tools/alpine/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 65ff2a05b..76523bfda 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:8bb8664eec04e02a8a131c53aa7d5d94119270ef as alpine +FROM linuxkit/alpine:6832775a7e861ee2d7842e157688ece52d007142 as alpine RUN \ apk add \ btrfs-progs-dev \ diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 65f207038..9d84cb095 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -49,5 +49,5 @@ COPY --from=mirror /Dockerfile /Dockerfile RUN apk update && apk upgrade -a -ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.0.0-alpha0 +ENV CONTAINERD_REPO=https://github.com/ijc/containerd.git +ENV CONTAINERD_COMMIT=3455ffc08c553db0ca9fe60b4ba2b3e8a2dc960b From fa1ac99dfb9860dd1e11765c676f2e71aba5c1f9 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 12 Jul 2017 16:00:37 +0100 Subject: [PATCH 07/11] Update yml's to linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 Only those which used the same value as linuxkit.yml are updated. Signed-off-by: Ian Campbell --- blueprints/docker-for-mac/base.yml | 2 +- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd.yml | 2 +- examples/vultr.yml | 2 +- linuxkit.yml | 2 +- projects/etcd/etcd.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/logging/examples/logging.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- test/cases/000_build/000_outputs/test.yml | 2 +- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml | 2 +- test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/010_kmod_4.9.x/kmod.yml | 2 +- test/cases/030_security/000_docker-bench/test-docker-bench.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test-binfmt.yml | 2 +- .../040_packages/003_ca-certificates/test-ca-certificates.yml | 2 +- test/cases/040_packages/003_containerd/test-containerd.yml | 2 +- test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml | 2 +- test/cases/040_packages/007_getty-containerd/test-ctr.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test-sysctl.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 21584869f..e8adcc052 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -6,7 +6,7 @@ init: - linuxkit/vpnkit-expose-port:e2b49a6c56fbf876ea24f0a5ce4ccae5f940d1be # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: # support metadata for optional config in /var/config - name: metadata diff --git a/examples/aws.yml b/examples/aws.yml index 3af39605a..ed4cf2c8b 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index 73285d3de..21d48c5f4 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/docker.yml b/examples/docker.yml index 319327df9..d6633395b 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 8dd1d0a92..222294ae6 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index b6b0f0b61..38a35930d 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index a7d337a10..cde208291 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 7d5697c9a..cc809b2c5 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 services: - name: getty image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f diff --git a/examples/packet.yml b/examples/packet.yml index 35ee90326..1b949a4bb 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index a307e52b8..9bb002f20 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/sshd.yml b/examples/sshd.yml index b8da2802a..111d7abba 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index a5dc996e0..4f2b04280 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index f81d1bf57..807ff0ab4 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index eeab25c42..d8d079d74 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/vsudd.yml b/examples/vsudd.yml index b69efbf01..7190eb1b6 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/vultr.yml b/examples/vultr.yml index 74794dfd1..6ccec5522 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index b3e3bc8eb..ad67d73cb 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 2e7879f2e..4c1ebf2c9 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 37e777355..44a5e7a13 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 365024180..c6d9d0071 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 49c9c341f..f25e79c72 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 61714844d..0912b91d6 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e # with runc, logwrite, startmemlogd - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 1d98e6762..2c764c0e7 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 6faa8b6d6..4516ed93c 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index fb24bc15f..8efd7ec88 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 7a149e0c7..4af55b5d4 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index c4d46e16b..9b281cbd7 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index ea296a4f0..50a64f878 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 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 92e554de8..56fc9ce91 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 @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 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 ea296a4f0..50a64f878 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 @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index ea296a4f0..50a64f878 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index ea296a4f0..50a64f878 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 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 39c683579..89c5b379d 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index ea296a4f0..50a64f878 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index 480a0db93..a67e28b96 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index abfcebc3f..7cf071df5 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index afb6c850a..f283812f0 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml index 7c64d7d3e..ce905ffc0 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: check image: kmod-test diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml index a54c5932f..ffef20a8f 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 3b6d14f08..9a52bed66 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index a6de47500..512c62dcf 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: binfmt image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml index ca716cf7b..778ca5267 100644 --- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml +++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test-containerd.yml b/test/cases/040_packages/003_containerd/test-containerd.yml index f180ba8fd..695a707c1 100644 --- a/test/cases/040_packages/003_containerd/test-containerd.yml +++ b/test/cases/040_packages/003_containerd/test-containerd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index 1def18e99..35c507c0b 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/test/cases/040_packages/007_getty-containerd/test-ctr.yml b/test/cases/040_packages/007_getty-containerd/test-ctr.yml index a1f4cbc79..511ec59e6 100644 --- a/test/cases/040_packages/007_getty-containerd/test-ctr.yml +++ b/test/cases/040_packages/007_getty-containerd/test-ctr.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: dhcpcd diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index f5f3e8261..40cb27856 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: mkimage image: linuxkit/mkimage:a63b8ee4c5de335afc32ba850e0af319b25b96c0 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index c565333c3..72bd37d4d 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index 05154064a..4259a59d3 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 6cdb2ec3f..e6166d078 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: ltp image: linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d diff --git a/test/hack/test.yml b/test/hack/test.yml index c50cc18d9..f3e9fee5b 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:d08e5f12f1ce609fcc8ee6817bb422ff03f09122 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 From 3891a179e5dc86e522c436d2793a2037dba6b6a5 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 13 Jul 2017 10:59:43 +0100 Subject: [PATCH 08/11] tests: Bump containerd to linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 All tests are now using the same init+runc+containerd as the top-level linuxkit.yml Signed-off-by: Ian Campbell --- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- .../020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml | 2 +- .../110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml | 2 +- .../020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml | 2 +- .../110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml | 2 +- .../110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml | 2 +- .../020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml | 2 +- .../110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml | 2 +- .../020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml | 2 +- .../110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml | 2 +- .../110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml | 2 +- .../020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml | 2 +- .../110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml | 2 +- .../020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml | 2 +- .../110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml | 2 +- .../110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml | 2 +- .../020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml | 2 +- .../110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml | 2 +- .../020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml | 2 +- .../110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml | 2 +- .../110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml | 2 +- .../110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml | 2 +- .../110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml | 2 +- .../110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml | 2 +- .../110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml | 2 +- .../110_netns/003_4.11.x/050_udp4_veth/test-netns.yml | 2 +- .../110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml | 2 +- .../110_netns/003_4.11.x/060_udp6_veth/test-netns.yml | 2 +- .../110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml | 2 +- .../110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml | 2 +- .../110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) 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 73a319bb4..7305611d8 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 services: - name: acpid image: linuxkit/acpid:1966310cb75e28ffc668863a6577ee991327f918 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml index 899f459f7..6473dda2b 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/010_tcp4_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml index 780d9ecc6..fdb0481b1 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/011_tcp4_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml index cb4db8ab8..023a82236 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/020_tcp6_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml index 72d687946..233a9b9a2 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/021_tcp6_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml index 6e566c839..f39d46918 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/030_tcp4_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml index 0d67846a6..b44339458 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/040_tcp6_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml index a60ab04ca..3340342bc 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/050_udp4_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml index c4f8b83ce..13443c4dc 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/051_udp4_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml index 6fc879230..97f7f51b5 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/060_udp6_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml index db16f756c..95e58c188 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/061_udp6_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml index be0feb7e7..6177a032a 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/070_udp4_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml index f181af2d5..9b34400a9 100644 --- a/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/000_4.4.x/080_udp6_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml index 351f9aa71..066141724 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/010_tcp4_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml index d3a2617cc..b4cff2779 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/011_tcp4_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml index f13784861..ee2aae72a 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/020_tcp6_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml index 5587b98f3..3824a3361 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/021_tcp6_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml index 9a0e0eba6..3b48ebb72 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/030_tcp4_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml index c47ce1ba9..8d19b5356 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/040_tcp6_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml index 0ee4f0ffa..cc24b15da 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/050_udp4_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml index b4f72f5ba..f26eed3c9 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/051_udp4_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml index de0967e6e..5f9bcf6f7 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/060_udp6_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml index 131620d2e..1b63af8d8 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/061_udp6_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml index 7c74fd1bf..5ba48fd3d 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/070_udp4_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml index 91d47cfb3..114b4e2a9 100644 --- a/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/001_4.9.x/080_udp6_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml index 522052a1d..a57c94daa 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/010_tcp4_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml index f9bcbbd5d..4080fb556 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/011_tcp4_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml index 4c535f3c5..939490b76 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/020_tcp6_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml index 9297b9ed2..6759f65cf 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/021_tcp6_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml index 3cc9b466f..782a8afaf 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/030_tcp4_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml index 1052608d9..712158409 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/040_tcp6_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml index eb962d1ac..5b66e732d 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/050_udp4_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml index ecf2f10a6..ad713516e 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/051_udp4_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml index 888253546..b03bc76ed 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/060_udp6_veth/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml index 6c6afd982..3d704afc2 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/061_udp6_veth_reverse/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml index 4908ac7a8..a6133d373 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/070_udp4_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 diff --git a/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml b/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml index 66ea2e034..08196507f 100644 --- a/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml +++ b/test/cases/020_kernel/110_netns/003_4.11.x/080_udp6_loopback/test-netns.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 - - linuxkit/containerd:c977f27c234d55b85172813b8451f67ea86be4a3 + - linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4 onboot: - name: test-netns image: linuxkit/test-netns:3e02fb2730ad29a732eb2d4c711cb890169ed776 From 89e762757674ae464cd53beb4a462a65d8f3be19 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 13 Jul 2017 13:42:24 +0100 Subject: [PATCH 09/11] Split linuxkit.build.outputs into distinct tests This test was building all the supported output formats and so was taking orders of magnitude longer than every other test. It was also obscuring which output formats were slow and/or broken. The vhd test remains skipped. Signed-off-by: Ian Campbell --- .../000_outputs/000_kernel+initrd/test.sh | 26 +++++++++++++++ .../000_outputs/001_iso-bios/test.sh | 24 ++++++++++++++ .../000_build/000_outputs/002_iso-efi/test.sh | 24 ++++++++++++++ .../000_build/000_outputs/003_gcp/test.sh | 24 ++++++++++++++ .../000_build/000_outputs/004_raw/test.sh | 24 ++++++++++++++ .../000_build/000_outputs/005_qcow2/test.sh | 24 ++++++++++++++ .../000_build/000_outputs/006_vhd/test.sh | 25 ++++++++++++++ .../000_build/000_outputs/007_vmdk/test.sh | 24 ++++++++++++++ test/cases/000_build/000_outputs/test.sh | 33 ------------------- 9 files changed, 195 insertions(+), 33 deletions(-) create mode 100644 test/cases/000_build/000_outputs/000_kernel+initrd/test.sh create mode 100644 test/cases/000_build/000_outputs/001_iso-bios/test.sh create mode 100644 test/cases/000_build/000_outputs/002_iso-efi/test.sh create mode 100644 test/cases/000_build/000_outputs/003_gcp/test.sh create mode 100644 test/cases/000_build/000_outputs/004_raw/test.sh create mode 100644 test/cases/000_build/000_outputs/005_qcow2/test.sh create mode 100644 test/cases/000_build/000_outputs/006_vhd/test.sh create mode 100644 test/cases/000_build/000_outputs/007_vmdk/test.sh delete mode 100644 test/cases/000_build/000_outputs/test.sh diff --git a/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh b/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh new file mode 100644 index 000000000..46ff58cc6 --- /dev/null +++ b/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# SUMMARY: Check that kernel+initrd output format is generated +# LABELS: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=check + +clean_up() { + # remove any images + find . -depth -iname "${NAME}*" -exec rm -rf {} \; + rm -f test.yml +} + +trap clean_up EXIT + +moby build -output kernel+initrd -name "${NAME}" ../test.yml +[ -f "${NAME}-kernel" ] || exit 1 +[ -f "${NAME}-initrd.img" ] || exit 1 +[ -f "${NAME}-cmdline" ] || exit 1 + +exit 0 diff --git a/test/cases/000_build/000_outputs/001_iso-bios/test.sh b/test/cases/000_build/000_outputs/001_iso-bios/test.sh new file mode 100644 index 000000000..e11545b49 --- /dev/null +++ b/test/cases/000_build/000_outputs/001_iso-bios/test.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# SUMMARY: Check that iso-bios output format is generated +# LABELS: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=check + +clean_up() { + # remove any images + find . -depth -iname "${NAME}*" -exec rm -rf {} \; + rm -f test.yml +} + +trap clean_up EXIT + +moby build -output iso-bios -name "${NAME}" ../test.yml +[ -f "${NAME}.iso" ] || exit 1 + +exit 0 diff --git a/test/cases/000_build/000_outputs/002_iso-efi/test.sh b/test/cases/000_build/000_outputs/002_iso-efi/test.sh new file mode 100644 index 000000000..ebc599fbc --- /dev/null +++ b/test/cases/000_build/000_outputs/002_iso-efi/test.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# SUMMARY: Check that iso-efi output format is generated +# LABELS: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=check + +clean_up() { + # remove any images + find . -depth -iname "${NAME}*" -exec rm -rf {} \; + rm -f test.yml +} + +trap clean_up EXIT + +moby build -output iso-efi -name "${NAME}" ../test.yml +[ -f "${NAME}-efi.iso" ] || exit 1 + +exit 0 diff --git a/test/cases/000_build/000_outputs/003_gcp/test.sh b/test/cases/000_build/000_outputs/003_gcp/test.sh new file mode 100644 index 000000000..06d4d4f7e --- /dev/null +++ b/test/cases/000_build/000_outputs/003_gcp/test.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# SUMMARY: Check that gcp output format is generated +# LABELS: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=check + +clean_up() { + # remove any images + find . -depth -iname "${NAME}*" -exec rm -rf {} \; + rm -f test.yml +} + +trap clean_up EXIT + +moby build -output gcp -name "${NAME}" ../test.yml +[ -f "${NAME}.img.tar.gz" ] || exit 1 + +exit 0 diff --git a/test/cases/000_build/000_outputs/004_raw/test.sh b/test/cases/000_build/000_outputs/004_raw/test.sh new file mode 100644 index 000000000..831b47989 --- /dev/null +++ b/test/cases/000_build/000_outputs/004_raw/test.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# SUMMARY: Check that raw output format is generated +# LABELS: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=check + +clean_up() { + # remove any images + find . -depth -iname "${NAME}*" -exec rm -rf {} \; + rm -f test.yml +} + +trap clean_up EXIT + +moby build -output raw -name "${NAME}" ../test.yml +[ -f "${NAME}.raw" ] || exit 1 + +exit 0 diff --git a/test/cases/000_build/000_outputs/005_qcow2/test.sh b/test/cases/000_build/000_outputs/005_qcow2/test.sh new file mode 100644 index 000000000..2c0470dec --- /dev/null +++ b/test/cases/000_build/000_outputs/005_qcow2/test.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# SUMMARY: Check that qcow2 output format is generated +# LABELS: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=check + +clean_up() { + # remove any images + find . -depth -iname "${NAME}*" -exec rm -rf {} \; + rm -f test.yml +} + +trap clean_up EXIT + +moby build -output qcow2 -name "${NAME}" ../test.yml +[ -f "${NAME}.qcow2" ] || exit 1 + +exit 0 diff --git a/test/cases/000_build/000_outputs/006_vhd/test.sh b/test/cases/000_build/000_outputs/006_vhd/test.sh new file mode 100644 index 000000000..a2a67f448 --- /dev/null +++ b/test/cases/000_build/000_outputs/006_vhd/test.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# SUMMARY: Check that vhd format is generated +# LABELS: skip +# VHD currently requires a lot of memory, disable for now + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=check + +clean_up() { + # remove any images + find . -depth -iname "${NAME}*" -exec rm -rf {} \; + rm -f test.yml +} + +trap clean_up EXIT + +moby build -output vhd -name "${NAME}" ../test.yml +[ -f "${NAME}.vhd" ] || exit 1 + +exit 0 diff --git a/test/cases/000_build/000_outputs/007_vmdk/test.sh b/test/cases/000_build/000_outputs/007_vmdk/test.sh new file mode 100644 index 000000000..44cca5ecf --- /dev/null +++ b/test/cases/000_build/000_outputs/007_vmdk/test.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# SUMMARY: Check that vmdk output format is generated +# LABELS: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=check + +clean_up() { + # remove any images + find . -depth -iname "${NAME}*" -exec rm -rf {} \; + rm -f test.yml +} + +trap clean_up EXIT + +moby build -output vmdk -name "${NAME}" ../test.yml +[ -f "${NAME}.vmdk" ] || exit 1 + +exit 0 diff --git a/test/cases/000_build/000_outputs/test.sh b/test/cases/000_build/000_outputs/test.sh deleted file mode 100644 index 3c7058520..000000000 --- a/test/cases/000_build/000_outputs/test.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# SUMMARY: Check that all supported output formats are generated -# LABELS: - -set -e - -# Source libraries. Uncomment if needed/defined -#. "${RT_LIB}" -. "${RT_PROJECT_ROOT}/_lib/lib.sh" - -NAME=check - -clean_up() { - # remove any images - find . -depth -iname "${NAME}*" -exec rm -rf {} \; -} - -trap clean_up EXIT - -moby build -output kernel+initrd,iso-bios,iso-efi,gcp,raw,qcow2,vmdk -name "${NAME}" test.yml -[ -f "${NAME}-kernel" ] || exit 1 -[ -f "${NAME}-initrd.img" ] || exit 1 -[ -f "${NAME}-cmdline" ] || exit 1 -[ -f "${NAME}.iso" ] || exit 1 -[ -f "${NAME}-efi.iso" ] || exit 1 -[ -f "${NAME}.img.tar.gz" ] || exit 1 -[ -f "${NAME}.raw" ] || exit 1 -[ -f "${NAME}.qcow2" ] || exit 1 -# VHD currently requires a lot of memory, disable for now -# [ -f "${NAME}.vhd" ] || exit 1 -[ -f "${NAME}.vmdk" ] || exit 1 - -exit 0 From f7fc5598b6fe05977f01f9a6b20ded6bb161d308 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 13 Jul 2017 13:37:23 +0100 Subject: [PATCH 10/11] Disable qemu in container test Failing for some time; see https://github.com/linuxkit/linuxkit/issues/2020 Signed-off-by: Justin Cormack --- test/cases/010_platforms/000_qemu/100_container/test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/cases/010_platforms/000_qemu/100_container/test.sh b/test/cases/010_platforms/000_qemu/100_container/test.sh index 9433ed7d3..ff54c4f57 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.sh +++ b/test/cases/010_platforms/000_qemu/100_container/test.sh @@ -1,6 +1,8 @@ #!/bin/sh # SUMMARY: Check that qemu runs containerised -# LABELS: +# LABELS: skip + +# this test is not working at present see https://github.com/linuxkit/linuxkit/issues/2020 set -e From f67050b5ed81194d6897083c7503e6119fcf3246 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 13 Jul 2017 14:49:43 +0100 Subject: [PATCH 11/11] Bump moby tool to 4db06aa1732b $ git log --oneline 51b4e201544f..4db06aa1732b 4db06aa Merge pull request #111 from ijc/master f20828b Update LinuxKit components used for build 75cc04a Merge pull request #109 from justincormack/contributing b4804b6 Add Contributing doc Signed-off-by: Ian Campbell --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ed445c78b..357110f90 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ endif PREFIX?=/usr/local/ -MOBY_COMMIT=51b4e201544f7a5ccfbe53406e131dde63ffdab1 +MOBY_COMMIT=4db06aa1732b44a8cadd9c8577df0aa5c716e701 MOBY_VERSION=0.0 bin/moby: tmp_moby_bin.tar | bin tar xf $<