From ca536741541b9646bf9ff6a9b8fd4e74f4ce76b1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 19:00:03 +0100 Subject: [PATCH 01/13] tools/alpine: Update to latest Signed-off-by: Rolf Neugebauer --- tools/alpine/versions.aarch64 | 16 ++++++++-------- tools/alpine/versions.s390x | 16 ++++++++-------- tools/alpine/versions.x86_64 | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 94bcb40d9..1ba6d68e8 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:7ce5554cf0ec50a19f9c13c7c4472b3f8a0777bc-arm64 +# linuxkit/alpine:fec3c6bec4d767d74dce8d7813ad69bfb7cb9b3b-arm64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 @@ -24,7 +24,7 @@ btrfs-progs-4.17-r1 btrfs-progs-dev-4.17-r1 btrfs-progs-libs-4.17-r1 build-base-0.5-r1 -busybox-1.28.4-r0 +busybox-1.28.4-r1 busybox-initscripts-3.1-r3 bzip2-1.0.6-r6 ca-certificates-20171114-r3 @@ -127,7 +127,7 @@ libcap-2.25-r1 libcap-ng-0.7.9-r0 libcap-ng-dev-0.7.9-r0 libcom_err-1.44.2-r0 -libcrypto1.0-1.0.2o-r1 +libcrypto1.0-1.0.2o-r2 libcurl-7.61.0-r0 libdrm-2.4.92-r0 libedit-20170329.3.1-r3 @@ -171,7 +171,7 @@ libseccomp-2.3.3-r1 libseccomp-dev-2.3.3-r1 libsmartcols-2.32-r0 libssh2-1.8.0-r3 -libssl1.0-1.0.2o-r1 +libssl1.0-1.0.2o-r2 libstdc++-6.4.0-r8 libtasn1-4.13-r0 libtirpc-1.0.3-r0 @@ -231,8 +231,8 @@ openrc-0.35.5-r4 openssh-keygen-7.7_p1-r2 openssh-server-7.7_p1-r2 openssh-server-common-7.7_p1-r2 -openssl-1.0.2o-r1 -openssl-dev-1.0.2o-r1 +openssl-1.0.2o-r2 +openssl-dev-1.0.2o-r2 opus-1.2.1-r1 p11-kit-0.23.10-r0 patch-2.7.6-r2 @@ -275,7 +275,7 @@ socat-1.7.3.2-r4 spice-server-0.14.0-r7 sqlite-libs-3.24.0-r0 squashfs-tools-4.3-r4 -ssl_client-1.28.4-r0 +ssl_client-1.28.4-r1 strace-4.22-r0 sudo-1.8.23-r2 swig-3.0.12-r3 @@ -294,7 +294,7 @@ util-linux-dev-2.32-r0 vde2-libs-2.3.2-r9 vim-8.1.0115-r0 wayland-libs-server-1.15.0-r0 -wireguard-tools-0.0.20180708-r0 +wireguard-tools-0.0.20180718-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r13 wpa_supplicant-openrc-2.6-r13 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index 517f798b8..f12103060 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:24278490c0ae074fc401c1207de9e5e7b4294c67-s390x +# linuxkit/alpine:2ed1dbe57252bf8abbba07326845fd518542ec4a-s390x # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 @@ -24,7 +24,7 @@ btrfs-progs-4.17-r1 btrfs-progs-dev-4.17-r1 btrfs-progs-libs-4.17-r1 build-base-0.5-r1 -busybox-1.28.4-r0 +busybox-1.28.4-r1 busybox-initscripts-3.1-r3 bzip2-1.0.6-r6 ca-certificates-20171114-r3 @@ -126,7 +126,7 @@ libcap-2.25-r1 libcap-ng-0.7.9-r0 libcap-ng-dev-0.7.9-r0 libcom_err-1.44.2-r0 -libcrypto1.0-1.0.2o-r1 +libcrypto1.0-1.0.2o-r2 libcurl-7.61.0-r0 libdrm-2.4.92-r0 libedit-20170329.3.1-r3 @@ -168,7 +168,7 @@ libseccomp-2.3.3-r1 libseccomp-dev-2.3.3-r1 libsmartcols-2.32-r0 libssh2-1.8.0-r3 -libssl1.0-1.0.2o-r1 +libssl1.0-1.0.2o-r2 libstdc++-6.4.0-r8 libtasn1-4.13-r0 libtirpc-1.0.3-r0 @@ -224,8 +224,8 @@ openrc-0.35.5-r4 openssh-keygen-7.7_p1-r2 openssh-server-7.7_p1-r2 openssh-server-common-7.7_p1-r2 -openssl-1.0.2o-r1 -openssl-dev-1.0.2o-r1 +openssl-1.0.2o-r2 +openssl-dev-1.0.2o-r2 opus-1.2.1-r1 p11-kit-0.23.10-r0 patch-2.7.6-r2 @@ -268,7 +268,7 @@ socat-1.7.3.2-r4 spice-server-0.14.0-r7 sqlite-libs-3.24.0-r0 squashfs-tools-4.3-r4 -ssl_client-1.28.4-r0 +ssl_client-1.28.4-r1 strace-4.22-r0 sudo-1.8.23-r2 swig-3.0.12-r3 @@ -287,7 +287,7 @@ util-linux-dev-2.32-r0 vde2-libs-2.3.2-r9 vim-8.1.0115-r0 wayland-libs-server-1.15.0-r0 -wireguard-tools-0.0.20180708-r0 +wireguard-tools-0.0.20180718-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r13 wpa_supplicant-openrc-2.6-r13 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index d4539364a..acf673f54 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2-amd64 +# linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559-amd64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 @@ -24,7 +24,7 @@ btrfs-progs-4.17-r1 btrfs-progs-dev-4.17-r1 btrfs-progs-libs-4.17-r1 build-base-0.5-r1 -busybox-1.28.4-r0 +busybox-1.28.4-r1 busybox-initscripts-3.1-r3 bzip2-1.0.6-r6 ca-certificates-20171114-r3 @@ -131,7 +131,7 @@ libcap-2.25-r1 libcap-ng-0.7.9-r0 libcap-ng-dev-0.7.9-r0 libcom_err-1.44.2-r0 -libcrypto1.0-1.0.2o-r1 +libcrypto1.0-1.0.2o-r2 libcurl-7.61.0-r0 libdrm-2.4.92-r0 libedit-20170329.3.1-r3 @@ -177,7 +177,7 @@ libseccomp-2.3.3-r1 libseccomp-dev-2.3.3-r1 libsmartcols-2.32-r0 libssh2-1.8.0-r3 -libssl1.0-1.0.2o-r1 +libssl1.0-1.0.2o-r2 libstdc++-6.4.0-r8 libtasn1-4.13-r0 libtirpc-1.0.3-r0 @@ -239,8 +239,8 @@ openrc-0.35.5-r4 openssh-keygen-7.7_p1-r2 openssh-server-7.7_p1-r2 openssh-server-common-7.7_p1-r2 -openssl-1.0.2o-r1 -openssl-dev-1.0.2o-r1 +openssl-1.0.2o-r2 +openssl-dev-1.0.2o-r2 opus-1.2.1-r1 ovmf-0.0.20170624-r0 p11-kit-0.23.10-r0 @@ -283,7 +283,7 @@ socat-1.7.3.2-r4 spice-server-0.14.0-r7 sqlite-libs-3.24.0-r0 squashfs-tools-4.3-r4 -ssl_client-1.28.4-r0 +ssl_client-1.28.4-r1 strace-4.22-r0 sudo-1.8.23-r2 swig-3.0.12-r3 @@ -303,7 +303,7 @@ util-linux-dev-2.32-r0 vde2-libs-2.3.2-r9 vim-8.1.0115-r0 wayland-libs-server-1.15.0-r0 -wireguard-tools-0.0.20180708-r0 +wireguard-tools-0.0.20180718-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r13 wpa_supplicant-openrc-2.6-r13 From 768593b9516aa77e8a3df44aaba95955cbe0761a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 19:22:42 +0100 Subject: [PATCH 02/13] tools: Update to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- tools/go-compile/Dockerfile | 2 +- tools/mkimage-iso-bios/Dockerfile | 2 +- tools/mkimage-iso-efi/Dockerfile | 4 ++-- tools/mkimage-iso/Dockerfile | 2 +- tools/mkimage-qcow2-efi/Dockerfile | 4 ++-- tools/mkimage-raw-bios/Dockerfile | 2 +- tools/mkimage-raw-efi/Dockerfile | 4 ++-- tools/mkimage-rpi3/Dockerfile | 2 +- tools/mkimage-squashfs/Dockerfile | 2 +- tools/qemu/Dockerfile | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile index d48d82d1c..4a0cf82ff 100644 --- a/tools/go-compile/Dockerfile +++ b/tools/go-compile/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/tools/mkimage-iso-bios/Dockerfile b/tools/mkimage-iso-bios/Dockerfile index be78af6a6..84aa838d6 100644 --- a/tools/mkimage-iso-bios/Dockerfile +++ b/tools/mkimage-iso-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc as mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile index 7c55144a0..f13685161 100644 --- a/tools/mkimage-iso-efi/Dockerfile +++ b/tools/mkimage-iso-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS grub-build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS grub-build RUN apk add \ automake \ make \ @@ -38,7 +38,7 @@ RUN mkdir /grub-lib && \ ;; \ esac -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-iso/Dockerfile b/tools/mkimage-iso/Dockerfile index 7241b487e..110bccf65 100644 --- a/tools/mkimage-iso/Dockerfile +++ b/tools/mkimage-iso/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-qcow2-efi/Dockerfile b/tools/mkimage-qcow2-efi/Dockerfile index e1acb0e8a..93917acd3 100644 --- a/tools/mkimage-qcow2-efi/Dockerfile +++ b/tools/mkimage-qcow2-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS grub-build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS grub-build RUN apk add \ autoconf \ automake \ @@ -38,7 +38,7 @@ RUN mkdir /grub-lib && \ ;; \ esac -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-raw-bios/Dockerfile b/tools/mkimage-raw-bios/Dockerfile index 6d8405760..9fc6f6e69 100644 --- a/tools/mkimage-raw-bios/Dockerfile +++ b/tools/mkimage-raw-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-raw-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile index ece392995..0530e36e4 100644 --- a/tools/mkimage-raw-efi/Dockerfile +++ b/tools/mkimage-raw-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS grub-build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS grub-build RUN apk add \ autoconf \ automake \ @@ -37,7 +37,7 @@ RUN mkdir /grub-lib && \ ;; \ esac -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-rpi3/Dockerfile b/tools/mkimage-rpi3/Dockerfile index 0fade9556..a653de6b4 100644 --- a/tools/mkimage-rpi3/Dockerfile +++ b/tools/mkimage-rpi3/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc as build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as build RUN apk add \ bc \ dtc \ diff --git a/tools/mkimage-squashfs/Dockerfile b/tools/mkimage-squashfs/Dockerfile index 74161ebbb..a5cbfcbf0 100644 --- a/tools/mkimage-squashfs/Dockerfile +++ b/tools/mkimage-squashfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/qemu/Dockerfile b/tools/qemu/Dockerfile index 1177bf4f2..8627bf945 100644 --- a/tools/qemu/Dockerfile +++ b/tools/qemu/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ From 169e97fe52370429ab1403ce135ca2ed0da91a2a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 19:49:18 +0100 Subject: [PATCH 03/13] Update use of tools to latest Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- docs/vendoring.md | 4 ++-- src/cmd/linuxkit/moby/output.go | 16 ++++++++-------- src/cmd/linuxkit/run_qemu.go | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 073d3f3ad..b6d4a8430 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION="v0.5+" GIT_COMMIT=$(shell git rev-list -1 HEAD) -GO_COMPILE=linuxkit/go-compile:49a2e8f8672ca95ad0159eebcc631773503465c1 +GO_COMPILE=linuxkit/go-compile:e1204ce9921c1d45362a374e06be7234d3bf1184 ifeq ($(OS),Windows_NT) LINUXKIT?=bin/linuxkit.exe diff --git a/docs/vendoring.md b/docs/vendoring.md index 1e4b499fe..0c9ac57da 100644 --- a/docs/vendoring.md +++ b/docs/vendoring.md @@ -22,7 +22,7 @@ docker run -it --rm \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ --entrypoint /go/bin/vndr \ -linuxkit/go-compile:49a2e8f8672ca95ad0159eebcc631773503465c1 +linuxkit/go-compile:e1204ce9921c1d45362a374e06be7234d3bf1184 ``` To update a single dependency: @@ -32,7 +32,7 @@ docker run -it --rm \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ --entrypoint /go/bin/vndr \ -linuxkit/go-compile:49a2e8f8672ca95ad0159eebcc631773503465c1 +linuxkit/go-compile:e1204ce9921c1d45362a374e06be7234d3bf1184 github.com/docker/docker ``` diff --git a/src/cmd/linuxkit/moby/output.go b/src/cmd/linuxkit/moby/output.go index d17cf41b6..44596caec 100644 --- a/src/cmd/linuxkit/moby/output.go +++ b/src/cmd/linuxkit/moby/output.go @@ -16,18 +16,18 @@ import ( var ( outputImages = map[string]string{ - "iso": "linuxkit/mkimage-iso:4c77e9969773bf0ed6b0eb2230a2c94b5fae47ab", - "iso-bios": "linuxkit/mkimage-iso-bios:65254243f003cf0ac74c64b0a23b543195ddad8a", - "iso-efi": "linuxkit/mkimage-iso-efi:1f5556e56da8e82d52458667ad354b719f314eb2", - "raw-bios": "linuxkit/mkimage-raw-bios:2795f6282bdb8582934d5a0c2f1f859d3073336c", - "raw-efi": "linuxkit/mkimage-raw-efi:21fbe24aa2a9c6b2d5847da5b7337f727e31339c", - "squashfs": "linuxkit/mkimage-squashfs:9e3c0c2788665a54b949e79ebaacf66297ebd4df", + "iso": "linuxkit/mkimage-iso:b5403fcaedec7fad46d69bf0d4a8704a24ac82ca", + "iso-bios": "linuxkit/mkimage-iso-bios:f80dec8fd20b00b3f0689daebb4eb4f72bb8ccba", + "iso-efi": "linuxkit/mkimage-iso-efi:248673cd3784eb3664d0f80b5bd31829465ca784", + "raw-bios": "linuxkit/mkimage-raw-bios:6b4890aacfae5b010c9adb72d32c5f0edc366523", + "raw-efi": "linuxkit/mkimage-raw-efi:a01ff1621b9945a63675e2a73d3fda064fad3c3f", + "squashfs": "linuxkit/mkimage-squashfs:60d9d141c49796f9a30bd2467884ea5c1813621f", "gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1", - "qcow2-efi": "linuxkit/mkimage-qcow2-efi:6a886a3f82d6d166f4ae540203cb3dffbc4cc12d", + "qcow2-efi": "linuxkit/mkimage-qcow2-efi:74cc5c7c4064c7d25d3caf08ab51cddd9b840ebe", "vhd": "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242", "dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6", "vmdk": "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5", - "rpi3": "linuxkit/mkimage-rpi3:be740259f3b49bfe46f5322e22709c3af2111b33", + "rpi3": "linuxkit/mkimage-rpi3:8b36b2cd7f19a71319a38c5c5059e655f3114cb0", } ) diff --git a/src/cmd/linuxkit/run_qemu.go b/src/cmd/linuxkit/run_qemu.go index 5a379230d..cc9178108 100644 --- a/src/cmd/linuxkit/run_qemu.go +++ b/src/cmd/linuxkit/run_qemu.go @@ -20,7 +20,7 @@ import ( // QemuImg is the version of qemu container const ( - QemuImg = "linuxkit/qemu:5d89b7a57b638eba986df318c97fa9d5905135a5" + QemuImg = "linuxkit/qemu:18e9e252d670ed829ae13a358f4efcf5d7da6a24" defaultFWPath = "/usr/share/ovmf/bios.bin" ) From 2b1428b3d6cc1e6fc4dc33075364c4b699de18cc Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 19:49:40 +0100 Subject: [PATCH 04/13] tests: Update packages to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- test/pkg/containerd/Dockerfile | 2 +- test/pkg/docker-bench/Dockerfile | 2 +- test/pkg/kernel-config/Dockerfile | 2 +- test/pkg/ns/Dockerfile | 4 ++-- test/pkg/poweroff/Dockerfile | 2 +- test/pkg/virtsock/Dockerfile | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 45756393f..2ff676263 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2 AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) diff --git a/test/pkg/docker-bench/Dockerfile b/test/pkg/docker-bench/Dockerfile index 9fdc8217b..138449ab5 100644 --- a/test/pkg/docker-bench/Dockerfile +++ b/test/pkg/docker-bench/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/test/pkg/kernel-config/Dockerfile b/test/pkg/kernel-config/Dockerfile index b4e962439..4232d7a11 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl bash diff --git a/test/pkg/ns/Dockerfile b/test/pkg/ns/Dockerfile index e47369cf9..b11be8db0 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ @@ -8,7 +8,7 @@ RUN apk add --no-cache --initdb -p /out \ musl RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache \ build-base \ git \ diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile index 0fb00f1d3..e1026c934 100644 --- a/test/pkg/poweroff/Dockerfile +++ b/test/pkg/poweroff/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile index 1f9751a08..46a75a5d7 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ tini RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin From 27bb10a14c2ee916558da7c15b13c33dfc58e998 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 20:02:12 +0100 Subject: [PATCH 05/13] Update use of test packages to latest Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/moby/linuxkit.go | 2 +- .../010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/000_qemu/005_run_kernel+squashfs/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_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- .../010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_hyperkit/005_run_kernel+squashfs/test.yml | 2 +- test/cases/020_kernel/000_config_4.4.x/test.yml | 4 ++-- test/cases/020_kernel/001_config_4.9.x/test.yml | 4 ++-- test/cases/020_kernel/006_config_4.14.x/test.yml | 4 ++-- test/cases/020_kernel/009_config_4.17.x/test.yml | 4 ++-- test/cases/020_kernel/010_kmod_4.4.x/test.yml | 2 +- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 2 +- test/cases/020_kernel/016_kmod_4.14.x/test.yml | 2 +- test/cases/020_kernel/019_kmod_4.17.x/test.yml | 2 +- .../010_echo-tcp-ipv4-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml | 4 ++-- .../011_echo-tcp-ipv4-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml | 4 ++-- .../012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml | 4 ++-- .../015_echo-tcp-ipv4-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml | 4 ++-- .../016_echo-tcp-ipv4-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml | 4 ++-- .../017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml | 4 ++-- .../020_echo-tcp-ipv6-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml | 4 ++-- .../021_echo-tcp-ipv6-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml | 4 ++-- .../022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml | 4 ++-- .../025_echo-tcp-ipv6-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml | 4 ++-- .../026_echo-tcp-ipv6-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml | 4 ++-- .../027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml | 4 ++-- .../030_echo-udp-ipv4-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/030_echo-udp-ipv4-short-1con-single/test.yml | 4 ++-- .../031_echo-udp-ipv4-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/031_echo-udp-ipv4-short-10con-single/test.yml | 4 ++-- .../032_echo-udp-ipv4-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml | 4 ++-- .../035_echo-udp-ipv4-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/035_echo-udp-ipv4-long-1con-single/test.yml | 4 ++-- .../036_echo-udp-ipv4-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/036_echo-udp-ipv4-long-10con-single/test.yml | 4 ++-- .../037_echo-udp-ipv4-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml | 4 ++-- .../040_echo-udp-ipv6-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/040_echo-udp-ipv6-short-1con-single/test.yml | 4 ++-- .../041_echo-udp-ipv6-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/041_echo-udp-ipv6-short-10con-single/test.yml | 4 ++-- .../042_echo-udp-ipv6-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml | 4 ++-- .../045_echo-udp-ipv6-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/045_echo-udp-ipv6-long-1con-single/test.yml | 4 ++-- .../046_echo-udp-ipv6-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/046_echo-udp-ipv6-long-10con-single/test.yml | 4 ++-- .../047_echo-udp-ipv6-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml | 4 ++-- .../010_echo-short-1con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/010_echo-short-1con-single/test.yml | 4 ++-- .../011_echo-short-10con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/011_echo-short-10con-single/test.yml | 4 ++-- .../012_echo-short-5con-multi-reverse/test.yml | 4 ++-- .../050_unix-domain/012_echo-short-5con-multi/test.yml | 4 ++-- .../015_echo-long-1con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/015_echo-long-1con-single/test.yml | 4 ++-- .../016_echo-long-10con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/016_echo-long-10con-single/test.yml | 4 ++-- .../050_unix-domain/017_echo-long-5con-multi-reverse/test.yml | 4 ++-- .../050_unix-domain/017_echo-long-5con-multi/test.yml | 4 ++-- .../110_namespace/100_mix/010_veth-unix-domain-echo/test.yml | 4 ++-- .../100_mix/011_veth-unix-domain-echo-reverse/test.yml | 4 ++-- .../110_namespace/100_mix/012_veth-ipv4-echo/test.yml | 4 ++-- .../110_namespace/100_mix/013_veth-ipv6-echo/test.yml | 4 ++-- .../110_namespace/100_mix/014_veth-tcp-echo/test.yml | 4 ++-- .../110_namespace/100_mix/015_veth-udp-echo/test.yml | 4 ++-- .../110_namespace/100_mix/020_unix-domain-echo/test.yml | 4 ++-- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 4 ++-- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- .../cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../006_format_mount/005_by_device_force/test.yml | 2 +- .../cases/040_packages/006_format_mount/010_multiple/test.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.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 4 ++-- test/pkg/ns/template.yml | 2 +- 111 files changed, 184 insertions(+), 184 deletions(-) diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index 0d853982c..50a3d1c7e 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -23,7 +23,7 @@ onboot: - name: mkimage image: linuxkit/mkimage:50bde8b00eb82e08f12dd9cc29f36c77f5638426 - name: poweroff - image: linuxkit/poweroff:3845c4d64d47a1ea367806be5547e44594b0fa91 + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 trust: org: - linuxkit diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index 758fa5983..41a0f129f 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index 758fa5983..41a0f129f 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: 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 ff9ef6b31..2376167bd 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 @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: 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 bfecd4862..772126732 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 @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index bfecd4862..772126732 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index bfecd4862..772126732 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index bfecd4862..772126732 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: 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 1a9d2581a..47d448ac9 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index bfecd4862..772126732 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index bfecd4862..772126732 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index a92053862..8c611e277 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:v0.5 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:a780a39198cf98e2b93b773b36f9fc40a278edd0 + image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index b21b37a38..6e4032503 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:v0.5 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:a780a39198cf98e2b93b773b36f9fc40a278edd0 + image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index 720f750d8..676a14af5 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:v0.5 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:a780a39198cf98e2b93b773b36f9fc40a278edd0 + image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/009_config_4.17.x/test.yml b/test/cases/020_kernel/009_config_4.17.x/test.yml index 3f8b33962..61e1f325c 100644 --- a/test/cases/020_kernel/009_config_4.17.x/test.yml +++ b/test/cases/020_kernel/009_config_4.17.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:v0.5 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:a780a39198cf98e2b93b773b36f9fc40a278edd0 + image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml index b39d71f8c..601d7ef0f 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index 2a36fddc2..0ef2d22fd 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml index 94359c948..93ba75a9e 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/019_kmod_4.17.x/test.yml b/test/cases/020_kernel/019_kmod_4.17.x/test.yml index 4a0f62459..4371f4513 100644 --- a/test/cases/020_kernel/019_kmod_4.17.x/test.yml +++ b/test/cases/020_kernel/019_kmod_4.17.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index d3c21c300..2629d4e3e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index e830da7d0..100cf141c 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 1a9415cb4..4c50e9102 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 1a9415cb4..4c50e9102 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 4e5a39f47..6de760115 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 4e5a39f47..6de760115 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index 1cecde5db..bca20c0fa 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index 38c2b26e4..be850661f 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index 55709abca..bbc03720a 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index 55709abca..bbc03720a 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index f131b42d8..8fc5d6956 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index f131b42d8..8fc5d6956 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index 06836f097..bafe11d93 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index cf4808f28..8fa9d5f58 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index 97668da20..db89d33b9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index 97668da20..db89d33b9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index b84f03d70..715a187e9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index b84f03d70..715a187e9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 87af31eac..ae541e9b9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index 6f22b7fa7..a02309fd3 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index 833344251..082a5c725 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index 833344251..082a5c725 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index 0bb440f93..cf6170e53 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index 0bb440f93..cf6170e53 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 77f5f1012..1e8c299e1 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index ce90ad86e..17882a2d4 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index 054223ef9..7b5231f2b 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index 054223ef9..7b5231f2b 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index 5f2f54194..cc93d3204 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index 5f2f54194..cc93d3204 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index 03d8033a5..2c703fcd0 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index 74db36406..aff9c6021 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index 3ae378aa8..6b0bd3551 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index 3ae378aa8..6b0bd3551 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index 1dbbde602..3f9147764 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index 1dbbde602..3f9147764 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index a59fb05ea..cdf616062 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index d44768c69..9084a9a20 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index 4e7803f29..cae28ea5e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index 4e7803f29..cae28ea5e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index 3a6b81ca6..22e358bf1 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index 3a6b81ca6..22e358bf1 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index 1df5d90c0..6dc698d8d 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index 6a81f6839..50b254e74 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index 67dcae6e2..9a963f2f8 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index 67dcae6e2..9a963f2f8 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index b9b19762b..b7e001cac 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index b9b19762b..b7e001cac 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index 031afe865..fa4cc917a 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml index 923688f47..b61f8b3fd 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index 488e6288e..bd8650f5d 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml index 488e6288e..bd8650f5d 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index aa355879c..6d8bfd6d9 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml index aa355879c..6d8bfd6d9 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index b94b8c5c1..8e5019aba 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml index 19f1f8bbf..2d6826a46 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index b516577de..3d0bacaa7 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml index b516577de..3d0bacaa7 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index 70f21d011..52e8a6582 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml index 70f21d011..52e8a6582 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml index f900b608c..8679e1851 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml index 880821727..ba75d9a2f 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml index e38ac9a0c..41cf132a5 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml index 6a66012d2..49b1fd36e 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml index 319850955..d1ab7a80b 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml index 4d77cc384..25e9b95e2 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml index 7e069d655..91f96daf0 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:d11ee39370e09038da0e8ca0dcc2f277f3cc22ef + image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index bc9a1ef0c..41a4f7903 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -34,7 +34,7 @@ services: - /run:/var/run command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] - name: test-docker-bench - image: linuxkit/test-docker-bench:401fed45d409a8547cb27fd107994b933aedaba4 + image: linuxkit/test-docker-bench:a76248a8eeb333ff00cc360e2a97e4d37938c631 ipc: host pid: host net: host diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index cb7659ea5..58da691b7 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -12,7 +12,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 38dce9aab..2ca14bd5a 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -14,7 +14,7 @@ onboot: - /proc/sys/fs/binfmt_misc:/binfmt_misc command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index fbf7ae29b..b2cbe8e39 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -13,7 +13,7 @@ onboot: - /etc:/host-etc command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index e59a93da3..3f72781e0 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -18,9 +18,9 @@ onboot: image: linuxkit/mount:v0.5 command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:b3d96cddad849558e9c24ae54869e297aa5e33e3 + image: linuxkit/test-containerd:ec269f8954d49075341c817a6b403d3359c9823d - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 trust: org: - linuxkit diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 604df7177..8bb3bfa9e 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -15,7 +15,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 22f325147..796d93ace 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -16,7 +16,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index d78464720..ccd4083a8 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -17,7 +17,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 014113add..2954d2d67 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -20,7 +20,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 13bbabb40..7e1621df9 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -21,7 +21,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 22628e27e..6b59bb8c1 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -17,7 +17,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index f86ab13ad..983cfda75 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index f83805956..9c478d292 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 31248f76c..c01d99fe5 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 74a7b93e4..db8c5826b 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 04b76d604..2fff6e28f 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -21,7 +21,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 91f5f4086..5ac9b7942 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index 5c87758c2..9acfe6332 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -26,7 +26,7 @@ onboot: - CAP_SYS_ADMIN - CAP_MKNOD - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 80feb47c0..5f234941f 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -25,7 +25,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 50a458e56..ff57b438b 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -8,7 +8,7 @@ onboot: - name: mkimage image: linuxkit/mkimage:v0.5 - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 trust: org: - linuxkit diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 10219fa9d..ce2808139 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 onboot: - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 trust: org: - linuxkit diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 8bcafad51..dd64b7d64 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -16,7 +16,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 8812c549f..e9d589035 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -11,7 +11,7 @@ onboot: binds: - /etc/ltp/baseline:/etc/ltp/baseline - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 files: - path: /etc/ltp/baseline contents: "100" diff --git a/test/hack/test.yml b/test/hack/test.yml index 1dfca2a89..e2046b9ee 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -12,9 +12,9 @@ onboot: image: linuxkit/dhcpcd:v0.5 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: linuxkit/test-kernel-config:a780a39198cf98e2b93b773b36f9fc40a278edd0 + image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 9a03e266a..8b1de1db8 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -14,7 +14,7 @@ onboot: - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: From 6fcd0e842986b3e6e202fb1e296ceba66681420e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 20:02:29 +0100 Subject: [PATCH 06/13] tests: Update tests cases to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/010_kmod_4.4.x/Dockerfile | 2 +- test/cases/020_kernel/011_kmod_4.9.x/Dockerfile | 2 +- test/cases/020_kernel/016_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/019_kmod_4.17.x/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile index a14cb8a34..4c6eeda70 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile +++ b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.4.144 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index 461e9925a..53e06f41f 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.9.115 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile index 5dd89cb7a..adf9ec17d 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.14.58 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile b/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile index ee4eb0e54..b05d7385c 100644 --- a/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile +++ b/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.17.10 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / From 21ff90c4c7ee2fdb5682365acce65127a19af4e5 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 20:03:09 +0100 Subject: [PATCH 07/13] pkgs: Update packages to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- pkg/acpid/Dockerfile | 4 ++-- pkg/auditd/Dockerfile | 2 +- pkg/binfmt/Dockerfile | 2 +- pkg/ca-certificates/Dockerfile | 2 +- pkg/cadvisor/Dockerfile | 4 ++-- pkg/containerd/Dockerfile | 2 +- pkg/dhcpcd/Dockerfile | 2 +- pkg/extend/Dockerfile | 4 ++-- pkg/firmware-all/Dockerfile | 2 +- pkg/firmware/Dockerfile | 2 +- pkg/format/Dockerfile | 4 ++-- pkg/getty/Dockerfile | 2 +- pkg/host-timesync-daemon/Dockerfile | 2 +- pkg/init/Dockerfile | 4 ++-- pkg/ip/Dockerfile | 2 +- pkg/kmsg/Dockerfile | 2 +- pkg/logwrite/Dockerfile | 2 +- pkg/memlogd/Dockerfile | 2 +- pkg/metadata/Dockerfile | 2 +- pkg/mkimage/Dockerfile | 2 +- pkg/modprobe/Dockerfile | 2 +- pkg/mount/Dockerfile | 4 ++-- pkg/node_exporter/Dockerfile | 2 +- pkg/open-vm-tools/Dockerfile | 2 +- pkg/openntpd/Dockerfile | 2 +- pkg/qemu-ga/Dockerfile | 2 +- pkg/rngd/Dockerfile | 2 +- pkg/runc/Dockerfile | 2 +- pkg/sshd/Dockerfile | 2 +- pkg/swap/Dockerfile | 2 +- pkg/sysctl/Dockerfile | 2 +- pkg/sysfs/Dockerfile | 2 +- pkg/trim-after-delete/Dockerfile | 2 +- pkg/tss/Dockerfile | 2 +- pkg/vpnkit-expose-port/Dockerfile | 2 +- pkg/vpnkit-forwarder/Dockerfile | 2 +- pkg/vsudd/Dockerfile | 2 +- 37 files changed, 43 insertions(+), 43 deletions(-) diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile index d8d45814e..d25d7c97a 100644 --- a/pkg/acpid/Dockerfile +++ b/pkg/acpid/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -6,7 +6,7 @@ RUN apk add --no-cache --initdb -p /out \ busybox RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror2 +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror2 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ busybox-initscripts diff --git a/pkg/auditd/Dockerfile b/pkg/auditd/Dockerfile index b60b3cbdd..c3f907677 100644 --- a/pkg/auditd/Dockerfile +++ b/pkg/auditd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --initdb -p /out alpine-baselayout apk-tools audit busybox tini diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index f67e7e168..ee00a5354 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y qemu-user-static && \ mv /usr/bin/qemu-arm-static /usr/bin/qemu-arm && \ mv /usr/bin/qemu-ppc64le-static /usr/bin/qemu-ppc64le -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile index ac8bd6f82..16fa4f7bf 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc as alpine +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as alpine RUN apk add ca-certificates diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index d1112a722..ad2138362 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc as build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as build RUN apk add --no-cache bash go git musl-dev linux-headers make @@ -16,7 +16,7 @@ RUN go get -d ${GITREPO} \ && mv cadvisor /usr/bin/ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 72f16f721..4967ce3b9 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2 as alpine +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index f2a273e56..ff9b8a098 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/extend/Dockerfile b/pkg/extend/Dockerfile index f22901331..645bf56ae 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/firmware-all/Dockerfile b/pkg/firmware-all/Dockerfile index 50e59ccee..96bc2c48b 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache git # Make sure you also update the FW_COMMIT in ../firmware/Dockerfile diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index 3019443d7..27dc1f386 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -1,7 +1,7 @@ # Make modules from a recentish kernel available FROM linuxkit/kernel:4.14.28 AS kernel -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache git kmod # Clone the firmware repository diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 37340e490..7155d5240 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index ca4ed5793..546617d2a 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/host-timesync-daemon/Dockerfile b/pkg/host-timesync-daemon/Dockerfile index 1e4552295..e56c16fc2 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go musl-dev git ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index c6788b91e..fa42bff12 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2 AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service -FROM linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2 AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile index 936a96226..211324f39 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add curl RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/kmsg/Dockerfile b/pkg/kmsg/Dockerfile index 77563b1ed..2b4b162ca 100644 --- a/pkg/kmsg/Dockerfile +++ b/pkg/kmsg/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/logwrite/Dockerfile b/pkg/logwrite/Dockerfile index 3ba6c8bb4..8846938ee 100644 --- a/pkg/logwrite/Dockerfile +++ b/pkg/logwrite/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/memlogd/Dockerfile b/pkg/memlogd/Dockerfile index 48f789cd4..88f4b0291 100644 --- a/pkg/memlogd/Dockerfile +++ b/pkg/memlogd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/metadata/Dockerfile b/pkg/metadata/Dockerfile index 325c69050..ae5b5afe4 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/mkimage/Dockerfile b/pkg/mkimage/Dockerfile index 60f4b15a2..2dc258ad2 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/modprobe/Dockerfile b/pkg/modprobe/Dockerfile index 6603422d8..23a818ba3 100644 --- a/pkg/modprobe/Dockerfile +++ b/pkg/modprobe/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile index 50f5a54d2..fffd1189a 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -9,7 +9,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/node_exporter/Dockerfile b/pkg/node_exporter/Dockerfile index 93d769835..4df0b49b5 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc as build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as build RUN apk add --no-cache go git musl-dev make diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index 6044bf841..720f18134 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile index cd80783dd..fbea3e5b2 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/qemu-ga/Dockerfile b/pkg/qemu-ga/Dockerfile index 575ec466b..8defae1fb 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/var/run RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index 5b5c69423..0bc5a4dc0 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go gcc musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index 55312bb5e..c53fc2755 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc as alpine +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index c78774df1..dd13ca5fc 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/swap/Dockerfile b/pkg/swap/Dockerfile index 03f1aa745..b326c06d2 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/sysctl/Dockerfile b/pkg/sysctl/Dockerfile index bd1f08be7..4db00c1d0 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile index c5004cd86..fb496f213 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/trim-after-delete/Dockerfile b/pkg/trim-after-delete/Dockerfile index 5255be390..0ae9efe78 100644 --- a/pkg/trim-after-delete/Dockerfile +++ b/pkg/trim-after-delete/Dockerfile @@ -1,5 +1,5 @@ # We need the `fstrim` binary: -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/tss/Dockerfile b/pkg/tss/Dockerfile index 5997e0041..631b69b76 100644 --- a/pkg/tss/Dockerfile +++ b/pkg/tss/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build ENV TROUSERS_COMMIT de57f069ef2297d6a6b3a0353e217a5a2f66e444 ENV TPM_TOOLS_COMMIT bdf9f1bc8f63cd6fc370c2deb58d03ac55079e84 diff --git a/pkg/vpnkit-expose-port/Dockerfile b/pkg/vpnkit-expose-port/Dockerfile index dacb3cfc5..3f2ec7075 100644 --- a/pkg/vpnkit-expose-port/Dockerfile +++ b/pkg/vpnkit-expose-port/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vpnkit-forwarder/Dockerfile b/pkg/vpnkit-forwarder/Dockerfile index ecbb616e4..d6383f973 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vsudd/Dockerfile b/pkg/vsudd/Dockerfile index 8975b018c..be283f40f 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror +FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin From 30842251808b68e707647f301872cb88a1bf73b1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 20:06:45 +0100 Subject: [PATCH 08/13] example: Update docker DIND to 18.06.0 Signed-off-by: Rolf Neugebauer --- examples/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/docker.yml b/examples/docker.yml index 880d9891e..af8741256 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -28,7 +28,7 @@ services: - name: ntpd image: linuxkit/openntpd:v0.5 - name: docker - image: docker:18.05.0-ce-dind + image: docker:18.06.0-ce-dind capabilities: - all net: host From d5d4d6fe0d51dfac736b912b965c28d09efb4dea Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 20:57:30 +0100 Subject: [PATCH 09/13] Update package tags to v0.6 Signed-off-by: Rolf Neugebauer --- contrib/crosvm/README.md | 8 ++-- examples/aws.yml | 18 ++++----- examples/azure.yml | 16 ++++---- examples/cadvisor.yml | 26 ++++++------ examples/docker-for-mac.yml | 40 +++++++++---------- examples/docker.yml | 24 +++++------ examples/gcp.yml | 20 +++++----- examples/getty.yml | 16 ++++---- examples/hostmount-writeable-overlay.yml | 16 ++++---- examples/influxdb-os.yml | 12 +++--- examples/logging.yml | 20 +++++----- examples/minimal.yml | 10 ++--- examples/node_exporter.yml | 14 +++---- examples/openstack.yml | 18 ++++----- examples/packet.arm64.yml | 2 +- examples/packet.yml | 24 +++++------ examples/redis-os.yml | 10 ++--- examples/rt-for-vmware.yml | 18 ++++----- examples/scaleway.yml | 20 +++++----- examples/sshd.yml | 20 +++++----- examples/swap.yml | 22 +++++----- examples/tpm.yml | 18 ++++----- examples/vmware.yml | 16 ++++---- examples/vpnkit-forwarder.yml | 12 +++--- examples/vsudd-containerd.yml | 10 ++--- examples/vultr.yml | 20 +++++----- examples/wireguard.yml | 20 +++++----- linuxkit.yml | 16 ++++---- .../clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 22 +++++----- projects/compose/compose-static.yml | 22 +++++----- projects/ima-namespace/ima-namespace.yml | 14 +++---- projects/landlock/landlock.yml | 2 +- projects/memorizer/memorizer.yml | 10 ++--- projects/miragesdk/examples/fdd.yml | 16 ++++---- projects/miragesdk/examples/mirage-dhcp.yml | 12 +++--- projects/okernel/examples/okernel_simple.yaml | 14 +++---- projects/shiftfs/shiftfs.yml | 16 ++++---- src/cmd/linuxkit/moby/linuxkit.go | 6 +-- test/cases/000_build/000_formats/test.yml | 6 +-- .../000_qemu/000_run_kernel+initrd/test.yml | 4 +- .../000_qemu/005_run_kernel+squashfs/test.yml | 4 +- .../000_qemu/010_run_iso/test.yml | 4 +- .../000_qemu/020_run_efi/test.yml | 4 +- .../000_qemu/030_run_qcow_bios/test.yml | 4 +- .../000_qemu/040_run_raw_bios/test.yml | 4 +- .../000_qemu/050_run_aws/test.yml | 4 +- .../000_qemu/100_container/test.yml | 4 +- .../000_run_kernel+initrd/test.yml | 4 +- .../005_run_kernel+squashfs/test.yml | 4 +- .../010_hyperkit/010_acpi/test.yml | 8 ++-- .../020_kernel/000_config_4.4.x/test.yml | 4 +- .../020_kernel/001_config_4.9.x/test.yml | 4 +- .../020_kernel/006_config_4.14.x/test.yml | 4 +- .../020_kernel/009_config_4.17.x/test.yml | 4 +- test/cases/020_kernel/010_kmod_4.4.x/test.yml | 4 +- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 4 +- .../cases/020_kernel/016_kmod_4.14.x/test.yml | 4 +- .../cases/020_kernel/019_kmod_4.17.x/test.yml | 4 +- .../cases/020_kernel/110_namespace/common.yml | 4 +- .../030_security/000_docker-bench/test.yml | 20 +++++----- test/cases/030_security/010_ports/test.yml | 4 +- test/cases/040_packages/002_binfmt/test.yml | 6 +-- .../040_packages/003_ca-certificates/test.yml | 6 +-- .../040_packages/003_containerd/test.yml | 16 ++++---- test/cases/040_packages/004_dhcpcd/test.yml | 6 +-- .../005_extend/000_ext4/test-create.yml | 8 ++-- .../040_packages/005_extend/000_ext4/test.yml | 8 ++-- .../005_extend/001_btrfs/test-create.yml | 10 ++--- .../005_extend/001_btrfs/test.yml | 10 ++--- .../005_extend/002_xfs/test-create.yml | 8 ++-- .../040_packages/005_extend/002_xfs/test.yml | 8 ++-- .../006_format_mount/000_auto/test.yml | 8 ++-- .../006_format_mount/001_by_label/test.yml | 8 ++-- .../006_format_mount/002_by_name/test.yml.in | 8 ++-- .../006_format_mount/003_btrfs/test.yml | 10 ++--- .../006_format_mount/004_xfs/test.yml | 8 ++-- .../005_by_device_force/test.yml | 14 +++---- .../006_format_mount/010_multiple/test.yml | 12 +++--- .../007_getty-containerd/test.yml | 12 +++--- .../040_packages/013_mkimage/mkimage.yml | 6 +-- test/cases/040_packages/013_mkimage/run.yml | 4 +- test/cases/040_packages/019_sysctl/test.yml | 6 +-- .../cases/040_packages/023_wireguard/test.yml | 14 +++---- test/cases/040_packages/030_logwrite/test.yml | 12 +++--- test/cases/040_packages/031_kmsg/test.yml | 14 +++---- test/hack/test-ltp.yml | 6 +-- test/hack/test.yml | 8 ++-- test/pkg/ns/template.yml | 4 +- 89 files changed, 488 insertions(+), 488 deletions(-) diff --git a/contrib/crosvm/README.md b/contrib/crosvm/README.md index 4a1721fdc..253e263d9 100644 --- a/contrib/crosvm/README.md +++ b/contrib/crosvm/README.md @@ -33,12 +33,12 @@ kernel: image: linuxkit/kernel:4.9.115 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true trust: diff --git a/examples/aws.yml b/examples/aws.yml index eaa3233c5..ab712c611 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251 + image: linuxkit/metadata:v0.6 services: - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.5 + image: linuxkit/sshd:v0.6 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index 185ddbdd0..e701544a2 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 services: - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 - name: sshd - image: linuxkit/sshd:v0.5 + image: linuxkit/sshd:v0.6 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index ce2ac564a..6cf2057a0 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysfs - image: linuxkit/sysfs:v0.5 + image: linuxkit/sysfs:v0.6 - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: ntpd - image: linuxkit/openntpd:v0.5 + image: linuxkit/openntpd:v0.6 - name: docker image: docker:17.10.0-ce-dind @@ -46,7 +46,7 @@ services: - /etc/docker/daemon.json:/etc/docker/daemon.json command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] - name: cadvisor - image: linuxkit/cadvisor:v0.5 + image: linuxkit/cadvisor:v0.6 files: - path: var/lib/docker directory: true diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 40419267c..6837d2395 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -3,30 +3,30 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/vpnkit-expose-port:v0.5 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/vpnkit-expose-port:v0.6 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251 + image: linuxkit/metadata:v0.6 - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: sysfs - image: linuxkit/sysfs:v0.5 + image: linuxkit/sysfs:v0.6 - name: binfmt - image: linuxkit/binfmt:v0.5 + image: linuxkit/binfmt:v0.6 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:v0.5 + image: linuxkit/swap:v0.6 command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"] # mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding - name: mount-vpnkit @@ -44,41 +44,41 @@ onboot: - /var:/host_var command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:v0.5 + image: linuxkit/acpid:v0.6 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:v0.5 + image: linuxkit/openntpd:v0.6 # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:v0.5 + image: linuxkit/vsudd:v0.6 binds: - /var/run:/var/run command: ["/vsudd", "-inport", "2376:unix:/var/run/docker.sock"] # vpnkit-forwarder forwards network traffic to/from the host via VSOCK port 62373. # It needs access to the vpnkit 9P coordination share - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:v0.5 + image: linuxkit/vpnkit-forwarder:v0.6 binds: - /var/vpnkit:/port net: host command: ["/vpnkit-forwarder", "-vsockPort", "62373"] # Monitor for image deletes and invoke a TRIM on the container filesystem - name: trim-after-delete - image: linuxkit/trim-after-delete:v0.5 + image: linuxkit/trim-after-delete:v0.6 # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:v0.5 + image: linuxkit/host-timesync-daemon:v0.6 # Run dockerd with the vpnkit userland proxy from the vpnkit-forwarder container. # Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit # for vpnkit coordination and /run/config/docker for the configuration file. diff --git a/examples/docker.yml b/examples/docker.yml index af8741256..26aa24472 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,31 +2,31 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: sysfs - image: linuxkit/sysfs:v0.5 + image: linuxkit/sysfs:v0.6 - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 - name: ntpd - image: linuxkit/openntpd:v0.5 + image: linuxkit/openntpd:v0.6 - name: docker image: docker:18.06.0-ce-dind capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index 33e8f8623..07e152385 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251 + image: linuxkit/metadata:v0.6 services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.5 + image: linuxkit/sshd:v0.6 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 0f3677481..5f37f638d 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 362fd5e9c..2c685a481 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true runtime: @@ -30,7 +30,7 @@ services: destination: writeable-host-etc options: ["rw", "lowerdir=/etc", "upperdir=/run/hostetc/upper", "workdir=/run/hostetc/work"] - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index fa10f22ad..2dc3efbf3 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: influxdb diff --git a/examples/logging.yml b/examples/logging.yml index bd2eda70e..89a896c05 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,21 +3,21 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 - - linuxkit/memlogd:ba4fcf55c35a3833546a1e39125bf0fa940327b0 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 + - linuxkit/memlogd:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Inside the getty type `/proc/1/root/usr/bin/logread -F` to follow the log - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true # A service which generates log messages for testing @@ -25,9 +25,9 @@ services: image: alpine:3.8 command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); sleep 1; done" ] - name: write-and-rotate-logs - image: linuxkit/logwrite:d9778c0d538094d398cf0cbfc89277aeca67f1be + image: linuxkit/logwrite:v0.6 - name: kmsg - image: linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0 + image: linuxkit/kmsg:v0.6 trust: org: - linuxkit diff --git a/examples/minimal.yml b/examples/minimal.yml index 7b4137e8d..997b6a7af 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index a48d1e172..6515c84cb 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 - name: node_exporter - image: linuxkit/node_exporter:v0.5 + image: linuxkit/node_exporter:v0.6 trust: org: - linuxkit diff --git a/examples/openstack.yml b/examples/openstack.yml index 6591848b8..40b34370b 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251 + image: linuxkit/metadata:v0.6 command: ["/usr/bin/metadata", "openstack"] services: - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.5 + image: linuxkit/sshd:v0.6 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/packet.arm64.yml b/examples/packet.arm64.yml index c6d52074c..93b2b3b67 100644 --- a/examples/packet.arm64.yml +++ b/examples/packet.arm64.yml @@ -10,5 +10,5 @@ kernel: ucode: "" onboot: - name: modprobe - image: linuxkit/modprobe:v0.5 + image: linuxkit/modprobe:v0.6 command: ["modprobe", "nicvf"] diff --git a/examples/packet.yml b/examples/packet.yml index 90b2ff17b..ea43a783e 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 - - linuxkit/firmware:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 + - linuxkit/firmware:v0.6 onboot: - name: rngd1 - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251 + image: linuxkit/metadata:v0.6 command: ["/usr/bin/metadata", "packet"] services: - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:v0.5 + image: linuxkit/sshd:v0.6 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index c556bd859..320f694f3 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true # Currently redis:4.0.6-alpine has trust issue with multi-arch diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index c235bae3e..ee821c7c4 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.58-rt cmdline: "console=tty0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 - name: open-vm-tools - image: linuxkit/open-vm-tools:v0.5 + image: linuxkit/open-vm-tools:v0.6 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/scaleway.yml b/examples/scaleway.yml index b37945f16..28f97ae44 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: rngd1 - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 command: ["/sbin/rngd", "-1"] - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251 + image: linuxkit/metadata:v0.6 services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 trust: org: - linuxkit diff --git a/examples/sshd.yml b/examples/sshd.yml index 7b68b5dbb..6d48be8d0 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: rngd1 - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 - name: sshd - image: linuxkit/sshd:v0.5 + image: linuxkit/sshd:v0.6 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index 04f038667..3a2b701ff 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:v0.5 + image: linuxkit/swap:v0.6 # to use unencrypted swap, use: # command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G"] command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 trust: org: - linuxkit diff --git a/examples/tpm.yml b/examples/tpm.yml index d5e596012..390f548e2 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: tss - image: linuxkit/tss:v0.5 + image: linuxkit/tss:v0.6 - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/vmware.yml b/examples/vmware.yml index b9c1e3d88..2beaa3207 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,22 +2,22 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 2c72881ae..c562661ea 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.8 @@ -19,9 +19,9 @@ onboot: command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] services: - name: sshd - image: linuxkit/sshd:v0.5 + image: linuxkit/sshd:v0.6 - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:v0.5 + image: linuxkit/vpnkit-forwarder:v0.6 binds: - /var/vpnkit:/port net: host diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 632356bf5..39fae1035 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:v0.5 + image: linuxkit/vsudd:v0.6 binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/examples/vultr.yml b/examples/vultr.yml index 33e8f8623..07e152385 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251 + image: linuxkit/metadata:v0.6 services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.5 + image: linuxkit/sshd:v0.6 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 95f44f59a..adc4aa9cc 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:v0.5 + image: linuxkit/ip:v0.6 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:v0.5 + image: linuxkit/ip:v0.6 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,12 +40,12 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true net: /run/netns/wg1 - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: nginx image: nginx:1.13.8-alpine net: /run/netns/wg0 diff --git a/linuxkit.yml b/linuxkit.yml index d0774db23..183c47e6e 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -18,11 +18,11 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index ceaf9ac68..96a626b34 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-clear-containers:4.9.x cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 + - linuxkit/init:v0.6 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index e051a3e65..afb122ab5 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: sysfs - image: linuxkit/sysfs:v0.5 + image: linuxkit/sysfs:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: ntpd - image: linuxkit/openntpd:v0.5 + image: linuxkit/openntpd:v0.6 - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index da2b54ada..67288be6a 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: sysfs - image: linuxkit/sysfs:v0.5 + image: linuxkit/sysfs:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: ntpd - image: linuxkit/openntpd:v0.5 + image: linuxkit/openntpd:v0.6 - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 3e65927b2..a155053aa 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 062f794b0..7d4a72707 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: mobylinux/kernel-landlock:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 + - linuxkit/init:v0.6 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 13e4c6084..a03e5a1da 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,16 +2,16 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540" cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 98d0f0162..5391236c8 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 - samoht/fdd onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 files: - path: etc/init.d/020-fdd-init mode: "0700" diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 381b13220..4abf7a338 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcp-client image: miragesdk/dhcp-client:22aa9d527820534295a8cd59901c0c5197af6585 net: host @@ -28,9 +28,9 @@ onboot: - /lib:/lib # for ifconfig services: - name: sshd - image: linuxkit/sshd:v0.5 + image: linuxkit/sshd:v0.6 - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index e6c65a776..6eb4a23a9 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,18 +2,18 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 services: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 3805ab634..79a87a59c 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,23 +2,23 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index 50a3d1c7e..8091058b0 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -17,11 +17,11 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:00ab58c9681a0bf42b2e35134c1ccf1591ebb64d - - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: mkimage - image: linuxkit/mkimage:50bde8b00eb82e08f12dd9cc29f36c77f5638426 + image: linuxkit/mkimage:v0.6 - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 trust: diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index ae7467330..c79fffe25 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index 41a0f129f..18184308c 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index 41a0f129f..18184308c 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 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 2376167bd..b59fc0e00 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 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 772126732..4edc29771 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 772126732..4edc29771 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 772126732..4edc29771 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 772126732..4edc29771 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 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 47d448ac9..f97bd06ac 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 772126732..4edc29771 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 772126732..4edc29771 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 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 55ef60b48..19c9ec6e9 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 services: - name: acpid - image: linuxkit/acpid:v0.5 + image: linuxkit/acpid:v0.6 trust: org: - linuxkit diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index 8c611e277..ff7d04c5d 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.144 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index 6e4032503..f0c9b38ca 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.115 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index 676a14af5..3e7d7494b 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac diff --git a/test/cases/020_kernel/009_config_4.17.x/test.yml b/test/cases/020_kernel/009_config_4.17.x/test.yml index 61e1f325c..906803138 100644 --- a/test/cases/020_kernel/009_config_4.17.x/test.yml +++ b/test/cases/020_kernel/009_config_4.17.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.17.10 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml index 601d7ef0f..fa6cebf3d 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.144 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index 0ef2d22fd..5a6474f21 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.115 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml index 93ba75a9e..b4450a643 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/019_kmod_4.17.x/test.yml b/test/cases/020_kernel/019_kmod_4.17.x/test.yml index 4371f4513..076606c1d 100644 --- a/test/cases/020_kernel/019_kmod_4.17.x/test.yml +++ b/test/cases/020_kernel/019_kmod_4.17.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.17.10 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/110_namespace/common.yml b/test/cases/020_kernel/110_namespace/common.yml index cd4380b7b..410f0d999 100644 --- a/test/cases/020_kernel/110_namespace/common.yml +++ b/test/cases/020_kernel/110_namespace/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 trust: org: - linuxkit diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 41a4f7903..c291f0e41 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: sysfs - image: linuxkit/sysfs:v0.5 + image: linuxkit/sysfs:v0.6 - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:v0.5 + image: linuxkit/rngd:v0.6 - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 58da691b7..594b37570 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 2ca14bd5a..91ea0061a 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: binfmt - image: linuxkit/binfmt:v0.5 + image: linuxkit/binfmt:v0.6 - name: test image: alpine:3.8 binds: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index b2cbe8e39..6715ce3d1 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 3f72781e0..adb839001 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib"] - name: test image: linuxkit/test-containerd:ec269f8954d49075341c817a6b403d3359c9823d diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 8bb3bfa9e..4cacac0f6 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 796d93ace..894af461a 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index ccd4083a8..8643a89cf 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: extend - image: linuxkit/extend:v0.5 + image: linuxkit/extend:v0.6 - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 2954d2d67..083a316f9 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: modprobe - image: linuxkit/modprobe:v0.5 + image: linuxkit/modprobe:v0.6 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 7e1621df9..e9093bfe0 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: modprobe - image: linuxkit/modprobe:v0.5 + image: linuxkit/modprobe:v0.6 command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:v0.5 + image: linuxkit/extend:v0.6 command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 6b59bb8c1..cfa020460 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 983cfda75..f41b0e1e1 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: extend - image: linuxkit/extend:v0.5 + image: linuxkit/extend:v0.6 command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index 9c478d292..90a154258 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index c01d99fe5..36e1987aa 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index db8c5826b..440ed9636 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 2fff6e28f..3f24f6cdc 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: modprobe - image: linuxkit/modprobe:v0.5 + image: linuxkit/modprobe:v0.6 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 5ac9b7942..9aaa8eebd 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index 9acfe6332..10e318f44 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 5f234941f..dbf2ee49f 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:v0.5 + image: linuxkit/format:v0.6 command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:v0.5 + image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index ab4748bef..272312ee5 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.5 + image: linuxkit/getty:v0.6 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index ff57b438b..2630e999d 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: mkimage - image: linuxkit/mkimage:v0.5 + image: linuxkit/mkimage:v0.6 - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 trust: diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index ce2808139..9e66b06e8 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index dd64b7d64..928164719 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: sysctl - image: linuxkit/sysctl:v0.5 + image: linuxkit/sysctl:v0.6 - name: test image: alpine:3.8 net: host diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index adfabbdbb..ce8e97d95 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:v0.5 + image: linuxkit/ip:v0.6 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:v0.5 + image: linuxkit/ip:v0.6 net: new binds: - /etc/wireguard:/etc/wireguard diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index 250564470..92f03d3ff 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 - - linuxkit/memlogd:ba4fcf55c35a3833546a1e39125bf0fa940327b0 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 + - linuxkit/memlogd:v0.6 services: # A service which generates logs of log messages - name: fill-the-logs image: alpine command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); done" ] - name: write-and-rotate-logs - image: linuxkit/logwrite:d9778c0d538094d398cf0cbfc89277aeca67f1be + image: linuxkit/logwrite:v0.6 command: ["/usr/bin/logwrite", "-max-log-size", "1024"] - name: check-the-logs image: alpine:3.8 diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index d4e365cb5..4f32597e0 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - - linuxkit/ca-certificates:v0.5 - - linuxkit/memlogd:ba4fcf55c35a3833546a1e39125bf0fa940327b0 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 + - linuxkit/ca-certificates:v0.6 + - linuxkit/memlogd:v0.6 services: - name: kmsg - image: linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0 + image: linuxkit/kmsg:v0.6 - name: write-and-rotate-logs - image: linuxkit/logwrite:d9778c0d538094d398cf0cbfc89277aeca67f1be + image: linuxkit/logwrite:v0.6 - name: check-the-logs image: alpine:3.8 binds: diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index e9d589035..38b4eb9b7 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index e2046b9ee..559b8de63 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,12 +4,12 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 - - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 + - linuxkit/containerd:v0.6 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.5 + image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 8b1de1db8..225513dd9 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:4.14.58 cmdline: "console=ttyS0" init: - - linuxkit/init:598439400c1e4bf8c25c63c98b2d3e83b1382be9 - - linuxkit/runc:v0.5 + - linuxkit/init:v0.6 + - linuxkit/runc:v0.6 onboot: - name: test-ns image: linuxkit/test-ns: From bb7961344d90934f4e2d74c22c62f770991bcaa1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 20:59:46 +0100 Subject: [PATCH 10/13] Update my email in AUTHORS and MAINTAINERS Signed-off-by: Rolf Neugebauer --- .mailmap | 7 ++++--- AUTHORS | 2 +- MAINTAINERS | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.mailmap b/.mailmap index 7eb13f462..9c0dc9473 100644 --- a/.mailmap +++ b/.mailmap @@ -48,9 +48,10 @@ Radu Matei Riyaz Faizullabhoy Riyaz Faizullabhoy Robin Winkelewski -Rolf Neugebauer -Rolf Neugebauer -Rolf Neugebauer +Rolf Neugebauer +Rolf Neugebauer +Rolf Neugebauer +Rolf Neugebauer Sebastiaan van Stijn Simon Ferquel Thomas Gazagnaire diff --git a/AUTHORS b/AUTHORS index da869d5aa..4d73ce61a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -94,7 +94,7 @@ Richard Mortier Riyaz Faizullabhoy Robb Kistler Robin Winkelewski -Rolf Neugebauer +Rolf Neugebauer Roman Shaposhnik Rui Lopes Ryoga Saito diff --git a/MAINTAINERS b/MAINTAINERS index 97be6ff18..858bbea56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -195,5 +195,5 @@ on disputes for technical matters." [people.rn] Name = "Rolf Neugebauer" - Email = "rolf.neugebauer@docker.com" + Email = "rn@rneugeba.io" GitHub = "rn" From 8f841600a4e64e07a9de1329a346c2daa39c3dbe Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 21:01:59 +0100 Subject: [PATCH 11/13] doc: Add updating AUTHORS to release steps Signed-off-by: Rolf Neugebauer --- docs/releasing.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/releasing.md b/docs/releasing.md index 273a796da..9e68e9914 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -241,6 +241,7 @@ git commit -a -s -m "Update package tags to $LK_RELEASE" ### Final preparation steps +- Update AUTHORS by running `./scripts/generate-authors.sh` - Update the `VERSION` variable in the top-level `Makefile` - Create an entry in `CHANGELOG.md`. Take a look at `git log v0.3..HEAD` and pick interesting updates (of course adjust `v0.3` to the previous version). - Create a PR with your changes. From 9edd8b232b5cf795a61ed98a93409c311ebca32c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 21:02:29 +0100 Subject: [PATCH 12/13] Bump version to v0.6 Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b6d4a8430..1d06a6859 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION="v0.5+" +VERSION="v0.6" GIT_COMMIT=$(shell git rev-list -1 HEAD) GO_COMPILE=linuxkit/go-compile:e1204ce9921c1d45362a374e06be7234d3bf1184 From 483e7fd111263d7b88392cb43344545f8ceee12a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 26 Jul 2018 21:10:37 +0100 Subject: [PATCH 13/13] Update CHANGELOG Signed-off-by: Rolf Neugebauer --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e33c7273..e83e130ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,24 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). +## [v0.6] - 2018-07-26 +### Added +- `linuxkit build` now works with private repositories and registries. +- `linuxkit pkg build` can build packages with sources outside the package directory. +- New `kernel+iso` format for `linuxkit build`. + +### Changed +- `containerd` updated to v1.1.2. +- WireGuard updated to 0.0.20180718. +- Fixed SSH key handling on GCP. +- Changed name of logfiles when memlogd/logwrite is used. +- `moby/tool` code merged back into `linuxkit/linuxkit` +- Smaller `mkimage-*` packages. + +### Removed + + + ## [v0.5] - 2018-07-10 ### Added - New logging support with log rotation.