From 2810dfe9514c8acce2ec5832e32d3423c221c9e1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 10:47:16 +0100 Subject: [PATCH 01/12] build: Build the s390x linuxkit binary in CI Signed-off-by: Rolf Neugebauer --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 718876795..b4ab90c97 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,6 +33,12 @@ jobs: GOOS: linux GOARCH: arm64 command: make LOCAL_TARGET=bin/linuxkit-$GOOS-$GOARCH local-build + - run: + name: Build arm64/linux + environment: + GOOS: linux + GOARCH: s390x + command: make LOCAL_TARGET=bin/linuxkit-$GOOS-$GOARCH local-build - run: name: Build amd64/darwin environment: From 39b9ac9b7f5cb10de69a76d7e4d1abd1eaeebd41 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 10:49:00 +0100 Subject: [PATCH 02/12] tools: Update tools to the latest alpine base image Signed-off-by: Rolf Neugebauer --- tools/go-compile/Dockerfile | 2 +- tools/mkimage-iso-bios/Dockerfile | 2 +- tools/mkimage-iso-efi/Dockerfile | 4 ++-- tools/mkimage-qcow2-efi/Dockerfile | 4 ++-- tools/mkimage-raw-bios/Dockerfile | 2 +- tools/mkimage-raw-efi/Dockerfile | 4 ++-- tools/mkimage-rpi3/Dockerfile | 2 +- tools/qemu/Dockerfile | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile index bd43a990d..99f9cd984 100644 --- a/tools/go-compile/Dockerfile +++ b/tools/go-compile/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 1cf0af122..03ee463e1 100644 --- a/tools/mkimage-iso-bios/Dockerfile +++ b/tools/mkimage-iso-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 RUN \ apk update && apk upgrade && \ diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile index 048832154..61dc884d8 100644 --- a/tools/mkimage-iso-efi/Dockerfile +++ b/tools/mkimage-iso-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS grub-build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS grub-build RUN apk add \ automake \ @@ -39,7 +39,7 @@ RUN mkdir /grub-lib && \ ;; \ esac -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS make-img +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS make-img RUN \ apk update && apk upgrade && \ diff --git a/tools/mkimage-qcow2-efi/Dockerfile b/tools/mkimage-qcow2-efi/Dockerfile index 385cd368b..57320d34b 100644 --- a/tools/mkimage-qcow2-efi/Dockerfile +++ b/tools/mkimage-qcow2-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS grub-build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS grub-build RUN apk add \ automake \ @@ -40,7 +40,7 @@ RUN mkdir /grub-lib && \ ;; \ esac -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS make-img +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS make-img RUN \ apk update && apk upgrade && \ diff --git a/tools/mkimage-raw-bios/Dockerfile b/tools/mkimage-raw-bios/Dockerfile index 7ed0ba42d..142cbb78a 100644 --- a/tools/mkimage-raw-bios/Dockerfile +++ b/tools/mkimage-raw-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 RUN \ apk update && apk upgrade && \ diff --git a/tools/mkimage-raw-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile index 4fb564989..bc15f8d0a 100644 --- a/tools/mkimage-raw-efi/Dockerfile +++ b/tools/mkimage-raw-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS grub-build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS grub-build RUN apk add \ automake \ @@ -40,7 +40,7 @@ RUN mkdir /grub-lib && \ ;; \ esac -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS make-img +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS make-img RUN \ apk update && apk upgrade && \ diff --git a/tools/mkimage-rpi3/Dockerfile b/tools/mkimage-rpi3/Dockerfile index ac63435b0..5f2df7fd7 100644 --- a/tools/mkimage-rpi3/Dockerfile +++ b/tools/mkimage-rpi3/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 as build RUN apk add \ bc \ dtc \ diff --git a/tools/qemu/Dockerfile b/tools/qemu/Dockerfile index 88978be9a..17bf99011 100644 --- a/tools/qemu/Dockerfile +++ b/tools/qemu/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 e03703dede66147e377a7173cc6c8e5ec015c2d4 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 10:58:01 +0100 Subject: [PATCH 03/12] build: Update go-compile to the latest Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- docs/vendoring.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9c370dd35..df2a36153 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ all: default VERSION="v0.2+" GIT_COMMIT=$(shell git rev-list -1 HEAD) -GO_COMPILE=linuxkit/go-compile:7392985c6f55aba61201514174b45ba755fb386e +GO_COMPILE=linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931 LINUXKIT?=bin/linuxkit GOOS?=$(shell uname -s | tr '[:upper:]' '[:lower:]') diff --git a/docs/vendoring.md b/docs/vendoring.md index d5d779974..d3044834b 100644 --- a/docs/vendoring.md +++ b/docs/vendoring.md @@ -28,7 +28,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:7392985c6f55aba61201514174b45ba755fb386e +linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931 ``` To update a single dependency: @@ -38,7 +38,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:7392985c6f55aba61201514174b45ba755fb386e +linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931 github.com/docker/docker ``` From 4a0813ec2ea3ab0bbc7b3ea06392d7cef715e48c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 10:59:12 +0100 Subject: [PATCH 04/12] cmd: Update linuxkit/qemu to the latest Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/run_qemu.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/run_qemu.go b/src/cmd/linuxkit/run_qemu.go index 51a5222d9..52d42fe51 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:9113e72ab0aa76a6f6f41c331be2337d3f41d0e6" + QemuImg = "linuxkit/qemu:099ab6ec9a2f38947e839e5f6a02fa0af3529440" defaultFWPath = "/usr/share/ovmf/bios.bin" ) From 3dd5cfcbc91023e182ccfe786d564ff97962ba72 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 11:34:27 +0100 Subject: [PATCH 05/12] tests: Update to the latest alpine base 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/017_kmod_4.15.x/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 ++-- 9 files changed, 11 insertions(+), 11 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 583954332..1748f99a9 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.126 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 2bf5d0da1..35b805836 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.92 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 7851e8cf4..f54ae3824 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.32 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/017_kmod_4.15.x/Dockerfile b/test/cases/020_kernel/017_kmod_4.15.x/Dockerfile index 56f6ce4f2..7bbcdf0d5 100644 --- a/test/cases/020_kernel/017_kmod_4.15.x/Dockerfile +++ b/test/cases/020_kernel/017_kmod_4.15.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.15.15 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/pkg/docker-bench/Dockerfile b/test/pkg/docker-bench/Dockerfile index 448d5ff48..62bac5e4d 100644 --- a/test/pkg/docker-bench/Dockerfile +++ b/test/pkg/docker-bench/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 4d6bb017d..c1898626c 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 c86744672..eb3ee50cc 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build RUN apk add --no-cache \ build-base \ git \ diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile index 019f90407..2edb2be65 100644 --- a/test/pkg/poweroff/Dockerfile +++ b/test/pkg/poweroff/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 c72c288a6..84e907e84 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin From 2d699d4e9b99dec8407ca177938002dcfb2fd1be Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 11:42:39 +0100 Subject: [PATCH 06/12] tests: Update tests packages Signed-off-by: Rolf Neugebauer --- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_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 +- test/cases/010_platforms/010_hyperkit/000_run_kernel/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/007_config_4.15.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/017_kmod_4.15.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 | 2 +- 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 +- 108 files changed, 180 insertions(+), 180 deletions(-) diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 8dce610d4..8eece2b2a 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 734d7df25..26e20a0f3 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:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c073eb919..bea0ba505 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:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c073eb919..bea0ba505 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:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c073eb919..bea0ba505 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:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c073eb919..bea0ba505 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:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 b469885c6..03a1cfc91 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:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index c073eb919..bea0ba505 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 fd446adb6..1e3256d02 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:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:a3eb5aa39ed8e426cc2b33606820edc59301ae4d + image: linuxkit/test-kernel-config:4fa46323e257af310c56950fd551e72d02694214 - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 fb705e4dd..7cfabd39b 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:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:a3eb5aa39ed8e426cc2b33606820edc59301ae4d + image: linuxkit/test-kernel-config:4fa46323e257af310c56950fd551e72d02694214 - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 53190b24d..f83b4ead7 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:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:a3eb5aa39ed8e426cc2b33606820edc59301ae4d + image: linuxkit/test-kernel-config:4fa46323e257af310c56950fd551e72d02694214 - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/007_config_4.15.x/test.yml b/test/cases/020_kernel/007_config_4.15.x/test.yml index 549e960a8..d81dc7c30 100644 --- a/test/cases/020_kernel/007_config_4.15.x/test.yml +++ b/test/cases/020_kernel/007_config_4.15.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:a3eb5aa39ed8e426cc2b33606820edc59301ae4d + image: linuxkit/test-kernel-config:4fa46323e257af310c56950fd551e72d02694214 - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 7f42b3f7a..ccd4f622c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 5d7bce3b7..8a7a6ac92 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 a234af4e3..960eed648 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/017_kmod_4.15.x/test.yml b/test/cases/020_kernel/017_kmod_4.15.x/test.yml index 774803e6c..cb683f4f2 100644 --- a/test/cases/020_kernel/017_kmod_4.15.x/test.yml +++ b/test/cases/020_kernel/017_kmod_4.15.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 3dba4a1b1..9938bdfa1 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 cffc155c7..4e6be30e6 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 1761a6f46..96661ca98 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 1761a6f46..96661ca98 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 7a56484eb..6455eb367 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 7a56484eb..6455eb367 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 ee82a84ba..98da4d904 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 b7f9a3e8e..ba5015bb8 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 ba493194e..a7bf91b7b 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 ba493194e..a7bf91b7b 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 31511f838..4ef4be173 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 31511f838..4ef4be173 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 239c9714d..322ed10b0 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 cc2be4002..44de45135 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 219e0a3fd..2609ac523 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 219e0a3fd..2609ac523 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 f426a294d..39c1ae789 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 f426a294d..39c1ae789 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 2949a3082..d0d480955 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 03076fd24..a9d4841b2 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 0e76bf481..7b7d8b3a6 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 0e76bf481..7b7d8b3a6 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 36649ed3d..45c154af8 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 36649ed3d..45c154af8 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 9690844df..e8b7d8b6f 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 8fb2e5c82..9aba1fc35 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c5ca477ab..fe48f555c 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c5ca477ab..fe48f555c 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 1024edf9d..fd9a7beaf 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 1024edf9d..fd9a7beaf 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 01da74b56..3755cf45b 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 f5723e839..5c7b629e8 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 301f17f03..6307c42e1 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 301f17f03..6307c42e1 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 71ac7c5e9..3fad4c907 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 71ac7c5e9..3fad4c907 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 6eb882469..c335136e6 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 8f9042716..a2743a146 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 3a0273801..fe91563af 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 3a0273801..fe91563af 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 244aace55..1dc38c7ba 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 244aace55..1dc38c7ba 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 272751bcd..a6a85c51a 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 422f5094e..be3b313f9 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 f28f40948..25341856f 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 f28f40948..25341856f 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 44c17178d..9df7a0b54 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 44c17178d..9df7a0b54 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 d35d3db2f..f9a0e56a3 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 b0c7c1626..97ed948ca 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 2cb4a86ae..92b746ecb 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 2cb4a86ae..92b746ecb 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 227648861..41452dbbb 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 227648861..41452dbbb 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c6572a4e8..bef3dd10e 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 b8b63b691..6be14b5bd 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c52904247..0106fddb0 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c52904247..0106fddb0 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 17494740e..9fc91785b 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 17494740e..9fc91785b 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 83aeca8c0..6b518ed5d 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 3c588eafc..79bcbf22d 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 bb11a7b90..7dbf3a1b1 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 2005451ea..76e696829 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 3fc59cabf..a94e5b6bc 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 9cfa79227..887829ee2 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c499a1ee4..86c13f556 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:6843859b224129726a8d5e9b7ec72841c7789dff + image: linuxkit/test-ns:5a3bd9e85fbaade639cb0c285780506a6c2f0d7c command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 dfc671eca..e00487522 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:020e1acd26fd2a01198218a3fd8c86c2f32ba6a6 + image: linuxkit/test-docker-bench:395e2f27a1f37b241abc5a04e05a8b087e471c75 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 c34e972b3..dcd238ad3 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 4b44321e6..880d87c2f 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 11424c849..10df42578 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 4f97fae19..26b749cab 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -20,7 +20,7 @@ onboot: - name: test image: linuxkit/test-containerd:9769b24f2093104dcb837906e3fd6ea34dba55d1 - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae trust: org: - linuxkit diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 1ebc43f1f..8d43786f7 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 388d21dcf..654c6b5f4 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 52ede71a6..ef88e5394 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 17d8d395e..55a1297e1 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 295d64199..96c3e58de 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 9cff9cefa..a3ac0fbe3 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 e946a28c0..fe6397147 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 fba90cc58..3c9f0fe2c 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 c3a9ea4cd..c4369be98 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 3e0e3de0e..681460774 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 62e0308cd..f6cbb18ed 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 6af71ad35..78034dcc5 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 314baedb9..7bb2bcd58 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 b65804b0e..c8dea8165 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 81b611189..d476d492a 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:dccd1028bc96b91702236be8bbacb04477aacc4c - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae trust: org: - linuxkit diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 2e074d596..a9ed375aa 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:17e8c06e48ac220be79b2476e39b4d7feb905524 onboot: - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae trust: org: - linuxkit diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 94dc5a3a2..424d252e5 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 aff10b122..568fa4b48 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae files: - path: /etc/ltp/baseline contents: "100" diff --git a/test/hack/test.yml b/test/hack/test.yml index c64ab2045..89591df13 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -12,9 +12,9 @@ onboot: image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: linuxkit/test-kernel-config:a3eb5aa39ed8e426cc2b33606820edc59301ae4d + image: linuxkit/test-kernel-config:4fa46323e257af310c56950fd551e72d02694214 - name: poweroff - image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index e1488e54a..ae9f015ea 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:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d + image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: From c4f613e047859427ab57169d4689322104646562 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 14:00:10 +0100 Subject: [PATCH 07/12] cmd: Update the moby tool vendoring Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/vendor.conf | 2 +- .../vendor/github.com/moby/tool/src/moby/output.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cmd/linuxkit/vendor.conf b/src/cmd/linuxkit/vendor.conf index 5d12b6cbf..736195899 100644 --- a/src/cmd/linuxkit/vendor.conf +++ b/src/cmd/linuxkit/vendor.conf @@ -26,7 +26,7 @@ github.com/moby/datakit 97b3d230535397a813323902c23751e176481a86 github.com/moby/hyperkit a285521725f44f3d10ca1042c2c07d3a6e24bed8 # When updating also: # curl -fsSL -o src/cmd/linuxkit/build.go https://raw.githubusercontent.com/moby/tool/«hash»/cmd/moby/build.go -github.com/moby/tool f1ae82c9eb338241cccd62443263498ae0461c2c +github.com/moby/tool 486e313fe3069da88948500ceb60d0abfffad464 github.com/moby/vpnkit 0e4293bb1058598c4b0a406ed171f52573ef414c github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448 github.com/opencontainers/image-spec v1.0.0 diff --git a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/output.go b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/output.go index 7f88886b6..c8c859242 100644 --- a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/output.go +++ b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/output.go @@ -14,16 +14,16 @@ import ( ) const ( - isoBios = "linuxkit/mkimage-iso-bios:8c1020d428e78cbe6fa9da023b94d2cb7994cfb9" - isoEfi = "linuxkit/mkimage-iso-efi:d1990ff78a7b15e6f1f368378f2120f55dcf30ab" - rawBios = "linuxkit/mkimage-raw-bios:fa0da669c33543bb04966338aa3091cff9f88398" - rawEfi = "linuxkit/mkimage-raw-efi:eb489af91687d2f8c0456c7058784c0ecba2107c" + isoBios = "linuxkit/mkimage-iso-bios:9a51dc64a461f1cc50ba05f30a38f73f5227ac03" + isoEfi = "linuxkit/mkimage-iso-efi:343cf1a8ac0aba7d8a1f13b7f45fa0b57ab897dc" + rawBios = "linuxkit/mkimage-raw-bios:d90713b2dd610cf9a0f5f9d9095f8bf86f40d5c6" + rawEfi = "linuxkit/mkimage-raw-efi:8938ffb6014543e557b624a40cce1714f30ce4b6" gcp = "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1" vhd = "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242" vmdk = "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5" dynamicvhd = "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6" - rpi3 = "linuxkit/mkimage-rpi3:e76686a5b4fad750bd857bfa239d777d4ab21d6f" - qcow2Efi = "linuxkit/mkimage-qcow2-efi:193ea2d93bbb437552cf58549f166e738d517c24" + rpi3 = "linuxkit/mkimage-rpi3:0f23c4f37cdca99281ca33ac6188e1942fa7a2b8" + qcow2Efi = "linuxkit/mkimage-qcow2-efi:787b54906e14a56b9f1da35dcc8e46bd58435285" ) var outFuns = map[string]func(string, io.Reader, int) error{ From 1695dfa3db249885f180dc42fe16e291a296ef1b Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 14:00:43 +0100 Subject: [PATCH 08/12] build: Bump the version to v0.3 Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df2a36153..7e3bc4b77 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ default: bin/linuxkit bin/rtf all: default -VERSION="v0.2+" +VERSION="v0.3" GIT_COMMIT=$(shell git rev-list -1 HEAD) GO_COMPILE=linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931 From 2d00440351ae740afffeb139da724b787d1f2801 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 14:05:39 +0100 Subject: [PATCH 09/12] pkg: Update to latest alpine base Signed-off-by: Rolf Neugebauer --- pkg/acpid/Dockerfile | 4 ++-- pkg/auditd/Dockerfile | 2 +- pkg/binfmt/Dockerfile | 4 ++-- pkg/ca-certificates/Dockerfile | 2 +- pkg/cadvisor/Dockerfile | 4 ++-- 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/ip/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 +- 32 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile index 6fcb45081..ffae7c43c 100644 --- a/pkg/acpid/Dockerfile +++ b/pkg/acpid/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror2 +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 14a677ed7..1afe7ac22 100644 --- a/pkg/auditd/Dockerfile +++ b/pkg/auditd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 931b5b789..9048e343b 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS qemu +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS qemu RUN apk add \ qemu-aarch64 \ qemu-arm \ qemu-ppc64le -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 6cc178f09..1343c30d5 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as alpine +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 as alpine RUN apk add ca-certificates diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index 8438e9ae3..42df6a5fc 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index 7aa0065b3..c15a945db 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 783e91597..1990f3cac 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 c3e4f4da6..3252ee742 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 bd62b21b1..4db13ed2c 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:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build RUN apk add --no-cache git kmod # Clone the firmware repository diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index c815ee334..5c4bec43c 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 04d46dc4f..53ab5288f 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 5ed0df70c..622f178d9 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror RUN apk add --no-cache go musl-dev git ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile index e684f43e7..a1a730d7f 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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/metadata/Dockerfile b/pkg/metadata/Dockerfile index 4621d3414..4e9360bb6 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 7fdb1580d..5f62870cc 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 926e87426..6853e3b92 100644 --- a/pkg/modprobe/Dockerfile +++ b/pkg/modprobe/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 84aef533f..2943c9b4a 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 f88871cf6..c1aa49825 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 30a058791..2261b7a11 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 2c332ae2e..6f0208808 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 1afee5f8b..24d3ca928 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 084a2df24..db0fc0c02 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 91d5b5e8b..3b8228473 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as alpine +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index 5da23de1b..495ecb174 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 8dc89b240..65cfcf2e0 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 47466fa38..80e9f5a34 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 94f1f571c..b988a36e9 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 cd4ea2880..17524d116 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:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 eda3ed45b..7950915a2 100644 --- a/pkg/tss/Dockerfile +++ b/pkg/tss/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 8305b78f1..9ef669df6 100644 --- a/pkg/vpnkit-expose-port/Dockerfile +++ b/pkg/vpnkit-expose-port/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 005cbffa9..810eb0277 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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 d8ecdb4a0..4e7215263 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror +FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin From db663d30a692e9c689900ae4858f5d97c3fcf6b3 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 15:23:20 +0100 Subject: [PATCH 10/12] Update YAMLs to released packages Signed-off-by: Rolf Neugebauer --- 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/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/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/logging/examples/logging.yml | 14 +++---- 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 ++++---- .../github.com/moby/tool/src/moby/linuxkit.go | 6 +-- test/cases/000_build/000_formats/test.yml | 6 +-- .../000_qemu/000_run_kernel/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 +- .../010_hyperkit/000_run_kernel/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/007_config_4.15.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/017_kmod_4.15.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/hack/test-ltp.yml | 6 +-- test/hack/test.yml | 8 ++-- test/pkg/ns/template.yml | 4 +- 83 files changed, 454 insertions(+), 454 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index bb3fbee1f..6d4219029 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 + image: linuxkit/metadata:v0.3 services: - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: sshd - image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 + image: linuxkit/sshd:v0.3 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index a7502e4e1..ee0fa8e18 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 services: - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 - name: sshd - image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 + image: linuxkit/sshd:v0.3 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index b909fe7d4..b1f46895f 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysfs - image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f + image: linuxkit/sysfs:v0.3 - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: ntpd - image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983 + image: linuxkit/openntpd:v0.3 - 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:5adb222abfcc3e7f21287045d7192aaf9198b80e + image: linuxkit/cadvisor:v0.3 files: - path: var/lib/docker directory: true diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 6e7fc6945..7c18ef52d 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -3,30 +3,30 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/vpnkit-expose-port:3f60b78f78bfb83c14dd459ff7a3f58dacb33ad0 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/vpnkit-expose-port:v0.3 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 + image: linuxkit/metadata:v0.3 - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: sysfs - image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f + image: linuxkit/sysfs:v0.3 - name: binfmt - image: linuxkit/binfmt:98398d827e80b56e487d2ae94ed86a0006acb702 + image: linuxkit/binfmt:v0.3 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:83b2f6d8c1e8196b68215a62269da4b79002aad0 + image: linuxkit/swap:v0.3 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:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:a1399f824db917488d048c5e23ca3cec6e5317d8 + image: linuxkit/acpid:v0.3 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983 + image: linuxkit/openntpd:v0.3 # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:3559f24480e165e0719479146953b461a3e1b99e + image: linuxkit/vsudd:v0.3 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:9dad2e9fb848d6452232deb01e08beda7ba00d21 + image: linuxkit/vpnkit-forwarder:v0.3 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:ab0873798bf27deb5024569e46dfe30bebda9713 + image: linuxkit/trim-after-delete:v0.3 # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:10177f45d9384fa4cc61571ae8bb3bffbb3eba3c + image: linuxkit/host-timesync-daemon:v0.3 # 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 9a064aeff..e21c2f7aa 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,31 +2,31 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: sysfs - image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f + image: linuxkit/sysfs:v0.3 - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 - name: ntpd - image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983 + image: linuxkit/openntpd:v0.3 - name: docker image: docker:17.09.0-ce-dind capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index 3fddfad30..ef499d9ac 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 + image: linuxkit/metadata:v0.3 services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: sshd - image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 + image: linuxkit/sshd:v0.3 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 13488adef..fe6bc2265 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 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 02dd34e42..735621fea 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 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:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 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:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index a8ccc2957..f73e656e9 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: influxdb diff --git a/examples/minimal.yml b/examples/minimal.yml index 8e5ea93dd..bc0c7f6f8 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index efaed256c..db01a72c5 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 - name: node_exporter - image: linuxkit/node_exporter:4e469ba415316c03136d5645642782554cb293e7 + image: linuxkit/node_exporter:v0.3 trust: org: - linuxkit diff --git a/examples/openstack.yml b/examples/openstack.yml index 81ef4f86b..b3ec0862b 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 + image: linuxkit/metadata:v0.3 command: ["/usr/bin/metadata", "openstack"] services: - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: sshd - image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 + image: linuxkit/sshd:v0.3 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 fe9b750d9..6b703cfa0 100644 --- a/examples/packet.arm64.yml +++ b/examples/packet.arm64.yml @@ -10,5 +10,5 @@ kernel: ucode: "" onboot: - name: modprobe - image: linuxkit/modprobe:67d9b334e4d84f480158e0a4974f547a469489a0 + image: linuxkit/modprobe:v0.3 command: ["modprobe", "nicvf"] diff --git a/examples/packet.yml b/examples/packet.yml index 5d0cd97f7..cf019a5ec 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 - - linuxkit/firmware:33b2483a7e2cc54cc4a58dbe9c3662f7f067f70d + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 + - linuxkit/firmware:v0.3 onboot: - name: rngd1 - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 + image: linuxkit/metadata:v0.3 command: ["/usr/bin/metadata", "packet"] services: - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 + image: linuxkit/sshd:v0.3 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 81fd0da2f..b426d4c6a 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 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 e6238bd91..ec09cfa3b 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.29-rt cmdline: "console=tty0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 - name: open-vm-tools - image: linuxkit/open-vm-tools:fd0b0bc2c57da0ed069a423fb5a3494499fb1ac0 + image: linuxkit/open-vm-tools:v0.3 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/sshd.yml b/examples/sshd.yml index 9f14dfd5b..5d62f8ade 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: rngd1 - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 - name: sshd - image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 + image: linuxkit/sshd:v0.3 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index daf67923d..c98a6d5b9 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:83b2f6d8c1e8196b68215a62269da4b79002aad0 + image: linuxkit/swap:v0.3 # 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:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 trust: org: - linuxkit diff --git a/examples/tpm.yml b/examples/tpm.yml index 0c05cde9c..dd908c360 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:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: tss - image: linuxkit/tss:4ed60eeeeb9c26a3172e8b2c654ec257c6c9b220 + image: linuxkit/tss:v0.3 - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 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 7e8c39026..74adef7fa 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,22 +2,22 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index d1ba239ce..df56c450c 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.7 @@ -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:b24724013759bbcb084600d1157735ccfc9aa615 + image: linuxkit/sshd:v0.3 - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:9dad2e9fb848d6452232deb01e08beda7ba00d21 + image: linuxkit/vpnkit-forwarder:v0.3 binds: - /var/vpnkit:/port net: host diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index d22b4ccbb..db71a7394 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:3559f24480e165e0719479146953b461a3e1b99e + image: linuxkit/vsudd:v0.3 binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/examples/vultr.yml b/examples/vultr.yml index 3fddfad30..ef499d9ac 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 + image: linuxkit/metadata:v0.3 services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: sshd - image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 + image: linuxkit/sshd:v0.3 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 3f98f5749..4ffb34922 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:14cd8bfc3a62e759ee6c925d697171ba18a91d70 + image: linuxkit/ip:v0.3 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:14cd8bfc3a62e759ee6c925d697171ba18a91d70 + image: linuxkit/ip:v0.3 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,12 +40,12 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true net: /run/netns/wg1 - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: nginx image: nginx:1.13.8-alpine net: /run/netns/wg0 diff --git a/linuxkit.yml b/linuxkit.yml index c9f560184..e2ec829db 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 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:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - 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 16cd86cc2..e5d012c6e 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:be60dd1cb15ad39225512b6753304571d8c2fb17 + - linuxkit/init:v0.3 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 516e8a3f3..eee4cd469 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: sysfs - image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f + image: linuxkit/sysfs:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: ntpd - image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983 + image: linuxkit/openntpd:v0.3 - 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 a903891e1..61cd29347 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: sysfs - image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f + image: linuxkit/sysfs:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: ntpd - image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983 + image: linuxkit/openntpd:v0.3 - 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 c3f8bba57..ef77805b1 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:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 9a8dbf3f6..e74612438 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:be60dd1cb15ad39225512b6753304571d8c2fb17 + - linuxkit/init:v0.3 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index da15c2616..5a1ef87fa 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 # with runc, logwrite, startmemlogd - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 # with runc, logwrite, startmemlogd + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 229978dc3..c557e4b0c 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 page_poison=1" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index aaa931024..2be1a77ac 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:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 - samoht/fdd onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 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 6421c3d4e..2d6d2f98a 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.32 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - 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:b24724013759bbcb084600d1157735ccfc9aa615 + image: linuxkit/sshd:v0.3 - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 4d798d448..dd963d72c 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:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 services: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 0494cdaeb..226b76491 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:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/linuxkit.go b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/linuxkit.go index 0d853982c..94d88ec41 100644 --- a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/linuxkit.go +++ b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/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.3 + - linuxkit/runc:v0.3 onboot: - name: mkimage - image: linuxkit/mkimage:50bde8b00eb82e08f12dd9cc29f36c77f5638426 + image: linuxkit/mkimage:v0.3 - name: poweroff image: linuxkit/poweroff:3845c4d64d47a1ea367806be5547e44594b0fa91 trust: diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index c8879a349..85868444e 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.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 8eece2b2a..b9d1d3e01 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 26e20a0f3..4ac599cbd 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.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 bea0ba505..3e10b5123 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.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 bea0ba505..3e10b5123 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.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 bea0ba505..3e10b5123 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.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 bea0ba505..3e10b5123 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.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 03a1cfc91..7e96efd76 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.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index bea0ba505..3e10b5123 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae 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 45f17ef60..293476fac 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.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 services: - name: acpid - image: linuxkit/acpid:a1399f824db917488d048c5e23ca3cec6e5317d8 + image: linuxkit/acpid:v0.3 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 1e3256d02..dfc42d5db 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.126 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:4fa46323e257af310c56950fd551e72d02694214 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 7cfabd39b..fac750605 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:4fa46323e257af310c56950fd551e72d02694214 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 f83b4ead7..b2052ce65 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:4fa46323e257af310c56950fd551e72d02694214 diff --git a/test/cases/020_kernel/007_config_4.15.x/test.yml b/test/cases/020_kernel/007_config_4.15.x/test.yml index d81dc7c30..8dd9c1753 100644 --- a/test/cases/020_kernel/007_config_4.15.x/test.yml +++ b/test/cases/020_kernel/007_config_4.15.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.15.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:4fa46323e257af310c56950fd551e72d02694214 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 ccd4f622c..c59e4b8c5 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.126 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 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 8a7a6ac92..b8a96f696 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.92 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 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 960eed648..2cef6235c 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/017_kmod_4.15.x/test.yml b/test/cases/020_kernel/017_kmod_4.15.x/test.yml index cb683f4f2..22fcb3331 100644 --- a/test/cases/020_kernel/017_kmod_4.15.x/test.yml +++ b/test/cases/020_kernel/017_kmod_4.15.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.15.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 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 934003655..5f7488fdb 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 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 e00487522..6964c5a0f 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.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: sysfs - image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f + image: linuxkit/sysfs:v0.3 - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a + image: linuxkit/rngd:v0.3 - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 - 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 dcd238ad3..5a1ffd3bc 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.32 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 880d87c2f..8ff4580fd 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: binfmt - image: linuxkit/binfmt:98398d827e80b56e487d2ae94ed86a0006acb702 + image: linuxkit/binfmt:v0.3 - name: test image: alpine:3.7 binds: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 10df42578..4e1550203 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 26b749cab..154906c53 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib"] - name: test image: linuxkit/test-containerd:9769b24f2093104dcb837906e3fd6ea34dba55d1 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 8d43786f7..44d29f6bc 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 654c6b5f4..31e234e8a 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 ef88e5394..9a68f7b85 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: extend - image: linuxkit/extend:e824c312be97f73b27a91ae1b9462cf97953f8ca + image: linuxkit/extend:v0.3 - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 55a1297e1..07b6cf364 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: modprobe - image: linuxkit/modprobe:67d9b334e4d84f480158e0a4974f547a469489a0 + image: linuxkit/modprobe:v0.3 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 96c3e58de..e16203524 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: modprobe - image: linuxkit/modprobe:67d9b334e4d84f480158e0a4974f547a469489a0 + image: linuxkit/modprobe:v0.3 command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:e824c312be97f73b27a91ae1b9462cf97953f8ca + image: linuxkit/extend:v0.3 command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index a3ac0fbe3..dc998194b 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 fe6397147..f8e156c57 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: extend - image: linuxkit/extend:e824c312be97f73b27a91ae1b9462cf97953f8ca + image: linuxkit/extend:v0.3 command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 3c9f0fe2c..f58a8c172 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 c4369be98..a626c0779 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.7 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 681460774..867e95428 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.9.38 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.7 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 f6cbb18ed..cacb4b2d2 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: modprobe - image: linuxkit/modprobe:67d9b334e4d84f480158e0a4974f547a469489a0 + image: linuxkit/modprobe:v0.3 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 78034dcc5..de245cd6f 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 7bb2bcd58..8da527284 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.9.51 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 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 c8dea8165..318583584 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 + image: linuxkit/format:v0.3 command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a + image: linuxkit/mount:v0.3 command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 34be5e281..23e393b03 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.9.x cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 + image: linuxkit/getty:v0.3 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 d476d492a..30edd2f5d 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: mkimage - image: linuxkit/mkimage:dccd1028bc96b91702236be8bbacb04477aacc4c + image: linuxkit/mkimage:v0.3 - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae trust: diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index a9ed375aa..8640f8570 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 424d252e5..003b3824e 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: sysctl - image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d + image: linuxkit/sysctl:v0.3 - name: test image: alpine:3.7 net: host diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 0b2937d59..50a9ef307 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.32 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 - - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 + - linuxkit/ca-certificates:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:14cd8bfc3a62e759ee6c925d697171ba18a91d70 + image: linuxkit/ip:v0.3 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:14cd8bfc3a62e759ee6c925d697171ba18a91d70 + image: linuxkit/ip:v0.3 net: new binds: - /etc/wireguard:/etc/wireguard diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 568fa4b48..d84e5c45a 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index 89591df13..4e4c749b2 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,12 +4,12 @@ kernel: image: linuxkit/kernel:4.14.32 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 - - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 + - linuxkit/containerd:v0.3 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 + image: linuxkit/dhcpcd:v0.3 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config image: linuxkit/test-kernel-config:4fa46323e257af310c56950fd551e72d02694214 diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index ae9f015ea..79ec64e6f 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0" init: - - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17 - - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524 + - linuxkit/init:v0.3 + - linuxkit/runc:v0.3 onboot: - name: test-ns image: linuxkit/test-ns: From 1cbe0db4a9421e893cb5ee3819ae7f7151791091 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 15:48:55 +0100 Subject: [PATCH 11/12] Add CHANGELOG Signed-off-by: Rolf Neugebauer --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..996e159d6 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,34 @@ +# Changelog +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.3] - 2018-04-05 +### Added +- Initial `s390x` support. +- Support for RealTime Linux kernels (`-rt`) on `x86_64` and `arm64`. +- Support for booting of `qcow2` disks via EFI. +- Support for CEPH filesystems in the kernel. +- Logging for `onboot` containers to `/var/log` +- Changelog file. + +### Changed +- Switched the default kernel to 4.14.x. +- Update to `containerd` v1.0.3. +- Update to `notary` v0.6.0. +- Update WireGuard to 0.0.20180304. + +### Removed +- Removed support for 4.4.x and 4.9.x kernels for `arm64`. + + +## [v0.2] - 2018-01-25 +- Almost everything + + +## [v0.1] - 2017-??-?? +- Sometime in 2017 we did a mini v0.1 release but we seem to have lost any trace of it :) + + +## [v0.0] - 2017-04-18 +- Initial open sourcing of LinuxKit From ba1b7a40cb721c964feecceb3b41e7c07a6c1fae Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 5 Apr 2018 20:04:03 +0100 Subject: [PATCH 12/12] build: Fix circle CI name for s390x build step Signed-off-by: Rolf Neugebauer --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b4ab90c97..061c92b57 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ jobs: GOARCH: arm64 command: make LOCAL_TARGET=bin/linuxkit-$GOOS-$GOARCH local-build - run: - name: Build arm64/linux + name: Build s390x/linux environment: GOOS: linux GOARCH: s390x