From d11e49d1132d01191db7d79ee999fccb4720f5c5 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 14:49:18 +0100 Subject: [PATCH 01/20] Fixup linuxkit pkg debug output (space wrong side of variable) Signed-off-by: Ian Campbell --- src/cmd/linuxkit/pkglib/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/pkglib/docker.go b/src/cmd/linuxkit/pkglib/docker.go index 8581088cb..b467ce8bc 100644 --- a/src/cmd/linuxkit/pkglib/docker.go +++ b/src/cmd/linuxkit/pkglib/docker.go @@ -42,7 +42,7 @@ func (dr dockerRunner) command(args ...string) error { if debugDockerCommands { var dct string if dr.dct { - dct = " " + dctEnableEnv + dct = dctEnableEnv + " " } fmt.Fprintf(os.Stderr, "+ %s%v\n", dct, cmd.Args) } From ca70b7b6af4420f015cd8bc6523d57c29bf7f0ad Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 14:22:10 +0100 Subject: [PATCH 02/20] Update pkg/Makefile and test/pkg/Makefile based on tools/Makefile Using explicit targets is cleaner and easier to follow. Also add `forcepush` to pkg and test/pkg and make `push` explicit. The `dirs` phony was non-existent in all three cases. Likewise `$(DIR)` wasn't used in that way in pkg or test/pkg and is nolonger used in that way in tools. Finally, `clean` was bogus in all cases (tools cleaned a thing which never exists and pkg and test/pkg were a syntax error). Signed-off-by: Ian Campbell --- pkg/Makefile | 9 ++++++--- test/pkg/Makefile | 9 ++++++--- tools/Makefile | 19 ++++++++++++++----- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/pkg/Makefile b/pkg/Makefile index e1a0140e4..0a893c414 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -1,12 +1,15 @@ DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d) -.PHONY: clean dirs $(DIRS) +.PHONY: push force-push tag forcetag show-tag clean # TODO(ijc) once all switch to `linuxkit pkg` update this to: # linuxkit pkg [--force] $$d # linuxkit pkg show-tag $$d push: - @set -e; for d in $(DIRS); do make -C "$$d"; done + @set -e; for d in $(DIRS); do make -C "$$d" push; done + +forcepush: + @set -e; for d in $(DIRS); do make -C "$$d" forcepush; done tag: @set -e; for d in $(DIRS); do make -C "$$d" tag; done @@ -17,4 +20,4 @@ forcetag: show-tag: @set -e; for d in $(DIRS); do make -C "$$d" show-tag; done -clean: ; +clean: diff --git a/test/pkg/Makefile b/test/pkg/Makefile index 6fa8efb5f..3fe596255 100644 --- a/test/pkg/Makefile +++ b/test/pkg/Makefile @@ -1,8 +1,11 @@ DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d) -.PHONY: clean dirs $(DIRS) +.PHONY: push forcepush tag forcetag show-tag clean push: - @set -e; for d in $(DIRS); do make -C "$$d"; done + @set -e; for d in $(DIRS); do make -C "$$d" push; done + +forcepush: + @set -e; for d in $(DIRS); do make -C "$$d" forcepush; done tag: @set -e; for d in $(DIRS); do make -C "$$d" tag; done @@ -13,4 +16,4 @@ forcetag: show-tag: @set -e; for d in $(DIRS); do make -C "$$d" show-tag; done -clean: ; +clean: diff --git a/tools/Makefile b/tools/Makefile index 94894d076..3fe596255 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,10 +1,19 @@ DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d) -.PHONY: clean dirs $(DIRS) +.PHONY: push forcepush tag forcetag show-tag clean -push: $(DIRS) +push: + @set -e; for d in $(DIRS); do make -C "$$d" push; done -$(DIRS): - $(MAKE) -C $@ +forcepush: + @set -e; for d in $(DIRS); do make -C "$$d" forcepush; done + +tag: + @set -e; for d in $(DIRS); do make -C "$$d" tag; done + +forcetag: + @set -e; for d in $(DIRS); do make -C "$$d" forcetag; done + +show-tag: + @set -e; for d in $(DIRS); do make -C "$$d" show-tag; done clean: - rm -f hash From f7c50156c534540529d99209fef656d5a1c00d1b Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 15:01:44 +0100 Subject: [PATCH 03/20] tools: pull linuxkit/guestfs by digest only (not digest+tag) Current versions of Docker complain: Sending build context to Docker daemon 5.12kB Step 1/4 : FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f ... Successfully tagged linuxkit/mkimage-gcp:736880776838c8f41c081276d9c017ae6adbf1bb-amd64 Tagging linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f as linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f refusing to create a tag with a digest reference ../../pkg/package.mk:82: recipe for target 'tag-y' failed Just use the digest for now. Perhaps someone will have time to fixup this build properly at some point. Make the same change to test/pkg/ltp. Signed-off-by: Ian Campbell --- test/pkg/ltp/Dockerfile | 6 ++++-- tools/mkimage-dynamic-vhd/Dockerfile | 3 ++- tools/mkimage-gcp/Dockerfile | 3 ++- tools/mkimage-vhd/Dockerfile | 3 ++- tools/mkimage-vmdk/Dockerfile | 3 ++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/test/pkg/ltp/Dockerfile b/test/pkg/ltp/Dockerfile index 77e181195..5c5deadea 100644 --- a/test/pkg/ltp/Dockerfile +++ b/test/pkg/ltp/Dockerfile @@ -1,4 +1,5 @@ -FROM debian:jessie@sha256:476959f29a17423a24a17716e058352ff6fbf13d8389e4a561c8ccc758245937 AS build +# debian:jessie +FROM debian@sha256:476959f29a17423a24a17716e058352ff6fbf13d8389e4a561c8ccc758245937 AS build ENV LTP_VERSION=20170116 ENV LTP_SOURCE=https://github.com/linux-test-project/ltp/releases/download/${LTP_VERSION}/ltp-full-${LTP_VERSION}.tar.xz @@ -17,7 +18,8 @@ RUN cd /ltp \ && make -j "$(getconf _NPROCESSORS_ONLN)" all \ && make install -FROM debian:jessie-slim@sha256:12d31a3d5a1f7cb272708be35031ba068dec46fa84af6aeb38aef5c8a83e8974 +# debian:jessie-slim +FROM debian@sha256:12d31a3d5a1f7cb272708be35031ba068dec46fa84af6aeb38aef5c8a83e8974 COPY --from=build /opt/ltp/ /opt/ltp/ ADD check.sh ./check.sh WORKDIR /opt/ltp diff --git a/tools/mkimage-dynamic-vhd/Dockerfile b/tools/mkimage-dynamic-vhd/Dockerfile index 3d74bfa62..e05e3bafd 100644 --- a/tools/mkimage-dynamic-vhd/Dockerfile +++ b/tools/mkimage-dynamic-vhd/Dockerfile @@ -1,4 +1,5 @@ -FROM linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f +# linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed +FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f COPY . . diff --git a/tools/mkimage-gcp/Dockerfile b/tools/mkimage-gcp/Dockerfile index f7470dc8a..91c654b15 100644 --- a/tools/mkimage-gcp/Dockerfile +++ b/tools/mkimage-gcp/Dockerfile @@ -1,4 +1,5 @@ -FROM linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f +# linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed +FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f COPY . . diff --git a/tools/mkimage-vhd/Dockerfile b/tools/mkimage-vhd/Dockerfile index bf8312950..20a59e567 100644 --- a/tools/mkimage-vhd/Dockerfile +++ b/tools/mkimage-vhd/Dockerfile @@ -1,4 +1,5 @@ -FROM linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f +# linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed +FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f COPY . . diff --git a/tools/mkimage-vmdk/Dockerfile b/tools/mkimage-vmdk/Dockerfile index 5d32e483c..9d9303f03 100644 --- a/tools/mkimage-vmdk/Dockerfile +++ b/tools/mkimage-vmdk/Dockerfile @@ -1,4 +1,5 @@ -FROM linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f +# linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed +FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f COPY . . From 624e7c82f109cb32a2d674f3079719f0f6442073 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 14:49:47 +0100 Subject: [PATCH 04/20] Convert most of tools/* to `linuxkit pkg build` tools/alpine and tools/guestfs are omitted since they do not currently use pkg/package.mk and do their own thing. Slightly hacky arrangements are made for these. Note that previously they were only recursed into for their default target (push) and that behaviour is retained. Signed-off-by: Ian Campbell --- tools/Makefile | 18 ++++++++++++------ tools/go-compile/Makefile | 5 ----- tools/go-compile/build.yml | 1 + tools/mkimage-dynamic-vhd/Makefile | 4 ---- tools/mkimage-dynamic-vhd/build.yml | 1 + tools/mkimage-gcp/Makefile | 4 ---- tools/mkimage-gcp/build.yml | 1 + tools/mkimage-iso-bios/Makefile | 5 ----- tools/mkimage-iso-bios/build.yml | 3 +++ tools/mkimage-iso-efi/Makefile | 5 ----- tools/mkimage-iso-efi/build.yml | 2 ++ tools/mkimage-vhd/Makefile | 4 ---- tools/mkimage-vhd/build.yml | 1 + tools/mkimage-vmdk/Makefile | 4 ---- tools/mkimage-vmdk/build.yml | 1 + tools/qemu/Makefile | 4 ---- tools/qemu/build.yml | 1 + 17 files changed, 23 insertions(+), 41 deletions(-) delete mode 100644 tools/go-compile/Makefile create mode 100644 tools/go-compile/build.yml delete mode 100644 tools/mkimage-dynamic-vhd/Makefile create mode 100644 tools/mkimage-dynamic-vhd/build.yml delete mode 100644 tools/mkimage-gcp/Makefile create mode 100644 tools/mkimage-gcp/build.yml delete mode 100644 tools/mkimage-iso-bios/Makefile create mode 100644 tools/mkimage-iso-bios/build.yml delete mode 100644 tools/mkimage-iso-efi/Makefile create mode 100644 tools/mkimage-iso-efi/build.yml delete mode 100644 tools/mkimage-vhd/Makefile create mode 100644 tools/mkimage-vhd/build.yml delete mode 100644 tools/mkimage-vmdk/Makefile create mode 100644 tools/mkimage-vmdk/build.yml delete mode 100644 tools/qemu/Makefile create mode 100644 tools/qemu/build.yml diff --git a/tools/Makefile b/tools/Makefile index 3fe596255..145f1d79c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,19 +1,25 @@ -DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d) +DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml)) +# These have more complex builds which have not yet been ported to linuxkit pkg. +# No more entries should be added to this list. +# Note that these are only recursed on for the push target which was the historical behaviour. +MAKEDIRS = alpine guestfs + .PHONY: push forcepush tag forcetag show-tag clean push: - @set -e; for d in $(DIRS); do make -C "$$d" push; done + @set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done + @set -e; for d in $(MAKEDIRS); do make -C "$$d" push; done forcepush: - @set -e; for d in $(DIRS); do make -C "$$d" forcepush; done + @set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done tag: - @set -e; for d in $(DIRS); do make -C "$$d" tag; done + @set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done forcetag: - @set -e; for d in $(DIRS); do make -C "$$d" forcetag; done + @set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done show-tag: - @set -e; for d in $(DIRS); do make -C "$$d" show-tag; done + @set -e; for d in $(DIRS); do linuxkit pkg show-tag "$$d"; done clean: diff --git a/tools/go-compile/Makefile b/tools/go-compile/Makefile deleted file mode 100644 index 4d5e39964..000000000 --- a/tools/go-compile/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE=go-compile -DEPS=compile.sh - -include ../../pkg/package.mk - diff --git a/tools/go-compile/build.yml b/tools/go-compile/build.yml new file mode 100644 index 000000000..56e7fdf8a --- /dev/null +++ b/tools/go-compile/build.yml @@ -0,0 +1 @@ +image: go-compile diff --git a/tools/mkimage-dynamic-vhd/Makefile b/tools/mkimage-dynamic-vhd/Makefile deleted file mode 100644 index a3646f26c..000000000 --- a/tools/mkimage-dynamic-vhd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=mkimage-dynamic-vhd -DEPS=make-dynamic-vhd - -include ../../pkg/package.mk diff --git a/tools/mkimage-dynamic-vhd/build.yml b/tools/mkimage-dynamic-vhd/build.yml new file mode 100644 index 000000000..5fef466bf --- /dev/null +++ b/tools/mkimage-dynamic-vhd/build.yml @@ -0,0 +1 @@ +image: mkimage-dynamic-vhd diff --git a/tools/mkimage-gcp/Makefile b/tools/mkimage-gcp/Makefile deleted file mode 100644 index dfc5a3c7e..000000000 --- a/tools/mkimage-gcp/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=mkimage-gcp -DEPS=make-gcp - -include ../../pkg/package.mk diff --git a/tools/mkimage-gcp/build.yml b/tools/mkimage-gcp/build.yml new file mode 100644 index 000000000..29e878945 --- /dev/null +++ b/tools/mkimage-gcp/build.yml @@ -0,0 +1 @@ +image: mkimage-gcp diff --git a/tools/mkimage-iso-bios/Makefile b/tools/mkimage-iso-bios/Makefile deleted file mode 100644 index 9a920db2c..000000000 --- a/tools/mkimage-iso-bios/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE=mkimage-iso-bios -DEPS=make-iso -ARCHES=x86_64 - -include ../../pkg/package.mk diff --git a/tools/mkimage-iso-bios/build.yml b/tools/mkimage-iso-bios/build.yml new file mode 100644 index 000000000..4dd32749e --- /dev/null +++ b/tools/mkimage-iso-bios/build.yml @@ -0,0 +1,3 @@ +image: mkimage-iso-bios +arches: + - amd64 diff --git a/tools/mkimage-iso-efi/Makefile b/tools/mkimage-iso-efi/Makefile deleted file mode 100644 index a3f906882..000000000 --- a/tools/mkimage-iso-efi/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE=mkimage-iso-efi -DEPS=make-efi -NETWORK=1 - -include ../../pkg/package.mk diff --git a/tools/mkimage-iso-efi/build.yml b/tools/mkimage-iso-efi/build.yml new file mode 100644 index 000000000..1ea72881e --- /dev/null +++ b/tools/mkimage-iso-efi/build.yml @@ -0,0 +1,2 @@ +image: mkimage-iso-efi +network: true diff --git a/tools/mkimage-vhd/Makefile b/tools/mkimage-vhd/Makefile deleted file mode 100644 index 9b390de57..000000000 --- a/tools/mkimage-vhd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=mkimage-vhd -DEPS=make-vhd - -include ../../pkg/package.mk diff --git a/tools/mkimage-vhd/build.yml b/tools/mkimage-vhd/build.yml new file mode 100644 index 000000000..8b00b4fda --- /dev/null +++ b/tools/mkimage-vhd/build.yml @@ -0,0 +1 @@ +image: mkimage-vhd diff --git a/tools/mkimage-vmdk/Makefile b/tools/mkimage-vmdk/Makefile deleted file mode 100644 index f2c2d71a0..000000000 --- a/tools/mkimage-vmdk/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=mkimage-vmdk -DEPS=make-vmdk - -include ../../pkg/package.mk diff --git a/tools/mkimage-vmdk/build.yml b/tools/mkimage-vmdk/build.yml new file mode 100644 index 000000000..cfad11d0b --- /dev/null +++ b/tools/mkimage-vmdk/build.yml @@ -0,0 +1 @@ +image: mkimage-vmdk diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile deleted file mode 100644 index 438aaaba6..000000000 --- a/tools/qemu/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=qemu - -include ../../pkg/package.mk - diff --git a/tools/qemu/build.yml b/tools/qemu/build.yml new file mode 100644 index 000000000..26d4b5ac5 --- /dev/null +++ b/tools/qemu/build.yml @@ -0,0 +1 @@ +image: qemu From 588d095e197157d9b89851122bc14081f5b122aa Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 15:35:09 +0100 Subject: [PATCH 05/20] Convert all of test/pkg/* to `linuxkit pkg build` Signed-off-by: Ian Campbell --- test/pkg/Makefile | 12 ++++++------ test/pkg/containerd/Makefile | 4 ---- test/pkg/containerd/build.yml | 1 + test/pkg/docker-bench/Makefile | 7 ------- test/pkg/docker-bench/build.yml | 4 ++++ test/pkg/kernel-config/Makefile | 5 ----- test/pkg/kernel-config/build.yml | 2 ++ test/pkg/ltp/Makefile | 6 ------ test/pkg/ltp/build.yml | 4 ++++ test/pkg/ns/Makefile | 6 ------ test/pkg/ns/build.yml | 4 ++++ test/pkg/poweroff/Makefile | 5 ----- test/pkg/poweroff/build.yml | 1 + test/pkg/virtsock/Makefile | 7 ------- test/pkg/virtsock/build.yml | 4 ++++ 15 files changed, 26 insertions(+), 46 deletions(-) delete mode 100644 test/pkg/containerd/Makefile create mode 100644 test/pkg/containerd/build.yml delete mode 100644 test/pkg/docker-bench/Makefile create mode 100644 test/pkg/docker-bench/build.yml delete mode 100644 test/pkg/kernel-config/Makefile create mode 100644 test/pkg/kernel-config/build.yml delete mode 100644 test/pkg/ltp/Makefile create mode 100644 test/pkg/ltp/build.yml delete mode 100644 test/pkg/ns/Makefile create mode 100644 test/pkg/ns/build.yml delete mode 100644 test/pkg/poweroff/Makefile create mode 100644 test/pkg/poweroff/build.yml delete mode 100644 test/pkg/virtsock/Makefile create mode 100644 test/pkg/virtsock/build.yml diff --git a/test/pkg/Makefile b/test/pkg/Makefile index 3fe596255..ad8d69aaf 100644 --- a/test/pkg/Makefile +++ b/test/pkg/Makefile @@ -1,19 +1,19 @@ -DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d) +DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml)) .PHONY: push forcepush tag forcetag show-tag clean push: - @set -e; for d in $(DIRS); do make -C "$$d" push; done + @set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done forcepush: - @set -e; for d in $(DIRS); do make -C "$$d" forcepush; done + @set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done tag: - @set -e; for d in $(DIRS); do make -C "$$d" tag; done + @set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done forcetag: - @set -e; for d in $(DIRS); do make -C "$$d" forcetag; done + @set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done show-tag: - @set -e; for d in $(DIRS); do make -C "$$d" show-tag; done + @set -e; for d in $(DIRS); do linuxkit pkg show-tag "$$d"; done clean: diff --git a/test/pkg/containerd/Makefile b/test/pkg/containerd/Makefile deleted file mode 100644 index 8bf87eb18..000000000 --- a/test/pkg/containerd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=test-containerd -DEPS=run.sh - -include ../../../pkg/package.mk diff --git a/test/pkg/containerd/build.yml b/test/pkg/containerd/build.yml new file mode 100644 index 000000000..fb2956359 --- /dev/null +++ b/test/pkg/containerd/build.yml @@ -0,0 +1 @@ +image: test-containerd diff --git a/test/pkg/docker-bench/Makefile b/test/pkg/docker-bench/Makefile deleted file mode 100644 index a2d8ba568..000000000 --- a/test/pkg/docker-bench/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -IMAGE=test-docker-bench -DEPS=bench_runner.sh -NETWORK=1 -ARCHES=x86_64 - -include ../../../pkg/package.mk - diff --git a/test/pkg/docker-bench/build.yml b/test/pkg/docker-bench/build.yml new file mode 100644 index 000000000..997a50fcf --- /dev/null +++ b/test/pkg/docker-bench/build.yml @@ -0,0 +1,4 @@ +image: test-docker-bench +network: true +arches: + - amd64 diff --git a/test/pkg/kernel-config/Makefile b/test/pkg/kernel-config/Makefile deleted file mode 100644 index 72f1ad11b..000000000 --- a/test/pkg/kernel-config/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE=test-kernel-config -DEPS=$(wildcard *.sh) -NETWORK=1 - -include ../../../pkg/package.mk diff --git a/test/pkg/kernel-config/build.yml b/test/pkg/kernel-config/build.yml new file mode 100644 index 000000000..cb24486a5 --- /dev/null +++ b/test/pkg/kernel-config/build.yml @@ -0,0 +1,2 @@ +image: test-kernel-config +network: true diff --git a/test/pkg/ltp/Makefile b/test/pkg/ltp/Makefile deleted file mode 100644 index 94ea313e9..000000000 --- a/test/pkg/ltp/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -IMAGE=test-ltp -DEPS=check.sh -NETWORK=1 -ARCHES=x86_64 - -include ../../../pkg/package.mk diff --git a/test/pkg/ltp/build.yml b/test/pkg/ltp/build.yml new file mode 100644 index 000000000..26459fd15 --- /dev/null +++ b/test/pkg/ltp/build.yml @@ -0,0 +1,4 @@ +image: test-ltp +network: true +arches: + - amd64 diff --git a/test/pkg/ns/Makefile b/test/pkg/ns/Makefile deleted file mode 100644 index 11a74a37c..000000000 --- a/test/pkg/ns/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -IMAGE=test-ns -NETWORK=1 -DEPS=config.template.json $(wildcard *.sh) -ARCHES=x86_64 - -include ../../../pkg/package.mk diff --git a/test/pkg/ns/build.yml b/test/pkg/ns/build.yml new file mode 100644 index 000000000..7da69976a --- /dev/null +++ b/test/pkg/ns/build.yml @@ -0,0 +1,4 @@ +image: test-ns +network: true +arches: + - amd64 diff --git a/test/pkg/poweroff/Makefile b/test/pkg/poweroff/Makefile deleted file mode 100644 index b41a45b5d..000000000 --- a/test/pkg/poweroff/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE=poweroff -DEPS=poweroff.sh - -include ../../../pkg/package.mk - diff --git a/test/pkg/poweroff/build.yml b/test/pkg/poweroff/build.yml new file mode 100644 index 000000000..b83188aa2 --- /dev/null +++ b/test/pkg/poweroff/build.yml @@ -0,0 +1 @@ +image: poweroff diff --git a/test/pkg/virtsock/Makefile b/test/pkg/virtsock/Makefile deleted file mode 100644 index d1e5c5baf..000000000 --- a/test/pkg/virtsock/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -IMAGE=test-virtsock -DEPS= -NETWORK=1 -ARCHES=x86_64 - -include ../../../pkg/package.mk - diff --git a/test/pkg/virtsock/build.yml b/test/pkg/virtsock/build.yml new file mode 100644 index 000000000..c717c6495 --- /dev/null +++ b/test/pkg/virtsock/build.yml @@ -0,0 +1,4 @@ +image: test-virtsock +network: true +arches: + - amd64 From c889f13251b65cd3e0f5130521a880716c16bc5d Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 15:35:44 +0100 Subject: [PATCH 06/20] Rename `poweroff` to `test-poweroff` for consistency This was the only one of `test/pkg` not to have a `test-` prefix. Signed-off-by: Ian Campbell --- test/pkg/poweroff/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pkg/poweroff/build.yml b/test/pkg/poweroff/build.yml index b83188aa2..03b66d5a6 100644 --- a/test/pkg/poweroff/build.yml +++ b/test/pkg/poweroff/build.yml @@ -1 +1 @@ -image: poweroff +image: test-poweroff From fc3e659f0e7d2efd3b060cfa4b3d9dc28bbfb0a7 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 16:17:24 +0100 Subject: [PATCH 07/20] Convert all of pkg/* to `linuxkit pkg build` This was done with the following "script": git rm pkg/{auditd,binfmt,init}/Makefile sed -e 's/IMAGE=/image: /g' -i pkg/*/Makefile sed -e 's/NETWORK=1/network: true/g' -i pkg/*/Makefile sed -e 's/ARCHES=x86_64/arches:\n - amd64/g' -i pkg/*/Makefile sed -e '/DEPS:\?=/d' -i pkg/*/Makefile sed -e '/ARCHES=SKIP/d' -i pkg/node_exporter/Makefile sed -e 's/include \.\.\/package.mk//g' -i pkg/*/Makefile sed -e '/^$/d' -i pkg/*/Makefile git mv pkg/node_exporter/Makefile pkg/node_exporter/build.yml-skip for i in pkg/*/Makefile ; do git mv $i ${i%Makefile}build.yml ; done and manual update of pkg/Makefile. Signed-off-by: Ian Campbell --- pkg/Makefile | 16 ++++++---------- pkg/acpid/Makefile | 3 --- pkg/acpid/build.yml | 1 + pkg/auditd/Makefile | 16 ---------------- pkg/binfmt/Makefile | 16 ---------------- pkg/ca-certificates/Makefile | 3 --- pkg/ca-certificates/build.yml | 1 + pkg/containerd/Makefile | 4 ---- pkg/containerd/build.yml | 1 + pkg/dhcpcd/Makefile | 4 ---- pkg/dhcpcd/build.yml | 1 + pkg/extend/Makefile | 4 ---- pkg/extend/build.yml | 1 + pkg/format/Makefile | 4 ---- pkg/format/build.yml | 1 + pkg/getty/Makefile | 4 ---- pkg/getty/build.yml | 1 + pkg/host-timesync-daemon/Makefile | 6 ------ pkg/host-timesync-daemon/build.yml | 4 ++++ pkg/init-lcow/Makefile | 5 ----- pkg/init-lcow/build.yml | 4 ++++ pkg/init/Makefile | 16 ---------------- pkg/ip/Makefile | 4 ---- pkg/ip/build.yml | 2 ++ pkg/metadata/Makefile | 4 ---- pkg/metadata/build.yml | 1 + pkg/mkimage/Makefile | 5 ----- pkg/mkimage/build.yml | 3 +++ pkg/modprobe/Makefile | 3 --- pkg/modprobe/build.yml | 1 + pkg/mount/Makefile | 4 ---- pkg/mount/build.yml | 1 + pkg/node_exporter/{Makefile => build.yml-skip} | 5 +---- pkg/open-vm-tools/Makefile | 4 ---- pkg/open-vm-tools/build.yml | 3 +++ pkg/openntpd/Makefile | 4 ---- pkg/openntpd/build.yml | 1 + pkg/qemu-ga/Makefile | 3 --- pkg/qemu-ga/build.yml | 1 + pkg/rngd/Makefile | 4 ---- pkg/rngd/build.yml | 1 + pkg/runc/Makefile | 4 ---- pkg/runc/build.yml | 2 ++ pkg/sshd/Makefile | 4 ---- pkg/sshd/build.yml | 1 + pkg/swap/Makefile | 4 ---- pkg/swap/build.yml | 1 + pkg/sysctl/Makefile | 4 ---- pkg/sysctl/build.yml | 1 + pkg/sysfs/Makefile | 4 ---- pkg/sysfs/build.yml | 1 + pkg/trim-after-delete/Makefile | 4 ---- pkg/trim-after-delete/build.yml | 1 + pkg/tss/Makefile | 7 ------- pkg/tss/build.yml | 4 ++++ pkg/vpnkit-expose-port/Makefile | 7 ------- pkg/vpnkit-expose-port/build.yml | 4 ++++ pkg/vpnkit-forwarder/Makefile | 6 ------ pkg/vpnkit-forwarder/build.yml | 4 ++++ pkg/vsudd/Makefile | 6 ------ pkg/vsudd/build.yml | 4 ++++ 61 files changed, 59 insertions(+), 184 deletions(-) delete mode 100644 pkg/acpid/Makefile create mode 100644 pkg/acpid/build.yml delete mode 100644 pkg/auditd/Makefile delete mode 100644 pkg/binfmt/Makefile delete mode 100644 pkg/ca-certificates/Makefile create mode 100644 pkg/ca-certificates/build.yml delete mode 100644 pkg/containerd/Makefile create mode 100644 pkg/containerd/build.yml delete mode 100644 pkg/dhcpcd/Makefile create mode 100644 pkg/dhcpcd/build.yml delete mode 100644 pkg/extend/Makefile create mode 100644 pkg/extend/build.yml delete mode 100644 pkg/format/Makefile create mode 100644 pkg/format/build.yml delete mode 100644 pkg/getty/Makefile create mode 100644 pkg/getty/build.yml delete mode 100644 pkg/host-timesync-daemon/Makefile create mode 100644 pkg/host-timesync-daemon/build.yml delete mode 100644 pkg/init-lcow/Makefile create mode 100644 pkg/init-lcow/build.yml delete mode 100644 pkg/init/Makefile delete mode 100644 pkg/ip/Makefile create mode 100644 pkg/ip/build.yml delete mode 100644 pkg/metadata/Makefile create mode 100644 pkg/metadata/build.yml delete mode 100644 pkg/mkimage/Makefile create mode 100644 pkg/mkimage/build.yml delete mode 100644 pkg/modprobe/Makefile create mode 100644 pkg/modprobe/build.yml delete mode 100644 pkg/mount/Makefile create mode 100644 pkg/mount/build.yml rename pkg/node_exporter/{Makefile => build.yml-skip} (63%) delete mode 100644 pkg/open-vm-tools/Makefile create mode 100644 pkg/open-vm-tools/build.yml delete mode 100644 pkg/openntpd/Makefile create mode 100644 pkg/openntpd/build.yml delete mode 100644 pkg/qemu-ga/Makefile create mode 100644 pkg/qemu-ga/build.yml delete mode 100644 pkg/rngd/Makefile create mode 100644 pkg/rngd/build.yml delete mode 100644 pkg/runc/Makefile create mode 100644 pkg/runc/build.yml delete mode 100644 pkg/sshd/Makefile create mode 100644 pkg/sshd/build.yml delete mode 100644 pkg/swap/Makefile create mode 100644 pkg/swap/build.yml delete mode 100644 pkg/sysctl/Makefile create mode 100644 pkg/sysctl/build.yml delete mode 100644 pkg/sysfs/Makefile create mode 100644 pkg/sysfs/build.yml delete mode 100644 pkg/trim-after-delete/Makefile create mode 100644 pkg/trim-after-delete/build.yml delete mode 100644 pkg/tss/Makefile create mode 100644 pkg/tss/build.yml delete mode 100644 pkg/vpnkit-expose-port/Makefile create mode 100644 pkg/vpnkit-expose-port/build.yml delete mode 100644 pkg/vpnkit-forwarder/Makefile create mode 100644 pkg/vpnkit-forwarder/build.yml delete mode 100644 pkg/vsudd/Makefile create mode 100644 pkg/vsudd/build.yml diff --git a/pkg/Makefile b/pkg/Makefile index 0a893c414..cc311ac95 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -1,23 +1,19 @@ -DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d) +DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml)) .PHONY: push force-push tag forcetag show-tag clean -# TODO(ijc) once all switch to `linuxkit pkg` update this to: -# linuxkit pkg [--force] $$d -# linuxkit pkg show-tag $$d - push: - @set -e; for d in $(DIRS); do make -C "$$d" push; done + @set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done forcepush: - @set -e; for d in $(DIRS); do make -C "$$d" forcepush; done + @set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done tag: - @set -e; for d in $(DIRS); do make -C "$$d" tag; done + @set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done forcetag: - @set -e; for d in $(DIRS); do make -C "$$d" forcetag; done + @set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done show-tag: - @set -e; for d in $(DIRS); do make -C "$$d" show-tag; done + @set -e; for d in $(DIRS); do linuxkit pkg show-tag "$$d"; done clean: diff --git a/pkg/acpid/Makefile b/pkg/acpid/Makefile deleted file mode 100644 index 5abb21c70..000000000 --- a/pkg/acpid/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE=acpid - -include ../package.mk diff --git a/pkg/acpid/build.yml b/pkg/acpid/build.yml new file mode 100644 index 000000000..cf21e8b14 --- /dev/null +++ b/pkg/acpid/build.yml @@ -0,0 +1 @@ +image: acpid diff --git a/pkg/auditd/Makefile b/pkg/auditd/Makefile deleted file mode 100644 index e7979ba6a..000000000 --- a/pkg/auditd/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -.PHONY: push forcepush tag forcetag show-tag - -push: - linuxkit pkg push . - -forcepush: - linuxkit pkg push --force . - -tag: - linuxkit pkg build . - -forcetag: - linuxkit pkg build --force . - -show-tag: - linuxkit pkg show-tag . diff --git a/pkg/binfmt/Makefile b/pkg/binfmt/Makefile deleted file mode 100644 index e7979ba6a..000000000 --- a/pkg/binfmt/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -.PHONY: push forcepush tag forcetag show-tag - -push: - linuxkit pkg push . - -forcepush: - linuxkit pkg push --force . - -tag: - linuxkit pkg build . - -forcetag: - linuxkit pkg build --force . - -show-tag: - linuxkit pkg show-tag . diff --git a/pkg/ca-certificates/Makefile b/pkg/ca-certificates/Makefile deleted file mode 100644 index 2b0c67f0c..000000000 --- a/pkg/ca-certificates/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE=ca-certificates - -include ../package.mk diff --git a/pkg/ca-certificates/build.yml b/pkg/ca-certificates/build.yml new file mode 100644 index 000000000..bf158e3b9 --- /dev/null +++ b/pkg/ca-certificates/build.yml @@ -0,0 +1 @@ +image: ca-certificates diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile deleted file mode 100644 index 75be3d1d5..000000000 --- a/pkg/containerd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=containerd -DEPS=$(wildcard cmd/service/*.go) etc/containerd/config.toml - -include ../package.mk diff --git a/pkg/containerd/build.yml b/pkg/containerd/build.yml new file mode 100644 index 000000000..1efcc2428 --- /dev/null +++ b/pkg/containerd/build.yml @@ -0,0 +1 @@ +image: containerd diff --git a/pkg/dhcpcd/Makefile b/pkg/dhcpcd/Makefile deleted file mode 100644 index 1e648453e..000000000 --- a/pkg/dhcpcd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=dhcpcd -DEPS=dhcpcd.conf $(wildcard usr/lib/dhcpcd/dhcpcd-hooks/*) - -include ../package.mk diff --git a/pkg/dhcpcd/build.yml b/pkg/dhcpcd/build.yml new file mode 100644 index 000000000..47241f0fa --- /dev/null +++ b/pkg/dhcpcd/build.yml @@ -0,0 +1 @@ +image: dhcpcd diff --git a/pkg/extend/Makefile b/pkg/extend/Makefile deleted file mode 100644 index eaa9d62b2..000000000 --- a/pkg/extend/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=extend -DEPS=extend.go - -include ../package.mk diff --git a/pkg/extend/build.yml b/pkg/extend/build.yml new file mode 100644 index 000000000..6f10de7f3 --- /dev/null +++ b/pkg/extend/build.yml @@ -0,0 +1 @@ +image: extend diff --git a/pkg/format/Makefile b/pkg/format/Makefile deleted file mode 100644 index 587146eb1..000000000 --- a/pkg/format/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=format -DEPS=format.go - -include ../package.mk diff --git a/pkg/format/build.yml b/pkg/format/build.yml new file mode 100644 index 000000000..a205794ef --- /dev/null +++ b/pkg/format/build.yml @@ -0,0 +1 @@ +image: format diff --git a/pkg/getty/Makefile b/pkg/getty/Makefile deleted file mode 100644 index e7ba709a5..000000000 --- a/pkg/getty/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=getty -DEPS=usr/bin/rungetty.sh $(wildcard etc/*) $(wildcard etc/init.d/*) - -include ../package.mk diff --git a/pkg/getty/build.yml b/pkg/getty/build.yml new file mode 100644 index 000000000..05912cb5b --- /dev/null +++ b/pkg/getty/build.yml @@ -0,0 +1 @@ +image: getty diff --git a/pkg/host-timesync-daemon/Makefile b/pkg/host-timesync-daemon/Makefile deleted file mode 100644 index 85d0fa0f2..000000000 --- a/pkg/host-timesync-daemon/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -IMAGE=host-timesync-daemon -DEPS=$(wildcard *.go) -NETWORK=1 -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/host-timesync-daemon/build.yml b/pkg/host-timesync-daemon/build.yml new file mode 100644 index 000000000..c3ec54bd7 --- /dev/null +++ b/pkg/host-timesync-daemon/build.yml @@ -0,0 +1,4 @@ +image: host-timesync-daemon +network: true +arches: + - amd64 diff --git a/pkg/init-lcow/Makefile b/pkg/init-lcow/Makefile deleted file mode 100644 index c264416eb..000000000 --- a/pkg/init-lcow/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE=init-lcow -NETWORK=1 -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/init-lcow/build.yml b/pkg/init-lcow/build.yml new file mode 100644 index 000000000..fcfca2dac --- /dev/null +++ b/pkg/init-lcow/build.yml @@ -0,0 +1,4 @@ +image: init-lcow +network: true +arches: + - amd64 diff --git a/pkg/init/Makefile b/pkg/init/Makefile deleted file mode 100644 index e7979ba6a..000000000 --- a/pkg/init/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -.PHONY: push forcepush tag forcetag show-tag - -push: - linuxkit pkg push . - -forcepush: - linuxkit pkg push --force . - -tag: - linuxkit pkg build . - -forcetag: - linuxkit pkg build --force . - -show-tag: - linuxkit pkg show-tag . diff --git a/pkg/ip/Makefile b/pkg/ip/Makefile deleted file mode 100644 index 7e97777ad..000000000 --- a/pkg/ip/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=ip -NETWORK=1 - -include ../package.mk diff --git a/pkg/ip/build.yml b/pkg/ip/build.yml new file mode 100644 index 000000000..0994a7321 --- /dev/null +++ b/pkg/ip/build.yml @@ -0,0 +1,2 @@ +image: ip +network: true diff --git a/pkg/metadata/Makefile b/pkg/metadata/Makefile deleted file mode 100644 index 369218447..000000000 --- a/pkg/metadata/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=metadata -DEPS=$(wildcard *.go) - -include ../package.mk diff --git a/pkg/metadata/build.yml b/pkg/metadata/build.yml new file mode 100644 index 000000000..60df83ac5 --- /dev/null +++ b/pkg/metadata/build.yml @@ -0,0 +1 @@ +image: metadata diff --git a/pkg/mkimage/Makefile b/pkg/mkimage/Makefile deleted file mode 100644 index 3df6a1b87..000000000 --- a/pkg/mkimage/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE=mkimage -DEPS=mkimage.sh -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/mkimage/build.yml b/pkg/mkimage/build.yml new file mode 100644 index 000000000..1fa6e4f1c --- /dev/null +++ b/pkg/mkimage/build.yml @@ -0,0 +1,3 @@ +image: mkimage +arches: + - amd64 diff --git a/pkg/modprobe/Makefile b/pkg/modprobe/Makefile deleted file mode 100644 index c591652b6..000000000 --- a/pkg/modprobe/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE=modprobe - -include ../package.mk diff --git a/pkg/modprobe/build.yml b/pkg/modprobe/build.yml new file mode 100644 index 000000000..5c653ad79 --- /dev/null +++ b/pkg/modprobe/build.yml @@ -0,0 +1 @@ +image: modprobe diff --git a/pkg/mount/Makefile b/pkg/mount/Makefile deleted file mode 100644 index 6e246442b..000000000 --- a/pkg/mount/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=mount -DEPS=mountie.go - -include ../package.mk diff --git a/pkg/mount/build.yml b/pkg/mount/build.yml new file mode 100644 index 000000000..93801b226 --- /dev/null +++ b/pkg/mount/build.yml @@ -0,0 +1 @@ +image: mount diff --git a/pkg/node_exporter/Makefile b/pkg/node_exporter/build.yml-skip similarity index 63% rename from pkg/node_exporter/Makefile rename to pkg/node_exporter/build.yml-skip index be11d9673..0251be216 100644 --- a/pkg/node_exporter/Makefile +++ b/pkg/node_exporter/build.yml-skip @@ -1,6 +1,3 @@ -IMAGE=node_exporter +image: node_exporter # Can't pull with content trust. Skip for now # https://github.com/linuxkit/linuxkit/issues/2349 -ARCHES=SKIP - -include ../package.mk diff --git a/pkg/open-vm-tools/Makefile b/pkg/open-vm-tools/Makefile deleted file mode 100644 index 4befe5b01..000000000 --- a/pkg/open-vm-tools/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=open-vm-tools -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/open-vm-tools/build.yml b/pkg/open-vm-tools/build.yml new file mode 100644 index 000000000..4c99f31a8 --- /dev/null +++ b/pkg/open-vm-tools/build.yml @@ -0,0 +1,3 @@ +image: open-vm-tools +arches: + - amd64 diff --git a/pkg/openntpd/Makefile b/pkg/openntpd/Makefile deleted file mode 100644 index 8cfe5e8e4..000000000 --- a/pkg/openntpd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=openntpd -DEPS=etc/ntpd.conf - -include ../package.mk diff --git a/pkg/openntpd/build.yml b/pkg/openntpd/build.yml new file mode 100644 index 000000000..d9bf82d9b --- /dev/null +++ b/pkg/openntpd/build.yml @@ -0,0 +1 @@ +image: openntpd diff --git a/pkg/qemu-ga/Makefile b/pkg/qemu-ga/Makefile deleted file mode 100644 index 0a28bef1b..000000000 --- a/pkg/qemu-ga/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE=qemu-ga - -include ../package.mk diff --git a/pkg/qemu-ga/build.yml b/pkg/qemu-ga/build.yml new file mode 100644 index 000000000..70e6af2d3 --- /dev/null +++ b/pkg/qemu-ga/build.yml @@ -0,0 +1 @@ +image: qemu-ga diff --git a/pkg/rngd/Makefile b/pkg/rngd/Makefile deleted file mode 100644 index 0f5b8696a..000000000 --- a/pkg/rngd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=rngd -DEPS:=$(wildcard cmd/rngd/*.go) $(shell find cmd/rngd/vendor) - -include ../package.mk diff --git a/pkg/rngd/build.yml b/pkg/rngd/build.yml new file mode 100644 index 000000000..b3cbd7f5c --- /dev/null +++ b/pkg/rngd/build.yml @@ -0,0 +1 @@ +image: rngd diff --git a/pkg/runc/Makefile b/pkg/runc/Makefile deleted file mode 100644 index 7f676177c..000000000 --- a/pkg/runc/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=runc -NETWORK=1 - -include ../package.mk diff --git a/pkg/runc/build.yml b/pkg/runc/build.yml new file mode 100644 index 000000000..51ad94759 --- /dev/null +++ b/pkg/runc/build.yml @@ -0,0 +1,2 @@ +image: runc +network: true diff --git a/pkg/sshd/Makefile b/pkg/sshd/Makefile deleted file mode 100644 index e64eb4faa..000000000 --- a/pkg/sshd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=sshd -DEPS=etc/motd etc/ssh/sshd_config usr/bin/ssh.sh - -include ../package.mk diff --git a/pkg/sshd/build.yml b/pkg/sshd/build.yml new file mode 100644 index 000000000..7c04a29f8 --- /dev/null +++ b/pkg/sshd/build.yml @@ -0,0 +1 @@ +image: sshd diff --git a/pkg/swap/Makefile b/pkg/swap/Makefile deleted file mode 100644 index 669b38f68..000000000 --- a/pkg/swap/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=swap -DEPS=swap.sh - -include ../package.mk diff --git a/pkg/swap/build.yml b/pkg/swap/build.yml new file mode 100644 index 000000000..2c8a3583e --- /dev/null +++ b/pkg/swap/build.yml @@ -0,0 +1 @@ +image: swap diff --git a/pkg/sysctl/Makefile b/pkg/sysctl/Makefile deleted file mode 100644 index 22f5292d5..000000000 --- a/pkg/sysctl/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=sysctl -DEPS=main.go - -include ../package.mk diff --git a/pkg/sysctl/build.yml b/pkg/sysctl/build.yml new file mode 100644 index 000000000..21d62da47 --- /dev/null +++ b/pkg/sysctl/build.yml @@ -0,0 +1 @@ +image: sysctl diff --git a/pkg/sysfs/Makefile b/pkg/sysfs/Makefile deleted file mode 100644 index 530544fab..000000000 --- a/pkg/sysfs/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=sysfs -DEPS=main.go - -include ../package.mk diff --git a/pkg/sysfs/build.yml b/pkg/sysfs/build.yml new file mode 100644 index 000000000..642d0d047 --- /dev/null +++ b/pkg/sysfs/build.yml @@ -0,0 +1 @@ +image: sysfs diff --git a/pkg/trim-after-delete/Makefile b/pkg/trim-after-delete/Makefile deleted file mode 100644 index 3147801dc..000000000 --- a/pkg/trim-after-delete/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -IMAGE=trim-after-delete -DEPS=$(wildcard *.go) - -include ../package.mk diff --git a/pkg/trim-after-delete/build.yml b/pkg/trim-after-delete/build.yml new file mode 100644 index 000000000..3ddef36f7 --- /dev/null +++ b/pkg/trim-after-delete/build.yml @@ -0,0 +1 @@ +image: trim-after-delete diff --git a/pkg/tss/Makefile b/pkg/tss/Makefile deleted file mode 100644 index f8644cfa4..000000000 --- a/pkg/tss/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -IMAGE=tss -NETWORK=1 -DEPS=$(wildcard upload/out/*) $(wildcard upload/out/etc/*) $(wildacrd upload/src/savedeps/*) $(wildcard upload/src/glibc_stubs/*) -ARCHES=x86_64 - -include ../package.mk - diff --git a/pkg/tss/build.yml b/pkg/tss/build.yml new file mode 100644 index 000000000..e72bb1b91 --- /dev/null +++ b/pkg/tss/build.yml @@ -0,0 +1,4 @@ +image: tss +network: true +arches: + - amd64 diff --git a/pkg/vpnkit-expose-port/Makefile b/pkg/vpnkit-expose-port/Makefile deleted file mode 100644 index 8339cab6f..000000000 --- a/pkg/vpnkit-expose-port/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -IMAGE=vpnkit-expose-port -DEPS=$(wildcard *.go) -NETWORK=1 -ARCHES=x86_64 - -include ../package.mk - diff --git a/pkg/vpnkit-expose-port/build.yml b/pkg/vpnkit-expose-port/build.yml new file mode 100644 index 000000000..2d1b9b153 --- /dev/null +++ b/pkg/vpnkit-expose-port/build.yml @@ -0,0 +1,4 @@ +image: vpnkit-expose-port +network: true +arches: + - amd64 diff --git a/pkg/vpnkit-forwarder/Makefile b/pkg/vpnkit-forwarder/Makefile deleted file mode 100644 index 059ab737f..000000000 --- a/pkg/vpnkit-forwarder/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -IMAGE=vpnkit-forwarder -DEPS=$(wildcard *.go) -NETWORK=1 -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/vpnkit-forwarder/build.yml b/pkg/vpnkit-forwarder/build.yml new file mode 100644 index 000000000..a2b7606ed --- /dev/null +++ b/pkg/vpnkit-forwarder/build.yml @@ -0,0 +1,4 @@ +image: vpnkit-forwarder +network: true +arches: + - amd64 diff --git a/pkg/vsudd/Makefile b/pkg/vsudd/Makefile deleted file mode 100644 index 75b909fc9..000000000 --- a/pkg/vsudd/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -IMAGE=vsudd -DEPS=$(wildcard *.go) -NETWORK=1 -ARCHES=x86_64 - -include ../package.mk diff --git a/pkg/vsudd/build.yml b/pkg/vsudd/build.yml new file mode 100644 index 000000000..9ff509e9a --- /dev/null +++ b/pkg/vsudd/build.yml @@ -0,0 +1,4 @@ +image: vsudd +network: true +arches: + - amd64 From 298ef8520d5db351a2e54e5c97c76664aca45099 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 16:40:00 +0100 Subject: [PATCH 08/20] Convert some of projects/kubernetes/* to `linuxkit pkg build` This just covers those using pkg/package.mk. Signed-off-by: Ian Campbell --- projects/kubernetes/Makefile | 4 ++-- projects/kubernetes/cri-containerd/Makefile | 7 ------- projects/kubernetes/cri-containerd/build.yml | 6 ++++++ projects/kubernetes/kubernetes/Makefile | 7 ------- projects/kubernetes/kubernetes/build.yml | 6 ++++++ projects/swarmd/swarmd/Makefile | 6 ------ projects/swarmd/swarmd/build.yml | 4 ++++ 7 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 projects/kubernetes/cri-containerd/Makefile create mode 100644 projects/kubernetes/cri-containerd/build.yml delete mode 100644 projects/kubernetes/kubernetes/Makefile create mode 100644 projects/kubernetes/kubernetes/build.yml delete mode 100644 projects/swarmd/swarmd/Makefile create mode 100644 projects/swarmd/swarmd/build.yml diff --git a/projects/kubernetes/Makefile b/projects/kubernetes/Makefile index 70dff6d93..a34225572 100644 --- a/projects/kubernetes/Makefile +++ b/projects/kubernetes/Makefile @@ -7,13 +7,13 @@ INIT_YAML += network.yaml all: tag-container-images build-vm-images tag-container-images: - $(MAKE) -C kubernetes tag + linuxkit pkg build kubernetes tag-cache-images: $(MAKE) -C image-cache tag push-container-images: - $(MAKE) -C kubernetes push + linuxkit pkg push kubernetes $(MAKE) -C image-cache push build-vm-images: kube-master.iso kube-node.iso diff --git a/projects/kubernetes/cri-containerd/Makefile b/projects/kubernetes/cri-containerd/Makefile deleted file mode 100644 index fe0253576..000000000 --- a/projects/kubernetes/cri-containerd/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -ORG?=linuxkitprojects -IMAGE=cri-containerd -NETWORK=1 -NOTRUST=1 -ARCHES=x86_64 - -include ../../../pkg/package.mk diff --git a/projects/kubernetes/cri-containerd/build.yml b/projects/kubernetes/cri-containerd/build.yml new file mode 100644 index 000000000..bd66969a4 --- /dev/null +++ b/projects/kubernetes/cri-containerd/build.yml @@ -0,0 +1,6 @@ +org: linuxkitprojects +image: cri-containerd +network: true +disable-content-trust: true +arches: + - amd64 diff --git a/projects/kubernetes/kubernetes/Makefile b/projects/kubernetes/kubernetes/Makefile deleted file mode 100644 index f4fd3f8f8..000000000 --- a/projects/kubernetes/kubernetes/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -ORG?=linuxkitprojects -IMAGE=kubernetes -NETWORK=1 -NOTRUST=1 -ARCHES=x86_64 - -include ../../../pkg/package.mk diff --git a/projects/kubernetes/kubernetes/build.yml b/projects/kubernetes/kubernetes/build.yml new file mode 100644 index 000000000..878b405d2 --- /dev/null +++ b/projects/kubernetes/kubernetes/build.yml @@ -0,0 +1,6 @@ +org: linuxkitprojects +image: kubernetes +network: true +disable-content-trust: true +arches: + - amd64 diff --git a/projects/swarmd/swarmd/Makefile b/projects/swarmd/swarmd/Makefile deleted file mode 100644 index f57b5fc59..000000000 --- a/projects/swarmd/swarmd/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -ORG?=linuxkitprojects -IMAGE=swarmd -NETWORK=1 -NOTRUST=1 - -include ../../../pkg/package.mk diff --git a/projects/swarmd/swarmd/build.yml b/projects/swarmd/swarmd/build.yml new file mode 100644 index 000000000..735f62d28 --- /dev/null +++ b/projects/swarmd/swarmd/build.yml @@ -0,0 +1,4 @@ +org: linuxkitprojects +image: swarmd +network: true +disable-content-trust: true From 9bb87c0091dcf263e7490a852daf85ab6172cb91 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 16:40:33 +0100 Subject: [PATCH 09/20] Remove unused pkg/package.mk All uses now converted to `linuxkit pkg` Signed-off-by: Ian Campbell --- pkg/package.mk | 123 ------------------------------------------------- 1 file changed, 123 deletions(-) delete mode 100644 pkg/package.mk diff --git a/pkg/package.mk b/pkg/package.mk deleted file mode 100644 index 2c38d4b56..000000000 --- a/pkg/package.mk +++ /dev/null @@ -1,123 +0,0 @@ -.PHONY: image tag forcetag show-tag check-dirty push forcepush -default: push - -ORG?=linuxkit -SOURCE ?= . - -ARCH := $(shell uname -m) - -# Hash is of $(CURDIR) not $(CURDIR)$(SOURCE) to allow autogenerated -# source subdirectories (which would not be covered by ls-tree, but -# the code which autogenerates should be in $(CURDIR) so that is what -# we want to use. -ifeq ($(HASH),) -HASH_COMMIT?=HEAD # Setting this is only really useful with the show-tag target -HASH?=$(shell git ls-tree --full-tree $(HASH_COMMIT) -- $(CURDIR) | awk '{print $$3}') - -ifneq ($(HASH_COMMIT),HEAD) # Others can't be dirty by definition -DIRTY:=$(shell git update-index -q --refresh && git diff-index --quiet HEAD -- $(CURDIR) || echo "-dirty") -endif - -ifeq ($(ARCH), x86_64) -SUFFIX=-amd64 -endif -ifeq ($(ARCH), aarch64) -SUFFIX=-arm64 -endif - -endif - -# Makefiles can specify specific architectures they compile for. Default: all -ifeq ($(ARCHES),) -ARCHES:=x86_64 aarch64 -endif - -ifneq ($(filter $(ARCH),$(ARCHES)),) -REAL:=-y -else -REAL:=-n -endif - -TAG:=$(ORG)/$(IMAGE):$(HASH)$(DIRTY) - -REPO?=https://github.com/linuxkit/linuxkit -ifneq ($(REPO),) -REPO_LABEL=--label org.opencontainers.image.source=$(REPO) -endif -ifeq ($(DIRTY),) -REPO_COMMIT=$(shell git rev-parse HEAD) -COMMIT_LABEL=--label org.opencontainers.image.revision=$(REPO_COMMIT) -endif -LABELS=$(REPO_LABEL) $(COMMIT_LABEL) - -BASE_DEPS=Dockerfile Makefile - -# Get a release tag, if present -RELEASE:=$(shell git tag -l --points-at HEAD) - -# Path to push-manifest.sh -PUSH_MANIFEST:=$(shell git rev-parse --show-toplevel)/scripts/push-manifest.sh - -ifdef NETWORK -NET_OPT= -else -NET_OPT=--network=none -endif - -ifeq ($(DOCKER_CONTENT_TRUST),) -ifndef NOTRUST -export DOCKER_CONTENT_TRUST=1 -endif -endif - -tag: tag$(REAL) -forcetag: forcetag$(REAL) -push: push$(REAL) -forcepush: forcepush$(REAL) - -show-tag: - @echo $(TAG) - -tag-y: $(BASE_DEPS) $(DEPS) - docker pull $(TAG)$(SUFFIX) || \ - docker build $(LABELS) $(NET_OPT) -t $(TAG)$(SUFFIX) $(SOURCE) - -forcetag-y: $(BASE_DEPS) $(DEPS) - docker build $(LABELS) $(NET_OPT) -t $(TAG)$(SUFFIX) $(SOURCE) - -check-dirty: -ifneq ($(DIRTY),) - $(error Your repository is not clean. Will not push package image) -endif -ifeq ($(SUFFIX),) - $(error Refusing to push without a SUFFIX) -endif - -push-y: tag-y check-dirty - docker pull $(TAG)$(SUFFIX) || \ - (docker push $(TAG)$(SUFFIX) && \ - $(PUSH_MANIFEST) $(TAG) $(DOCKER_CONTENT_TRUST)) -ifneq ($(RELEASE),) - docker tag $(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(RELEASE)$(SUFFIX) - docker push $(ORG)/$(IMAGE):$(RELEASE)$(SUFFIX) - $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(RELEASE) $(DOCKER_CONTENT_TRUST) -endif - -forcepush-y: forcetag-y check-dirty - docker push $(TAG)$(SUFFIX) - $(PUSH_MANIFEST) $(TAG) $(DOCKER_CONTENT_TRUST) -ifneq ($(RELEASE),) - docker tag $(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(RELEASE)$(SUFFIX) - docker push $(ORG)/$(IMAGE):$(RELEASE)$(SUFFIX) - $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(RELEASE) $(DOCKER_CONTENT_TRUST) -endif - -# If not supported for an arch, print a message -tag-n: - $(info This package does not work on $(ARCH). Ignored) -forcetag-n: - $(info This package does not work on $(ARCH). Ignored) -push-n: - $(info This package does not work on $(ARCH). Ignored) -forcepush-n: - $(info This package does not work on $(ARCH). Ignored) From 13d11f49bac5ac6d286a127dbff88c57291d6465 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 16:48:48 +0100 Subject: [PATCH 10/20] Rename "tag*" Makefile targets to "build*" This better matches the `linuxkit pkg build` nomenclature. Signed-off-by: Ian Campbell --- Makefile | 6 +++--- kernel/Makefile | 2 +- pkg/Makefile | 6 +++--- projects/kubernetes/Makefile | 8 ++++---- projects/kubernetes/image-cache/Makefile | 14 +++++++------- test/pkg/Makefile | 6 +++--- tools/Makefile | 6 +++--- tools/alpine/Makefile | 4 ++-- tools/guestfs/Makefile | 4 ++-- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 876883efe..973d81de1 100644 --- a/Makefile +++ b/Makefile @@ -94,19 +94,19 @@ ci: test-cross $(MAKE) $(MAKE) install $(MAKE) -C test all - $(MAKE) -C pkg tag + $(MAKE) -C pkg build ci-tag: test-cross $(MAKE) $(MAKE) install $(MAKE) -C test all - $(MAKE) -C pkg tag + $(MAKE) -C pkg build ci-pr: test-cross $(MAKE) $(MAKE) install $(MAKE) -C test pr - $(MAKE) -C pkg tag + $(MAKE) -C pkg build .PHONY: clean clean: diff --git a/kernel/Makefile b/kernel/Makefile index ed015b23d..af40c4e9c 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -63,7 +63,7 @@ endif KERNEL_VERSIONS= -.PHONY: check tag push +.PHONY: check build push # Targets: # fetch: Downloads the kernel sources into ./sources # build: Builds all kernels diff --git a/pkg/Makefile b/pkg/Makefile index cc311ac95..1676f7675 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -1,5 +1,5 @@ DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml)) -.PHONY: push force-push tag forcetag show-tag clean +.PHONY: push force-push build forcebuild show-tag clean push: @set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done @@ -7,10 +7,10 @@ push: forcepush: @set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done -tag: +build: @set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done -forcetag: +forcebuild: @set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done show-tag: diff --git a/projects/kubernetes/Makefile b/projects/kubernetes/Makefile index a34225572..277d753a2 100644 --- a/projects/kubernetes/Makefile +++ b/projects/kubernetes/Makefile @@ -4,13 +4,13 @@ NETWORK ?= weave-v2.0.4 INIT_YAML ?= INIT_YAML += network.yaml -all: tag-container-images build-vm-images +all: build-container-images build-vm-images -tag-container-images: +build-container-images: linuxkit pkg build kubernetes -tag-cache-images: - $(MAKE) -C image-cache tag +build-cache-images: + $(MAKE) -C image-cache build push-container-images: linuxkit pkg push kubernetes diff --git a/projects/kubernetes/image-cache/Makefile b/projects/kubernetes/image-cache/Makefile index c094bcc50..538f06306 100644 --- a/projects/kubernetes/image-cache/Makefile +++ b/projects/kubernetes/image-cache/Makefile @@ -14,17 +14,17 @@ dl/%.tar: ln $(IMAGES) $${builddir} ; \ $(MAKE) -f Makefile.pkg BUILDDIR=$${builddir} CACHE=$(CACHE) $* -.PHONY: tag-common forcetag-common push-common forcepush-common show-tag-common -tag-common forcetag-common push-common forcepush-common show-tag-common: %-common: $(patsubst %,dl/%.tar,$(COMMON_IMAGES)) +.PHONY: build-common forcebuild-common push-common forcepush-common show-tag-common +build-common forcebuild-common push-common forcepush-common show-tag-common: %-common: $(patsubst %,dl/%.tar,$(COMMON_IMAGES)) @$(MAKE) CACHE=common IMAGES="$^" $*-pkg -.PHONY: tag-control-plane forcetag-control-plane push-control-plane forcepush-control-plane show-tag-control-plane -tag-control-plane forcetag-control-plane push-control-plane forcepush-control-plane show-tag-control-plane: %-control-plane: $(patsubst %,dl/%.tar,$(CONTROL_PLANE_IMAGES)) +.PHONY: build-control-plane forcebuild-control-plane push-control-plane forcepush-control-plane show-tag-control-plane +build-control-plane forcebuild-control-plane push-control-plane forcepush-control-plane show-tag-control-plane: %-control-plane: $(patsubst %,dl/%.tar,$(CONTROL_PLANE_IMAGES)) @$(MAKE) CACHE=control-plane IMAGES="$^" $*-pkg -.PHONY: tag push show-tags -tag: tag-common tag-control-plane -forcetag: forcetag-common forcetag-control-plane +.PHONY: build forcebuild push forcepush show-tags +build: build-common build-control-plane +forcebuild: forcebuild-common forcebuild-control-plane push: push-common push-control-plane forcepush: forcepush-common forcepush-control-plane show-tags: show-tag-common show-tag-control-plane diff --git a/test/pkg/Makefile b/test/pkg/Makefile index ad8d69aaf..614658aa5 100644 --- a/test/pkg/Makefile +++ b/test/pkg/Makefile @@ -1,5 +1,5 @@ DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml)) -.PHONY: push forcepush tag forcetag show-tag clean +.PHONY: push forcepush build forcebuild show-tag clean push: @set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done @@ -7,10 +7,10 @@ push: forcepush: @set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done -tag: +build: @set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done -forcetag: +forcebuild: @set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done show-tag: diff --git a/tools/Makefile b/tools/Makefile index 145f1d79c..57eb9542d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -4,7 +4,7 @@ DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml)) # Note that these are only recursed on for the push target which was the historical behaviour. MAKEDIRS = alpine guestfs -.PHONY: push forcepush tag forcetag show-tag clean +.PHONY: push forcepush build forcebuild show-tag clean push: @set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done @@ -13,10 +13,10 @@ push: forcepush: @set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done -tag: +build: @set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done -forcetag: +forcebuild: @set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done show-tag: diff --git a/tools/alpine/Makefile b/tools/alpine/Makefile index 38e662cea..88695a8e3 100644 --- a/tools/alpine/Makefile +++ b/tools/alpine/Makefile @@ -1,4 +1,4 @@ -.PHONY: tag push +.PHONY: build push ORG?=linuxkit IMAGE=alpine @@ -61,7 +61,7 @@ push: hash iid versions.$(ARCH) ./push-manifest.sh $(ORG) $(IMAGE) rm -f iid -tag: hash iid versions.$(ARCH) +build: hash iid versions.$(ARCH) docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \ docker tag $(shell cat iid) $(ORG)/$(IMAGE):$(shell cat hash) rm -f iid diff --git a/tools/guestfs/Makefile b/tools/guestfs/Makefile index 0813f0dde..4bab51172 100644 --- a/tools/guestfs/Makefile +++ b/tools/guestfs/Makefile @@ -1,4 +1,4 @@ -.PHONY: tag push +.PHONY: build push IMAGE=guestfs @@ -18,7 +18,7 @@ push: hash iid docker push linuxkit/$(IMAGE):$(shell cat hash)) rm -f iid -tag: hash iid +build: hash iid docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ docker tag $(shell cat iid) linuxkit/$(IMAGE):$(shell cat hash) rm -f iid From 206fc78a6a7b5011bc166087bb5366429da4d459 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 09:47:41 +0100 Subject: [PATCH 11/20] Update alpine package Signed-off-by: Ian Campbell --- tools/alpine/versions.aarch64 | 6 +++--- tools/alpine/versions.x86_64 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index a4936fb65..4932f3da6 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,10 +1,10 @@ -# linuxkit/alpine:63822f1da0a07166ceed2d6d79323b464093e43b-arm64 +# linuxkit/alpine:c4689421c338209fe955738729d8b1352741a5cd-arm64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 alpine-keys-2.1-r1 alsa-lib-1.1.3-r0 -apk-tools-2.7.2-r0 +apk-tools-2.7.3-r0 argp-standalone-1.3-r2 attr-2.4.47-r6 attr-dev-2.4.47-r6 @@ -252,7 +252,7 @@ util-linux-dev-2.28.2-r2 vde2-libs-2.3.2-r7 vim-8.0.0595-r0 wayland-1.13.0-r0 -wireguard-tools-0.0.20171001-r0 +wireguard-tools-0.0.20171005-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r3 xfsprogs-4.5.0-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 55c97e754..311dae335 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,10 +1,10 @@ -# linuxkit/alpine:3fb44354a34b05134fbf585a00217cd2f8c8f0bf-amd64 +# linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d-amd64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 alpine-keys-2.1-r1 alsa-lib-1.1.3-r0 -apk-tools-2.7.2-r0 +apk-tools-2.7.3-r0 argp-standalone-1.3-r2 attr-2.4.47-r6 attr-dev-2.4.47-r6 @@ -260,7 +260,7 @@ util-linux-dev-2.28.2-r2 vde2-libs-2.3.2-r7 vim-8.0.0595-r0 wayland-1.13.0-r0 -wireguard-tools-0.0.20171001-r0 +wireguard-tools-0.0.20171005-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r3 xfsprogs-4.5.0-r0 From a237b515116461006d6d593d8063494c42b99177 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 09:55:45 +0100 Subject: [PATCH 12/20] Bump alpine base across the board. By running: ./scripts/update-component-sha.sh --image linuxkit/alpine ad35b6ddbc70faa07e59a9d7dee7707c08122e8d Signed-off-by: Ian Campbell --- kernel/Dockerfile | 2 +- kernel/Dockerfile.kconfig | 2 +- kernel/Dockerfile.zfs | 2 +- pkg/acpid/Dockerfile | 4 ++-- pkg/auditd/Dockerfile | 4 ++-- pkg/binfmt/Dockerfile | 4 ++-- pkg/ca-certificates/Dockerfile | 2 +- pkg/containerd/Dockerfile | 2 +- pkg/dhcpcd/Dockerfile | 2 +- pkg/extend/Dockerfile | 4 ++-- pkg/format/Dockerfile | 4 ++-- pkg/getty/Dockerfile | 2 +- pkg/host-timesync-daemon/Dockerfile | 2 +- pkg/init-lcow/Dockerfile | 4 ++-- pkg/init/Dockerfile | 4 ++-- pkg/ip/Dockerfile | 2 +- pkg/metadata/Dockerfile | 2 +- pkg/mkimage/Dockerfile | 2 +- pkg/modprobe/Dockerfile | 2 +- pkg/mount/Dockerfile | 4 ++-- 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 +- projects/kubernetes/cri-containerd/Dockerfile | 2 +- projects/kubernetes/image-cache/Dockerfile | 2 +- projects/kubernetes/kubernetes/Dockerfile | 2 +- projects/memorizer/kernel-memorizer/Dockerfile | 2 +- projects/okernel/Dockerfile.okernel | 2 +- projects/swarmd/swarmd/Dockerfile | 2 +- test/cases/020_kernel/010_kmod_4.9.x/Dockerfile | 2 +- test/pkg/containerd/Dockerfile | 2 +- test/pkg/docker-bench/Dockerfile | 2 +- test/pkg/kernel-config/Dockerfile | 2 +- test/pkg/ns/Dockerfile | 4 ++-- test/pkg/poweroff/Dockerfile | 2 +- test/pkg/virtsock/Dockerfile | 4 ++-- tools/alpine/versions.aarch64 | 2 +- tools/go-compile/Dockerfile | 2 +- tools/mkimage-iso-bios/Dockerfile | 2 +- tools/mkimage-iso-efi/Dockerfile | 4 ++-- tools/qemu/Dockerfile | 2 +- 52 files changed, 63 insertions(+), 63 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 65cdba634..2527118fb 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:4476496e70a41705f9a8f1c9162a4e21a40817fe AS kernel-build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS kernel-build RUN apk add \ argp-standalone \ automake \ diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig index 7511b468c..1aa108ead 100644 --- a/kernel/Dockerfile.kconfig +++ b/kernel/Dockerfile.kconfig @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:4476496e70a41705f9a8f1c9162a4e21a40817fe AS kernel-build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS kernel-build RUN apk add \ argp-standalone \ build-base \ diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs index a3c5d3885..4ccc47f5e 100644 --- a/kernel/Dockerfile.zfs +++ b/kernel/Dockerfile.zfs @@ -1,6 +1,6 @@ ARG IMAGE FROM ${IMAGE} AS ksrc -FROM linuxkit/alpine:4476496e70a41705f9a8f1c9162a4e21a40817fe AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN apk add \ attr-dev \ autoconf \ diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile index e604af262..9856849a6 100644 --- a/pkg/acpid/Dockerfile +++ b/pkg/acpid/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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:87a0cd10449d72f374f950004467737dbf440630 AS mirror2 +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 fe85bd6b0..6cf55ba01 100644 --- a/pkg/auditd/Dockerfile +++ b/pkg/auditd/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN apk add abuild gcc git ADD build.sh / RUN adduser -D -G abuild builder && sudo -u builder /build.sh -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror COPY --from=build /home/builder/*apk / RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index deaddc5fe..3c78b9932 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS qemu +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS qemu RUN apk add \ qemu-aarch64 \ qemu-arm \ qemu-ppc64le -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 0185bb0db..35e23f20d 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 as alpine +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d as alpine RUN apk add ca-certificates diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 883ea417d..c94c68b1d 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 as alpine +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index 0ebb1ef1e..04a4e8473 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 e301ca985..2f5ffe3d2 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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:87a0cd10449d72f374f950004467737dbf440630 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index dbbbe83e0..cbab0c1a2 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:d1778ee29f11475548f0e861f57005a84e82ba4e AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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:d1778ee29f11475548f0e861f57005a84e82ba4e AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 bc834a0dd..b735d5865 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:d1778ee29f11475548f0e861f57005a84e82ba4e AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 238ec7047..4e0613add 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror RUN apk add --no-cache go musl-dev git ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/init-lcow/Dockerfile b/pkg/init-lcow/Dockerfile index 420f3cf12..ede8f0b4c 100644 --- a/pkg/init-lcow/Dockerfile +++ b/pkg/init-lcow/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:77287352db68b442534c0005edd6ff750c8189f3 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 \ @@ -7,7 +7,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:77287352db68b442534c0005edd6ff750c8189f3 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build ENV OPENGCS_REPO=https://github.com/Microsoft/opengcs ENV OPENGCS_COMMIT=48ae4e3ba3d2fea746fb4dc20a72832a46f45466 RUN apk add --no-cache build-base curl git go musl-dev diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 9e35c3b7d..562bc9ff5 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service -FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile index 119593301..3f917c3e0 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:d1778ee29f11475548f0e861f57005a84e82ba4e AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 ce6839c95..4859ec97a 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 9feecc3c2..6dffedfcd 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 6a8a9a089..1bd58dc59 100644 --- a/pkg/modprobe/Dockerfile +++ b/pkg/modprobe/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 e78cfa20b..31741c6b7 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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:87a0cd10449d72f374f950004467737dbf440630 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index 5ed20d3d8..2bfcc3f52 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 4e8301c9c..0004256a5 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 c77d66590..64ccf180d 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 495dfea80..84c5448de 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 e9a71a3ea..80f41684f 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 as alpine +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index df8a2911a..e38f564d6 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:d1778ee29f11475548f0e861f57005a84e82ba4e AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 4f3bc9194..e0fcca1ef 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 281d25320..2f788e03f 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 a9fa8a193..e37b6aa3e 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 bfa63ba76..10debab31 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:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 88de09a5c..23a3f1b7b 100644 --- a/pkg/tss/Dockerfile +++ b/pkg/tss/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 d409a00a9..3cd4269ff 100644 --- a/pkg/vpnkit-expose-port/Dockerfile +++ b/pkg/vpnkit-expose-port/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 f6cd163d0..ba0ef6729 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 f18dfc4cf..528fe33e0 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/projects/kubernetes/cri-containerd/Dockerfile b/projects/kubernetes/cri-containerd/Dockerfile index cb4205ec5..1c9dc0295 100644 --- a/projects/kubernetes/cri-containerd/Dockerfile +++ b/projects/kubernetes/cri-containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN \ apk add \ diff --git a/projects/kubernetes/image-cache/Dockerfile b/projects/kubernetes/image-cache/Dockerfile index 31910a794..5ae2a8226 100644 --- a/projects/kubernetes/image-cache/Dockerfile +++ b/projects/kubernetes/image-cache/Dockerfile @@ -2,7 +2,7 @@ FROM docker:17.06.0-ce AS docker # Nothing to do in here, just for COPY --from=docker below -FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/projects/kubernetes/kubernetes/Dockerfile b/projects/kubernetes/kubernetes/Dockerfile index 26f676a41..b2739cec0 100644 --- a/projects/kubernetes/kubernetes/Dockerfile +++ b/projects/kubernetes/kubernetes/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build ENV kubernetes_version v1.8.0 ENV cni_version v0.6.0 diff --git a/projects/memorizer/kernel-memorizer/Dockerfile b/projects/memorizer/kernel-memorizer/Dockerfile index a82c815eb..1a1763aa7 100644 --- a/projects/memorizer/kernel-memorizer/Dockerfile +++ b/projects/memorizer/kernel-memorizer/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:a44da41b988024aa2c73b28dee8a51d026f6240b AS kernel-build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS kernel-build RUN apk add \ argp-standalone \ automake \ diff --git a/projects/okernel/Dockerfile.okernel b/projects/okernel/Dockerfile.okernel index 291587b65..edb282c3e 100644 --- a/projects/okernel/Dockerfile.okernel +++ b/projects/okernel/Dockerfile.okernel @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:21f2d52a0e20a78a0a81bbf5bebc652a3ec21b01 AS kernel-build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS kernel-build RUN apk --no-cache add \ argp-standalone \ automake \ diff --git a/projects/swarmd/swarmd/Dockerfile b/projects/swarmd/swarmd/Dockerfile index ce27cd450..8982b39d9 100644 --- a/projects/swarmd/swarmd/Dockerfile +++ b/projects/swarmd/swarmd/Dockerfile @@ -2,7 +2,7 @@ FROM weaveworks/weave:2.0.1@sha256:2d70caac7db33365482cc923d40ff8d3ec1238ae7fe06 # Nothing to do in here, just for COPY --from=weave below -FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN \ apk update && apk upgrade && \ diff --git a/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile index 98fa01b3e..8e986f46f 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.9.53 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN apk add build-base COPY --from=ksrc /kernel-dev.tar / diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 710214896..6bed69e98 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) diff --git a/test/pkg/docker-bench/Dockerfile b/test/pkg/docker-bench/Dockerfile index b48daf23a..057de6dcd 100644 --- a/test/pkg/docker-bench/Dockerfile +++ b/test/pkg/docker-bench/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 96ec6c3be..cb9f2642d 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 0a8e559b1..e281dc5a0 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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:87a0cd10449d72f374f950004467737dbf440630 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN apk add --no-cache \ build-base \ git \ diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile index 8358be398..10a6e6c7d 100644 --- a/test/pkg/poweroff/Dockerfile +++ b/test/pkg/poweroff/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 18578b498..9994e33ea 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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:87a0cd10449d72f374f950004467737dbf440630 AS build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 4932f3da6..39fc336a9 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:c4689421c338209fe955738729d8b1352741a5cd-arm64 +# linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d-arm64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile index 4808d852f..797de0cfa 100644 --- a/tools/go-compile/Dockerfile +++ b/tools/go-compile/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 11f826d95..986237ab2 100644 --- a/tools/mkimage-iso-bios/Dockerfile +++ b/tools/mkimage-iso-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d RUN \ apk update && apk upgrade && \ diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile index 3de04c236..5cd93906d 100644 --- a/tools/mkimage-iso-efi/Dockerfile +++ b/tools/mkimage-iso-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:8b53d842a47fce43464e15f65ee2f68b82542330 AS grub-build +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS grub-build RUN apk add \ automake \ @@ -45,7 +45,7 @@ RUN mkdir /grub-lib && \ ;; \ esac -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS make-img +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS make-img RUN \ apk update && apk upgrade && \ diff --git a/tools/qemu/Dockerfile b/tools/qemu/Dockerfile index 201f34ea4..bc5eebda0 100644 --- a/tools/qemu/Dockerfile +++ b/tools/qemu/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d 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 d055ab31d87a5ab7494b169822c5f7adcc78b873 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 10:13:15 +0100 Subject: [PATCH 13/20] tools: mkimage-*: disable content trust Signing is not setup for these repositories. It seems they haven't been updated since before trust was added since their previous Makefile metadata (which was translated in build.yml) did not contain `NOTRUST=1`. Signed-off-by: Ian Campbell --- tools/mkimage-dynamic-vhd/build.yml | 1 + tools/mkimage-gcp/build.yml | 1 + tools/mkimage-iso-bios/build.yml | 1 + tools/mkimage-iso-efi/build.yml | 1 + tools/mkimage-vhd/build.yml | 1 + tools/mkimage-vmdk/build.yml | 1 + 6 files changed, 6 insertions(+) diff --git a/tools/mkimage-dynamic-vhd/build.yml b/tools/mkimage-dynamic-vhd/build.yml index 5fef466bf..1d8c28f28 100644 --- a/tools/mkimage-dynamic-vhd/build.yml +++ b/tools/mkimage-dynamic-vhd/build.yml @@ -1 +1,2 @@ image: mkimage-dynamic-vhd +disable-content-trust: true diff --git a/tools/mkimage-gcp/build.yml b/tools/mkimage-gcp/build.yml index 29e878945..89fef6c63 100644 --- a/tools/mkimage-gcp/build.yml +++ b/tools/mkimage-gcp/build.yml @@ -1 +1,2 @@ image: mkimage-gcp +disable-content-trust: true diff --git a/tools/mkimage-iso-bios/build.yml b/tools/mkimage-iso-bios/build.yml index 4dd32749e..2910b2172 100644 --- a/tools/mkimage-iso-bios/build.yml +++ b/tools/mkimage-iso-bios/build.yml @@ -1,3 +1,4 @@ image: mkimage-iso-bios +disable-content-trust: true arches: - amd64 diff --git a/tools/mkimage-iso-efi/build.yml b/tools/mkimage-iso-efi/build.yml index 1ea72881e..3151301d1 100644 --- a/tools/mkimage-iso-efi/build.yml +++ b/tools/mkimage-iso-efi/build.yml @@ -1,2 +1,3 @@ image: mkimage-iso-efi +disable-content-trust: true network: true diff --git a/tools/mkimage-vhd/build.yml b/tools/mkimage-vhd/build.yml index 8b00b4fda..dde28fc5d 100644 --- a/tools/mkimage-vhd/build.yml +++ b/tools/mkimage-vhd/build.yml @@ -1 +1,2 @@ image: mkimage-vhd +disable-content-trust: true diff --git a/tools/mkimage-vmdk/build.yml b/tools/mkimage-vmdk/build.yml index cfad11d0b..97ef2c7ea 100644 --- a/tools/mkimage-vmdk/build.yml +++ b/tools/mkimage-vmdk/build.yml @@ -1 +1,2 @@ image: mkimage-vmdk +disable-content-trust: true From 57225335bc79a6a2ecfef02c93ae844ed87e1dea Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 10:22:24 +0100 Subject: [PATCH 14/20] Correct manifest push without content trust The script expects an empty second argument to mean no trust and anything else to mean trust. Signed-off-by: Ian Campbell --- src/cmd/linuxkit/pkglib/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/pkglib/docker.go b/src/cmd/linuxkit/pkglib/docker.go index b467ce8bc..f3d377ad3 100644 --- a/src/cmd/linuxkit/pkglib/docker.go +++ b/src/cmd/linuxkit/pkglib/docker.go @@ -75,7 +75,7 @@ func (dr dockerRunner) pushWithManifest(img, suffix string) error { return err } - dctArg := "0" + var dctArg string if dr.dct { dctArg = "1" } From e0b537b19e4003f0a2a79beba261820156a28078 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 10:33:02 +0100 Subject: [PATCH 15/20] Revert "Rename `poweroff` to `test-poweroff` for consistency" This reverts commit c889f13251b65cd3e0f5130521a880716c16bc5d. Changing the name breaks signing. Signed-off-by: Ian Campbell --- test/pkg/poweroff/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pkg/poweroff/build.yml b/test/pkg/poweroff/build.yml index 03b66d5a6..b83188aa2 100644 --- a/test/pkg/poweroff/build.yml +++ b/test/pkg/poweroff/build.yml @@ -1 +1 @@ -image: test-poweroff +image: poweroff From 12e6a85661e48e3be0ce73cc0be6e620754a7436 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 10:42:58 +0100 Subject: [PATCH 16/20] Make `linuxkit pkg build` on an unsupported arch a nop Rather than a hard fail. This allows batch builds of a set of packages without the surrounding loop needing to be away of the possibility. Signed-off-by: Ian Campbell --- src/cmd/linuxkit/pkglib/build.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/pkglib/build.go b/src/cmd/linuxkit/pkglib/build.go index b919a8f0b..4bf8fa991 100644 --- a/src/cmd/linuxkit/pkglib/build.go +++ b/src/cmd/linuxkit/pkglib/build.go @@ -46,7 +46,8 @@ func (p Pkg) Build(bos ...BuildOpt) error { arch := runtime.GOARCH if !p.archSupported(arch) { - return fmt.Errorf("Arch %s not supported by this package", arch) + fmt.Printf("Arch %s not supported by this package, skipping build.\n", arch) + return nil } if err := p.cleanForBuild(); err != nil { return err From fbf23b4b9f3048aa674f7477e266d8bebb6ef0f3 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 17:37:38 +0100 Subject: [PATCH 17/20] New option `linuxkit pkg build --force-dirty` Will tag as `-dirty` and prevent push etc even if the tree isn't actually dirty. Signed-off-by: Ian Campbell --- src/cmd/linuxkit/pkglib/pkglib.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/pkglib/pkglib.go b/src/cmd/linuxkit/pkglib/pkglib.go index fad28fced..ee5a584a5 100644 --- a/src/cmd/linuxkit/pkglib/pkglib.go +++ b/src/cmd/linuxkit/pkglib/pkglib.go @@ -67,10 +67,12 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) { // Other arguments var buildYML, hash, hashCommit, hashPath string + var dirty bool fs.StringVar(&buildYML, "build-yml", "build.yml", "Override the name of the yml file") fs.StringVar(&hash, "hash", "", "Override the image hash (default is to query git for the package's tree-sh)") fs.StringVar(&hashCommit, "hash-commit", "HEAD", "Override the git commit to use for the hash") fs.StringVar(&hashPath, "hash-path", "", "Override the directory to use for the image hash, must be a parent of the package dir (default is to use the package dir)") + fs.BoolVar(&dirty, "force-dirty", false, "Force the pkg to be considered dirty") fs.Parse(args) @@ -142,11 +144,13 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) { } } - dirty, err := gitIsDirty(hashPath, hashCommit) + gitDirty, err := gitIsDirty(hashPath, hashCommit) if err != nil { return Pkg{}, err } + dirty = dirty || gitDirty + return Pkg{ image: pi.Image, org: pi.Org, From cf590bb455767c3b0a386b6d08a42ec69c181d76 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 10:53:38 +0100 Subject: [PATCH 18/20] test: ltp: disable content trust Signing is not setup for this repositories. It seems it hasn't been updated since before trust was added since the previous Makefile metadata (which was translated in build.yml) did not contain `NOTRUST=1`. Signed-off-by: Ian Campbell --- test/pkg/ltp/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/test/pkg/ltp/build.yml b/test/pkg/ltp/build.yml index 26459fd15..142370356 100644 --- a/test/pkg/ltp/build.yml +++ b/test/pkg/ltp/build.yml @@ -1,4 +1,5 @@ image: test-ltp network: true +disable-content-trust: true arches: - amd64 From 694a7876ef0f08e65750da933fee9a65b8143159 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 13:17:15 +0100 Subject: [PATCH 19/20] Bump test/pkg/ns/template.yml Doing before mass update otherwise users of linuxkit/test-ns will be switched to -dirty. Signed-off-by: Ian Campbell --- test/pkg/ns/template.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index aa02aac04..23636f9a4 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:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: test-ns image: linuxkit/test-ns: @@ -14,7 +14,7 @@ onboot: - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: From 4df5d394e854c86c78b639e1c40d4f7c1be6706a Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 13:04:58 +0100 Subject: [PATCH 20/20] Bump yml Done as follows: find -name build.yml | xargs dirname | while read d ; do t=$(linuxkit pkg show-tag $d) ./scripts/update-component-sha.sh --image ${t%:*} ${t#*:} done git commit -s test pkg tools blueprints examples projects/kubernetes projects/swarmd docs linuxkit.yml Makefile src This explicitly excludes projects/* which I did not know whether to update. Then: git reset --hard for i in init runc containerd ca-certificates sysctl dhcpcd getty rngd ; do o=$(git grep -h "\(image:\|-\) *linuxkit/$i:[0-9a-f]\{40\}" origin/master:linuxkit.yml | awk '// { print $2 }') n=$(linuxkit pkg show-tag pkg/$i) ./scripts/update-component-sha.sh "$o" "$n" done git commit --amend projects This updates any projects which were using components with the same hash as the top-level linuxkit.yml. Signed-off-by: Ian Campbell --- Makefile | 2 +- blueprints/docker-for-mac/base.yml | 40 +++++++++---------- blueprints/lcow.yml | 4 +- docs/vendoring.md | 4 +- examples/aws.yml | 18 ++++----- examples/azure.yml | 16 ++++---- examples/docker.yml | 24 +++++------ examples/gcp.yml | 20 +++++----- examples/getty.yml | 16 ++++---- examples/minimal.yml | 10 ++--- examples/node_exporter.yml | 12 +++--- examples/packet.yml | 20 +++++----- examples/redis-os.yml | 10 ++--- examples/sshd.yml | 20 +++++----- examples/swap.yml | 22 +++++----- examples/tpm.yml | 18 ++++----- examples/vmware.yml | 16 ++++---- examples/vpnkit-forwarder.yml | 14 +++---- examples/vsudd.yml | 10 ++--- examples/vultr.yml | 20 +++++----- examples/wireguard.yml | 20 +++++----- linuxkit.yml | 16 ++++---- .../clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 14 +++---- projects/compose/compose-static.yml | 14 +++---- projects/etcd/etcd.yml | 14 +++---- projects/etcd/prom-us-central1-f.yml | 6 +-- projects/ima-namespace/ima-namespace.yml | 14 +++---- projects/kubernetes/cri-containerd.yml | 2 +- projects/kubernetes/kube.yml | 30 +++++++------- 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 | 10 ++--- projects/okernel/examples/okernel_simple.yaml | 14 +++---- projects/shiftfs/shiftfs.yml | 16 ++++---- projects/swarmd/swarmd.yml | 28 ++++++------- src/cmd/linuxkit/run_qemu.go | 2 +- test/cases/000_build/000_outputs/test.yml | 6 +-- .../000_qemu/000_run_kernel/test.yml | 6 +-- .../000_qemu/010_run_iso/test.yml | 6 +-- .../000_qemu/020_run_efi/test.yml | 6 +-- .../000_qemu/030_run_qcow/test.yml | 6 +-- .../000_qemu/040_run_raw/test.yml | 6 +-- .../000_qemu/100_container/test.yml | 6 +-- .../010_hyperkit/000_run_kernel/test.yml | 6 +-- .../010_hyperkit/010_acpi/test.yml | 8 ++-- .../020_kernel/000_config_4.4.x/test.yml | 8 ++-- .../020_kernel/001_config_4.9.x/test.yml | 8 ++-- .../020_kernel/005_config_4.13.x/test.yml | 8 ++-- test/cases/020_kernel/010_kmod_4.9.x/test.yml | 6 +-- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../010_echo-short-1con-single/test.yml | 4 +- .../test.yml | 4 +- .../011_echo-short-10con-single/test.yml | 4 +- .../test.yml | 4 +- .../012_echo-short-5con-multi/test.yml | 4 +- .../test.yml | 4 +- .../015_echo-long-1con-single/test.yml | 4 +- .../test.yml | 4 +- .../016_echo-long-10con-single/test.yml | 4 +- .../017_echo-long-5con-multi-reverse/test.yml | 4 +- .../017_echo-long-5con-multi/test.yml | 4 +- .../010_veth-unix-domain-echo/test.yml | 4 +- .../test.yml | 4 +- .../100_mix/012_veth-ipv4-echo/test.yml | 4 +- .../100_mix/013_veth-ipv6-echo/test.yml | 4 +- .../100_mix/014_veth-tcp-echo/test.yml | 4 +- .../100_mix/015_veth-udp-echo/test.yml | 4 +- .../100_mix/020_unix-domain-echo/test.yml | 4 +- .../110_namespace/000_kernel-4.4.x/common.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../010_echo-short-1con-single/test.yml | 4 +- .../test.yml | 4 +- .../011_echo-short-10con-single/test.yml | 4 +- .../test.yml | 4 +- .../012_echo-short-5con-multi/test.yml | 4 +- .../test.yml | 4 +- .../015_echo-long-1con-single/test.yml | 4 +- .../test.yml | 4 +- .../016_echo-long-10con-single/test.yml | 4 +- .../017_echo-long-5con-multi-reverse/test.yml | 4 +- .../017_echo-long-5con-multi/test.yml | 4 +- .../010_veth-unix-domain-echo/test.yml | 4 +- .../test.yml | 4 +- .../100_mix/012_veth-ipv4-echo/test.yml | 4 +- .../100_mix/013_veth-ipv6-echo/test.yml | 4 +- .../100_mix/014_veth-tcp-echo/test.yml | 4 +- .../100_mix/015_veth-udp-echo/test.yml | 4 +- .../100_mix/020_unix-domain-echo/test.yml | 4 +- .../110_namespace/001_kernel-4.9.x/common.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../test.yml | 4 +- .../010_echo-short-1con-single/test.yml | 4 +- .../test.yml | 4 +- .../011_echo-short-10con-single/test.yml | 4 +- .../test.yml | 4 +- .../012_echo-short-5con-multi/test.yml | 4 +- .../test.yml | 4 +- .../015_echo-long-1con-single/test.yml | 4 +- .../test.yml | 4 +- .../016_echo-long-10con-single/test.yml | 4 +- .../017_echo-long-5con-multi-reverse/test.yml | 4 +- .../017_echo-long-5con-multi/test.yml | 4 +- .../010_veth-unix-domain-echo/test.yml | 4 +- .../test.yml | 4 +- .../100_mix/012_veth-ipv4-echo/test.yml | 4 +- .../100_mix/013_veth-ipv6-echo/test.yml | 4 +- .../100_mix/014_veth-tcp-echo/test.yml | 4 +- .../100_mix/015_veth-udp-echo/test.yml | 4 +- .../100_mix/020_unix-domain-echo/test.yml | 4 +- .../005_kernel-4.13.x/common.yml | 4 +- .../030_security/000_docker-bench/test.yml | 22 +++++----- test/cases/030_security/010_ports/test.yml | 6 +-- test/cases/040_packages/002_binfmt/test.yml | 8 ++-- .../040_packages/003_ca-certificates/test.yml | 8 ++-- .../040_packages/003_containerd/test.yml | 20 +++++----- test/cases/040_packages/004_dhcpcd/test.yml | 8 ++-- .../005_extend/000_ext4/test-create.yml | 10 ++--- .../040_packages/005_extend/000_ext4/test.yml | 10 ++--- .../005_extend/001_btrfs/test-create.yml | 10 ++--- .../005_extend/001_btrfs/test.yml | 10 ++--- .../005_extend/002_xfs/test-create.yml | 10 ++--- .../040_packages/005_extend/002_xfs/test.yml | 10 ++--- .../006_format_mount/000_auto/test.yml | 10 ++--- .../006_format_mount/001_by_label/test.yml | 10 ++--- .../006_format_mount/002_by_name/test.yml.in | 10 ++--- .../006_format_mount/003_btrfs/test.yml | 10 ++--- .../006_format_mount/004_xfs/test.yml | 10 ++--- .../005_by_device_force/test.yml | 16 ++++---- .../006_format_mount/010_multiple/test.yml | 14 +++---- .../007_getty-containerd/test.yml | 12 +++--- .../040_packages/013_mkimage/mkimage.yml | 8 ++-- test/cases/040_packages/013_mkimage/run.yml | 6 +-- test/cases/040_packages/019_sysctl/test.yml | 8 ++-- .../cases/040_packages/023_wireguard/test.yml | 14 +++---- test/hack/test-ltp.yml | 10 ++--- test/hack/test.yml | 12 +++--- 282 files changed, 872 insertions(+), 872 deletions(-) diff --git a/Makefile b/Makefile index 973d81de1..1513cd810 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: default VERSION="0.0" # dummy for now GIT_COMMIT=$(shell git rev-list -1 HEAD) -GO_COMPILE=linuxkit/go-compile:7cac05c5588b3dd6a7f7bdb34fc1da90257394c7 +GO_COMPILE=linuxkit/go-compile:20621b2539e546a8c94e625928f8d59f12684398 MOBY?=bin/moby LINUXKIT?=bin/linuxkit diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index e4d5e07f7..74aceda59 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -3,30 +3,30 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/vpnkit-expose-port:fa4ab4ac78b83fe392e39b861b4114c3bb02d170 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/vpnkit-expose-port:62c36a9df76b53b36103783040d26246a5670697 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: # support metadata for optional config in /var/config - name: metadata - image: linuxkit/metadata:52a3d36ed158357125f3a998f9d03784eb0636d3 + image: linuxkit/metadata:4920d2b7f987c4cf67c5472308b0badcdfac4b2b - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: sysfs - image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 + image: linuxkit/sysfs:7ff47034ed61c8e4c7ca5b8992056c66c6f39df8 - name: binfmt - image: linuxkit/binfmt:472eeba777d056c5f98fe074aa0f581c67ccc7ff + image: linuxkit/binfmt:dff7a32108d8e40922027642b598b4eb011f46bb # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:3881b1e0fadb7765d2fa85d03563c887ab9335a6 + image: linuxkit/swap:195ef5c89fcd68ff412ecb01a330e75503dc7b83 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:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:79e5c20de96e1633c9c40935b99dde45aefba37b + image: linuxkit/acpid:6e3f0c5deca1633230dce9a35b67e1f61f05c47a # Enable getty for easier debugging - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67 + image: linuxkit/openntpd:8d32daf90ecf70b7e185cb7a2db53b4c539d371c # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:d40f65855dfc4fe4740ba5fb5d3282cbc2131715 + image: linuxkit/vsudd:c6afbe7c0abc87e9aa204fa98247f8b05dee3488 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:42d80758e3b6a9f58cdfd25e53c775eebe951669 + image: linuxkit/vpnkit-forwarder:41dea19da37ce88d351ef3bd612004fb455a5a71 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:8e7aea3dc87bbb72cf56e62d8b8861ff93946480 + image: linuxkit/trim-after-delete:75f57f502528aa16dea1f9ac78b8993b217917fb # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:625a906f2c3d9a3a2b8c856f062bc6c0d6b526bd + image: linuxkit/host-timesync-daemon:a5f86805ac54c086fc1ef6fa107d50a13ef2ec7e trust: org: diff --git a/blueprints/lcow.yml b/blueprints/lcow.yml index a395d5d6b..727c1a742 100644 --- a/blueprints/lcow.yml +++ b/blueprints/lcow.yml @@ -4,8 +4,8 @@ kernel: cmdline: "console=ttyS0" tar: none init: - - linuxkit/init-lcow:877bfca958c836f7e0ba9a6157088905611a08f9 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init-lcow:50112be5023c21bf5a355323243c56b30890bc89 + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a files: - path: etc/linuxkit.yml metadata: yaml diff --git a/docs/vendoring.md b/docs/vendoring.md index fa82b41a7..c9f51e6d4 100644 --- a/docs/vendoring.md +++ b/docs/vendoring.md @@ -22,7 +22,7 @@ docker run -it --rm \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ --entrypoint /go/bin/vndr \ -linuxkit/go-compile:7cac05c5588b3dd6a7f7bdb34fc1da90257394c7 +linuxkit/go-compile:20621b2539e546a8c94e625928f8d59f12684398 ``` To update a single dependency: @@ -32,7 +32,7 @@ docker run -it --rm \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ --entrypoint /go/bin/vndr \ -linuxkit/go-compile:7cac05c5588b3dd6a7f7bdb34fc1da90257394c7 +linuxkit/go-compile:20621b2539e546a8c94e625928f8d59f12684398 github.com/docker/docker ``` diff --git a/examples/aws.yml b/examples/aws.yml index 1de0531e4..1d37eb212 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:52a3d36ed158357125f3a998f9d03784eb0636d3 + image: linuxkit/metadata:4920d2b7f987c4cf67c5472308b0badcdfac4b2b services: - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: sshd - image: linuxkit/sshd:361e9d03f96ef5f22e61c69280ffb9291bde746f + image: linuxkit/sshd:4a2fc7be31fa57dcade391de6173e0af55296e7f binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index c818de14e..987ef48ca 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 services: - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 - name: sshd - image: linuxkit/sshd:361e9d03f96ef5f22e61c69280ffb9291bde746f + image: linuxkit/sshd:4a2fc7be31fa57dcade391de6173e0af55296e7f files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/docker.yml b/examples/docker.yml index 68c79310a..297ef6d13 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,31 +2,31 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: sysfs - image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 + image: linuxkit/sysfs:7ff47034ed61c8e4c7ca5b8992056c66c6f39df8 - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 - name: ntpd - image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67 + image: linuxkit/openntpd:8d32daf90ecf70b7e185cb7a2db53b4c539d371c - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index c98561870..bd0b6c80b 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:52a3d36ed158357125f3a998f9d03784eb0636d3 + image: linuxkit/metadata:4920d2b7f987c4cf67c5472308b0badcdfac4b2b services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: sshd - image: linuxkit/sshd:361e9d03f96ef5f22e61c69280ffb9291bde746f + image: linuxkit/sshd:4a2fc7be31fa57dcade391de6173e0af55296e7f binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 6d015eda2..52856e2ef 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/minimal.yml b/examples/minimal.yml index c8a11a0de..67134ee39 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 0ac277093..9af58cf5e 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 - name: node_exporter image: linuxkit/node_exporter:a058fe1c6a4440a9689022a9fd7cffdcfd56d52c trust: diff --git a/examples/packet.yml b/examples/packet.yml index 2f811b9ac..b60852878 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: rngd1 - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:52a3d36ed158357125f3a998f9d03784eb0636d3 + image: linuxkit/metadata:4920d2b7f987c4cf67c5472308b0badcdfac4b2b command: ["/usr/bin/metadata", "packet"] services: - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: sshd - image: linuxkit/sshd:361e9d03f96ef5f22e61c69280ffb9291bde746f + image: linuxkit/sshd:4a2fc7be31fa57dcade391de6173e0af55296e7f trust: org: - linuxkit diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 93f732a0f..588328654 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index e6e324b27..94b09a895 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: rngd1 - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 - name: sshd - image: linuxkit/sshd:361e9d03f96ef5f22e61c69280ffb9291bde746f + image: linuxkit/sshd:4a2fc7be31fa57dcade391de6173e0af55296e7f files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index 2990e86e0..1340783b7 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:3881b1e0fadb7765d2fa85d03563c887ab9335a6 + image: linuxkit/swap:195ef5c89fcd68ff412ecb01a330e75503dc7b83 # 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:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: nginx image: nginx:alpine capabilities: diff --git a/examples/tpm.yml b/examples/tpm.yml index 2241890b3..4bc283c4a 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:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: tss - image: linuxkit/tss:7f7d8d3d76d764e3130dd92f52c4944908c8bd80 + image: linuxkit/tss:2c29b212733e90fbbd7aeaf032cadc044dbc7fe4 - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db 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 35f2aeabf..8ede2de91 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,22 +2,22 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=tty0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 - name: nginx image: nginx:alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 715282521..1c0308192 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.6 @@ -19,15 +19,15 @@ 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:361e9d03f96ef5f22e61c69280ffb9291bde746f + image: linuxkit/sshd:4a2fc7be31fa57dcade391de6173e0af55296e7f - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:42d80758e3b6a9f58cdfd25e53c775eebe951669 + image: linuxkit/vpnkit-forwarder:41dea19da37ce88d351ef3bd612004fb455a5a71 binds: - /var/vpnkit:/port net: host command: ["/vpnkit-forwarder"] - name: vpnkit-expose-port - image: linuxkit/vpnkit-forwarder:42d80758e3b6a9f58cdfd25e53c775eebe951669 + image: linuxkit/vpnkit-forwarder:41dea19da37ce88d351ef3bd612004fb455a5a71 net: none binds: - /var/vpnkit:/port diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 1a454c850..1e57b2a0b 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:d40f65855dfc4fe4740ba5fb5d3282cbc2131715 + image: linuxkit/vsudd:c6afbe7c0abc87e9aa204fa98247f8b05dee3488 binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/examples/vultr.yml b/examples/vultr.yml index a3152c6ff..51802a993 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:52a3d36ed158357125f3a998f9d03784eb0636d3 + image: linuxkit/metadata:4920d2b7f987c4cf67c5472308b0badcdfac4b2b services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: sshd - image: linuxkit/sshd:361e9d03f96ef5f22e61c69280ffb9291bde746f + image: linuxkit/sshd:4a2fc7be31fa57dcade391de6173e0af55296e7f binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 1fed57ebb..0571c3331 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.9.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:bdc10950043419d4eb19a10c3122e12ee472d465 + image: linuxkit/ip:7a82871df06767cfe26a04d0ed6bee1031ba5d04 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:bdc10950043419d4eb19a10c3122e12ee472d465 + image: linuxkit/ip:7a82871df06767cfe26a04d0ed6bee1031ba5d04 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,12 +40,12 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:48870d0f92c65fecd6ddb18004d68d85f9b9cde3 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true net: /run/netns/wg1 - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: nginx image: nginx:alpine net: /run/netns/wg0 diff --git a/linuxkit.yml b/linuxkit.yml index a25291a28..695609e07 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 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:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: nginx image: nginx:alpine capabilities: diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index a40b2e6cf..bb540450a 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:7804129bd06218b72c298139a25698a748d253c6 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 81fadac31..dc00b5062 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: sysfs image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 @@ -21,7 +21,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: ntpd image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67 - name: docker diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 9ae51be36..08ba998ea 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: sysfs image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 @@ -21,7 +21,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: ntpd image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67 - name: docker diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index f24c6dd86..5a060c162 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -2,26 +2,26 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: format image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 - name: mount image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da command: ["/usr/bin/mountie", "/var/lib/etcd"] - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata image: linuxkit/metadata:52a3d36ed158357125f3a998f9d03784eb0636d3 services: - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: ntpd image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67 - name: node_exporter diff --git a/projects/etcd/prom-us-central1-f.yml b/projects/etcd/prom-us-central1-f.yml index a2b7ce8b4..0634a2296 100644 --- a/projects/etcd/prom-us-central1-f.yml +++ b/projects/etcd/prom-us-central1-f.yml @@ -2,15 +2,15 @@ kernel: image: mobylinux/kernel:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata image: linuxkit/metadata:52a3d36ed158357125f3a998f9d03784eb0636d3 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 6b57cff16..e18d98906 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:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: nginx image: nginx:alpine capabilities: diff --git a/projects/kubernetes/cri-containerd.yml b/projects/kubernetes/cri-containerd.yml index bd7aeb6f8..4c0c9034c 100644 --- a/projects/kubernetes/cri-containerd.yml +++ b/projects/kubernetes/cri-containerd.yml @@ -1,6 +1,6 @@ services: - name: cri-containerd - image: linuxkitprojects/cri-containerd:2e3f5fcb87f92e1176637943b496910b9d979fb5 + image: linuxkitprojects/cri-containerd:5330c05b7eabba51d97af9d06204b7664e0719ef files: - path: /etc/kubelet.sh.conf contents: | diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index 84325d833..f9b8f7b97 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -2,41 +2,41 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 binds: - /etc/sysctl.d/01-kubernetes.conf:/etc/sysctl.d/01-kubernetes.conf readonly: false - name: sysfs - image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 + image: linuxkit/sysfs:7ff47034ed61c8e4c7ca5b8992056c66c6f39df8 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:52a3d36ed158357125f3a998f9d03784eb0636d3 + image: linuxkit/metadata:4920d2b7f987c4cf67c5472308b0badcdfac4b2b - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc - name: mounts - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/"] services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: ntpd - image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67 + image: linuxkit/openntpd:8d32daf90ecf70b7e185cb7a2db53b4c539d371c - name: sshd - image: linuxkit/sshd:361e9d03f96ef5f22e61c69280ffb9291bde746f + image: linuxkit/sshd:4a2fc7be31fa57dcade391de6173e0af55296e7f - name: kubelet - image: linuxkitprojects/kubernetes:2a42ca12c52a756ffd83ec014f2b396891880e4a + image: linuxkitprojects/kubernetes:6ec18b4e75dcf17c47887ece1848b63ddbe10230 files: - path: etc/linuxkit.yml metadata: yaml diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 42ac864a0..2f066accc 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:7804129bd06218b72c298139a25698a748d253c6 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a - 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 e97690e7e..dc673f22b 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 # with runc, logwrite, startmemlogd - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a # with runc, logwrite, startmemlogd + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: nginx image: nginx:alpine capabilities: diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index a3f7d7383..ac85dc3cc 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:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 31e815eec..0d96f35e0 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:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 - samoht/fdd onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 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 a819a565a..257fca88b 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcp-client image: miragesdk/dhcp-client:22aa9d527820534295a8cd59901c0c5197af6585 net: host @@ -30,7 +30,7 @@ services: - name: sshd image: linuxkit/sshd:361e9d03f96ef5f22e61c69280ffb9291bde746f - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 90771651b..0952f4bc8 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:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 services: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 440f7e713..98d8da3cb 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:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: nginx image: nginx:alpine capabilities: diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 684931fe3..710f89790 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -2,38 +2,38 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 binds: - /etc/sysctl.d/01-swarmd.conf:/etc/sysctl.d/01-swarmd.conf - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/swarmd"] - name: metadata - image: linuxkit/metadata:52a3d36ed158357125f3a998f9d03784eb0636d3 + image: linuxkit/metadata:4920d2b7f987c4cf67c5472308b0badcdfac4b2b services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 env: - INSECURE=true - name: qemu-ga - image: linuxkit/qemu-ga:7c845bfb09ec6807fc15bfd93ce5d5fcc591e999 + image: linuxkit/qemu-ga:2f002fffcb6f5f65bc034b5c0fef60545631ff93 binds: - /dev/vport0p1:/dev/vport0p1 - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: ntpd - image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67 + image: linuxkit/openntpd:8d32daf90ecf70b7e185cb7a2db53b4c539d371c - name: weave image: weaveworks/weave:2.0.1@sha256:2d70caac7db33365482cc923d40ff8d3ec1238ae7fe06a00b3dde310d09f226e # Must match swarmd/Dockerfile command: ["/bin/sh", "/home/weave/weaver-wrapper"] @@ -45,7 +45,7 @@ services: - /var:/var - /var/lib/swarmd:/weavedb - name: swarmd - image: linuxkitprojects/swarmd:cce587b5e67b7d3e088a2e527dafc5ad3edb6502 + image: linuxkitprojects/swarmd:89144a08c30ff753c23b1dad1f8127e9c1ed32e0 command: ["/usr/bin/swarmd", "--containerd-addr=/run/containerd/containerd.sock", "--log-level=debug", "--state-dir=/var/lib/swarmd"] capabilities: - all diff --git a/src/cmd/linuxkit/run_qemu.go b/src/cmd/linuxkit/run_qemu.go index 637e91e64..b2ce5f147 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:4eb19447a221052654276cdf57effa20b672b081" + QemuImg = "linuxkit/qemu:f185296d0420d3771cfea26e069e595069a5be3e" defaultFWPath = "/usr/share/ovmf/bios.bin" ) diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 3ba1787af..87c1ca599 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 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 acb99b679..f452bf938 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,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 0a5576438..50842d7df 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,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 acb99b679..f452bf938 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,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index acb99b679..f452bf938 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index acb99b679..f452bf938 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 4baf675ae..3e62eba4c 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 acb99b679..f452bf938 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,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: 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 a61023c42..941ee3652 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 services: - name: acpid - image: linuxkit/acpid:79e5c20de96e1633c9c40935b99dde45aefba37b + image: linuxkit/acpid:6e3f0c5deca1633230dce9a35b67e1f61f05c47a 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 cf96639b8..335cde076 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,13 +2,13 @@ kernel: image: linuxkit/kernel:4.4.90 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:d58766bb6c0def3df9e6ffc645ee11677f127faa + image: linuxkit/test-kernel-config:8b09b3d6e69440582e590a8981585851e9206bdc - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 65d1523d3..0fc1efb0e 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,13 +2,13 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:d58766bb6c0def3df9e6ffc645ee11677f127faa + image: linuxkit/test-kernel-config:8b09b3d6e69440582e590a8981585851e9206bdc - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/005_config_4.13.x/test.yml b/test/cases/020_kernel/005_config_4.13.x/test.yml index a6ebf81e4..614937d65 100644 --- a/test/cases/020_kernel/005_config_4.13.x/test.yml +++ b/test/cases/020_kernel/005_config_4.13.x/test.yml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:4.13.5 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:d58766bb6c0def3df9e6ffc645ee11677f127faa + image: linuxkit/test-kernel-config:8b09b3d6e69440582e590a8981585851e9206bdc - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.yml b/test/cases/020_kernel/010_kmod_4.9.x/test.yml index 9a2f0fd7e..f0b3e18ef 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: check image: kmod-test @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index e72008944..4a7cc38d2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index 755e7d505..c75e78b85 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 6c782b2c3..0188fe443 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 6c782b2c3..0188fe443 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 374dcff74..d2346dd82 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 374dcff74..d2346dd82 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index fbe3f5daa..68bb6d544 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index 182776db1..68b61e05d 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index 00fc690a5..608794f85 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index 00fc690a5..608794f85 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index b5d309cdb..c47ec0b28 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index b5d309cdb..c47ec0b28 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index 59a79bf19..9d5cd25cb 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index edec86aa5..3ef4bc4d0 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index c446cd0b8..78e8b5f75 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index c446cd0b8..78e8b5f75 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index 51671ee1c..3f2d46ebb 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index 51671ee1c..3f2d46ebb 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 6c986c0fc..b1699e608 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index 61e17dd62..5b9572761 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index fd1a5968b..b003c5e50 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index fd1a5968b..b003c5e50 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index 17b9c32a8..ad177526f 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index 17b9c32a8..ad177526f 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 7e4f63898..480c61d8e 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 8052c644f..3b523986e 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index 0b7e040db..05d2df14c 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index 0b7e040db..05d2df14c 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index fe36d3bd2..cce5b3822 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index fe36d3bd2..cce5b3822 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index afd5cc4cf..6533616b8 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index d7cabf9e3..689e8f4e1 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index dcaf09d7b..2204096e2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index dcaf09d7b..2204096e2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index 08c9e8a8b..2cba5b99c 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index 08c9e8a8b..2cba5b99c 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index d88ea49f1..3d7da7ae9 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index ae18acfb0..0f233f6f5 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index 44d33e25e..92343c3d3 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index 44d33e25e..92343c3d3 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index 4a4401915..0fe539f83 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index 4a4401915..0fe539f83 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index e10f6fa53..318239bcd 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index ac9c41993..f024fabb2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index 45ce6aa70..6f392f387 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index 45ce6aa70..6f392f387 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index a06aa7cc0..3319ed926 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index a06aa7cc0..3319ed926 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index 06a5a2f3b..aab481ecf 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.yml index 39c633f37..b3d31f5b2 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index 8b9464d06..7794c3bcd 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.yml index 8b9464d06..7794c3bcd 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index 95f120efc..12c8cff09 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.yml index 95f120efc..12c8cff09 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index 3733d77ba..3f5f1f998 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.yml index 4c1744acf..6733c2f51 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index d31ad31b4..21541443e 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml index d31ad31b4..21541443e 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index c50b3e3fa..ba1ba4584 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml index c50b3e3fa..ba1ba4584 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.yml index 37ac137d2..af8a94f9f 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml index a7a2e0c82..22b2473a3 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.yml index 2363ae368..f1b4c0c0e 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml index f1167a8a0..eae61cabf 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.yml index 7d9481562..cce6e24a3 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml index c3d178c51..e7f2e14e1 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml index fee7e114e..e291031f6 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml index 7d255fdb3..84ed554c3 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.90 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a trust: org: - linuxkit diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index e72008944..4a7cc38d2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index 755e7d505..c75e78b85 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 6c782b2c3..0188fe443 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 6c782b2c3..0188fe443 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 374dcff74..d2346dd82 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 374dcff74..d2346dd82 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index fbe3f5daa..68bb6d544 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index 182776db1..68b61e05d 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index 00fc690a5..608794f85 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index 00fc690a5..608794f85 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index b5d309cdb..c47ec0b28 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index b5d309cdb..c47ec0b28 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index 59a79bf19..9d5cd25cb 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index edec86aa5..3ef4bc4d0 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index c446cd0b8..78e8b5f75 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index c446cd0b8..78e8b5f75 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index 51671ee1c..3f2d46ebb 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index 51671ee1c..3f2d46ebb 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 6c986c0fc..b1699e608 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index 61e17dd62..5b9572761 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index fd1a5968b..b003c5e50 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index fd1a5968b..b003c5e50 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index 17b9c32a8..ad177526f 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index 17b9c32a8..ad177526f 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 7e4f63898..480c61d8e 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 8052c644f..3b523986e 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index 0b7e040db..05d2df14c 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index 0b7e040db..05d2df14c 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index fe36d3bd2..cce5b3822 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index fe36d3bd2..cce5b3822 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index afd5cc4cf..6533616b8 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index d7cabf9e3..689e8f4e1 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index dcaf09d7b..2204096e2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index dcaf09d7b..2204096e2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index 08c9e8a8b..2cba5b99c 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index 08c9e8a8b..2cba5b99c 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index d88ea49f1..3d7da7ae9 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index ae18acfb0..0f233f6f5 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index 44d33e25e..92343c3d3 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index 44d33e25e..92343c3d3 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index 4a4401915..0fe539f83 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index 4a4401915..0fe539f83 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index e10f6fa53..318239bcd 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index ac9c41993..f024fabb2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index 45ce6aa70..6f392f387 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index 45ce6aa70..6f392f387 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index a06aa7cc0..3319ed926 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index a06aa7cc0..3319ed926 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index 06a5a2f3b..aab481ecf 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.yml index 39c633f37..b3d31f5b2 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index 8b9464d06..7794c3bcd 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.yml index 8b9464d06..7794c3bcd 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index 95f120efc..12c8cff09 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.yml index 95f120efc..12c8cff09 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index 3733d77ba..3f5f1f998 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.yml index 4c1744acf..6733c2f51 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index d31ad31b4..21541443e 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.yml index d31ad31b4..21541443e 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index c50b3e3fa..ba1ba4584 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml index c50b3e3fa..ba1ba4584 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.yml index 37ac137d2..af8a94f9f 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml index a7a2e0c82..22b2473a3 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.yml index 2363ae368..f1b4c0c0e 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml index f1167a8a0..eae61cabf 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.yml index 7d9481562..cce6e24a3 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml index c3d178c51..e7f2e14e1 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml index fee7e114e..e291031f6 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml index 07a2d711a..addf635b4 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a trust: org: - linuxkit diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index e72008944..4a7cc38d2 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index 755e7d505..c75e78b85 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 6c782b2c3..0188fe443 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 6c782b2c3..0188fe443 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 374dcff74..d2346dd82 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 374dcff74..d2346dd82 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index fbe3f5daa..68bb6d544 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index 182776db1..68b61e05d 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index 00fc690a5..608794f85 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index 00fc690a5..608794f85 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index b5d309cdb..c47ec0b28 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index b5d309cdb..c47ec0b28 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index 59a79bf19..9d5cd25cb 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index edec86aa5..3ef4bc4d0 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index c446cd0b8..78e8b5f75 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index c446cd0b8..78e8b5f75 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index 51671ee1c..3f2d46ebb 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index 51671ee1c..3f2d46ebb 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 6c986c0fc..b1699e608 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index 61e17dd62..5b9572761 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index fd1a5968b..b003c5e50 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index fd1a5968b..b003c5e50 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index 17b9c32a8..ad177526f 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index 17b9c32a8..ad177526f 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 7e4f63898..480c61d8e 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 8052c644f..3b523986e 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index 0b7e040db..05d2df14c 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index 0b7e040db..05d2df14c 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index fe36d3bd2..cce5b3822 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index fe36d3bd2..cce5b3822 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index afd5cc4cf..6533616b8 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index d7cabf9e3..689e8f4e1 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index dcaf09d7b..2204096e2 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index dcaf09d7b..2204096e2 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index 08c9e8a8b..2cba5b99c 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index 08c9e8a8b..2cba5b99c 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index d88ea49f1..3d7da7ae9 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index ae18acfb0..0f233f6f5 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index 44d33e25e..92343c3d3 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index 44d33e25e..92343c3d3 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index 4a4401915..0fe539f83 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index 4a4401915..0fe539f83 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index e10f6fa53..318239bcd 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index ac9c41993..f024fabb2 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index 45ce6aa70..6f392f387 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index 45ce6aa70..6f392f387 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index a06aa7cc0..3319ed926 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index a06aa7cc0..3319ed926 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index 06a5a2f3b..aab481ecf 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single/test.yml index 39c633f37..b3d31f5b2 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index 8b9464d06..7794c3bcd 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single/test.yml index 8b9464d06..7794c3bcd 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/011_echo-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index 95f120efc..12c8cff09 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi/test.yml index 95f120efc..12c8cff09 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index 3733d77ba..3f5f1f998 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single/test.yml index 4c1744acf..6733c2f51 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index d31ad31b4..21541443e 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single/test.yml index d31ad31b4..21541443e 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/016_echo-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index c50b3e3fa..ba1ba4584 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi/test.yml index c50b3e3fa..ba1ba4584 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 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:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/010_veth-unix-domain-echo/test.yml index 37ac137d2..af8a94f9f 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/010_veth-unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml index a7a2e0c82..22b2473a3 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/012_veth-ipv4-echo/test.yml index 2363ae368..f1b4c0c0e 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/012_veth-ipv4-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/012_veth-ipv4-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/013_veth-ipv6-echo/test.yml index f1167a8a0..eae61cabf 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/013_veth-ipv6-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/013_veth-ipv6-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/014_veth-tcp-echo/test.yml index 7d9481562..cce6e24a3 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/014_veth-tcp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/014_veth-tcp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/015_veth-udp-echo/test.yml index c3d178c51..e7f2e14e1 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/015_veth-udp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/015_veth-udp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/020_unix-domain-echo/test.yml index fee7e114e..e291031f6 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/020_unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/100_mix/020_unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:8e93e61e46ebcb302761eca0180e4c7f43e60bcf + image: linuxkit/test-ns:d961c10f435069bd40fe60cc1a96adf9ce3ce364 command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml index 20fcb93a6..d17090871 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.13.5 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a 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 ff370bc74..e479cce87 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: sysfs - image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 + image: linuxkit/sysfs:7ff47034ed61c8e4c7ca5b8992056c66c6f39df8 - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e + image: linuxkit/rngd:719e087b06dd14c29acd23fa07cccd036bbab4db - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 - name: docker image: docker:17.07.0-ce-dind capabilities: @@ -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:135177ce27874f310e5e1bedbba494ad01e402a9 + image: linuxkit/test-docker-bench:759499d829289f0b4a33ae2d6892dd5e2c1eb901 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 a503c50d1..c7629f554 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.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: test image: alpine:3.6 @@ -12,7 +12,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 b5cdf97dc..70de65623 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.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: binfmt - image: linuxkit/binfmt:472eeba777d056c5f98fe074aa0f581c67ccc7ff + image: linuxkit/binfmt:dff7a32108d8e40922027642b598b4eb011f46bb - name: test image: alpine:3.6 binds: @@ -14,7 +14,7 @@ onboot: - /proc/sys/fs/binfmt_misc:/binfmt_misc command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 1f570d43b..9fad1ed80 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.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: test image: alpine:3.6 @@ -13,7 +13,7 @@ onboot: - /etc:/host-etc command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 aea63d2a9..eba6e90ea 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:d6d49adba473c8bd512555fb1bd3c4bd882c830c + image: linuxkit/test-containerd:f6b01d5513313524e307dffef786f605075b78a7 - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 trust: org: - linuxkit diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 236fbc3b8..a4339af3d 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.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: alpine:3.6 @@ -15,7 +15,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 c6cffd38d..08374db1e 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -16,7 +16,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 2e1c6833f..9dc2027c4 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: extend - image: linuxkit/extend:468cc677e35503a265235767d5f488253f51cfd6 + image: linuxkit/extend:84839cd2c713b7479ce8c7b076b748336c5a94dd - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -17,7 +17,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 7e2e58c73..41710e0e0 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: modprobe image: alpine:3.6 @@ -13,10 +13,10 @@ onboot: - /sys:/sys command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -24,7 +24,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 1cec286e1..081d5dd8f 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: modprobe image: alpine:3.6 @@ -13,10 +13,10 @@ onboot: - /sys:/sys command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:468cc677e35503a265235767d5f488253f51cfd6 + image: linuxkit/extend:84839cd2c713b7479ce8c7b076b748336c5a94dd command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -25,7 +25,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 76ca83ea6..82a04b437 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -17,7 +17,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 f1108b3f6..b8b2fd247 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: extend - image: linuxkit/extend:468cc677e35503a265235767d5f488253f51cfd6 + image: linuxkit/extend:84839cd2c713b7479ce8c7b076b748336c5a94dd command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 9d7231d4b..c25fda567 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 65d0acd46..191516ccd 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 80ef8b75b..188860409 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 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 97ce76795..29e8decb6 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: modprobe image: alpine:3.6 @@ -13,10 +13,10 @@ onboot: - /sys:/sys command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -25,7 +25,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 20c9331a4..08587ce1c 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.6 @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 0ab6c6154..dc063102d 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" init: - - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] @@ -26,7 +26,7 @@ onboot: - CAP_SYS_ADMIN - CAP_MKNOD - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 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 315d705ab..30ebf4709 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:f180a74d878c8c0c86f6208f9311474c91452a79 + image: linuxkit/format:e7f06bd9bb96b663f8aab7d648a5dfc3ed7785fc command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:96ac4d32d340ac6e4ddfbf506fa3a497d23649da + image: linuxkit/mount:80c6aeef04260eaa7c74a93594ea7c5a4ab2808e command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.6 @@ -25,7 +25,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 253746b88..7c467c7b4 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 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:a19851531487b7bfbe45dcf77e3309c127cc78a6 + image: linuxkit/getty:7abaf7b276c59f80891d92e9279e3e3ee8e2f512 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 b6a8048bc..9531bb351 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: mkimage - image: linuxkit/mkimage:194193fb42cc999b8abe9c5966ed05dbef2a63c1 + image: linuxkit/mkimage:13b6efeefd97fed9043c9cd3a8fe1fe7ad1cda12 - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 trust: org: - linuxkit diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 2460d4a27..8124db723 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 trust: org: - linuxkit diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index ff1976655..53d035781 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.9.53 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a onboot: - name: sysctl - image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + image: linuxkit/sysctl:53f0c724919e8f76ea06c44ee703330290b22669 - name: test image: alpine:3.6 net: host @@ -16,7 +16,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 78601c12a..fd98bb490 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.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a - - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:bdc10950043419d4eb19a10c3122e12ee472d465 + image: linuxkit/ip:7a82871df06767cfe26a04d0ed6bee1031ba5d04 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:bdc10950043419d4eb19a10c3122e12ee472d465 + image: linuxkit/ip:7a82871df06767cfe26a04d0ed6bee1031ba5d04 net: new binds: - /etc/wireguard:/etc/wireguard diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 2ab1e8a73..fade89698 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 onboot: - name: ltp - image: linuxkit/test-ltp:38cec1526acc8b1a2ce4b4ece78a810078c807e1 + image: linuxkit/test-ltp:96c9845f8bca2cfb2d3c5e6ca53d82f77b2fddd0 binds: - /etc/ltp/baseline:/etc/ltp/baseline - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 files: - path: /etc/ltp/baseline contents: "100" diff --git a/test/hack/test.yml b/test/hack/test.yml index 95cc2c266..415e45842 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,17 +4,17 @@ kernel: image: linuxkit/kernel:4.9.53 cmdline: "console=ttyS0" init: - - linuxkit/init:7804129bd06218b72c298139a25698a748d253c6 - - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:417f83f7b8dc1fa36acf90effe44f99c7397480a + - linuxkit/init:98e95fb67e8afcf02c09ba927e4b357fec42977a + - linuxkit/runc:991ef358ad8fc1111d64f4d8071f2009cc561f6a + - linuxkit/containerd:eaf0d615cfceb9d854408dd3c80429ee8ac4d051 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + image: linuxkit/dhcpcd:aa685261ceb2557990dcfe9dd8824c6b9ec416e2 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: linuxkit/test-kernel-config:d58766bb6c0def3df9e6ffc645ee11677f127faa + image: linuxkit/test-kernel-config:8b09b3d6e69440582e590a8981585851e9206bdc - name: poweroff - image: linuxkit/poweroff:1e9876c682c74d0602b7647c628bb0875fb13998 + image: linuxkit/poweroff:ffd3f539a6f4e67d4cd4ff36503636de35edd7b2 command: ["/bin/sh", "/poweroff.sh", "3"] trust: image: