From 94bfb97ba3cdf5fb072f2aa2bf5639372bb0c9ab Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 16 Apr 2019 22:53:21 +0100 Subject: [PATCH 01/12] tools: Update to the latest linuxkit/alpine Skip tools/grub as this still requires alpine 3.8 to build Signed-off-by: Rolf Neugebauer --- tools/go-compile/Dockerfile | 2 +- tools/mkimage-iso-bios/Dockerfile | 2 +- tools/mkimage-iso-efi/Dockerfile | 2 +- tools/mkimage-iso/Dockerfile | 2 +- tools/mkimage-qcow2-efi/Dockerfile | 2 +- tools/mkimage-raw-bios/Dockerfile | 2 +- tools/mkimage-raw-efi/Dockerfile | 2 +- tools/mkimage-rpi3/Dockerfile | 2 +- tools/mkimage-squashfs/Dockerfile | 2 +- tools/qemu/Dockerfile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile index dc33a6a4e..1cbed0a05 100644 --- a/tools/go-compile/Dockerfile +++ b/tools/go-compile/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 dbc7d0c64..07fe81340 100644 --- a/tools/mkimage-iso-bios/Dockerfile +++ b/tools/mkimage-iso-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 as mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile index 04178e809..05776de53 100644 --- a/tools/mkimage-iso-efi/Dockerfile +++ b/tools/mkimage-iso-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:a4ba33f2ef880947862eaaeceadb2a51bfebb688 AS grub -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-iso/Dockerfile b/tools/mkimage-iso/Dockerfile index c924695cf..888dcd461 100644 --- a/tools/mkimage-iso/Dockerfile +++ b/tools/mkimage-iso/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-qcow2-efi/Dockerfile b/tools/mkimage-qcow2-efi/Dockerfile index 2d014e366..25369fc4b 100644 --- a/tools/mkimage-qcow2-efi/Dockerfile +++ b/tools/mkimage-qcow2-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:a4ba33f2ef880947862eaaeceadb2a51bfebb688 AS grub -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-raw-bios/Dockerfile b/tools/mkimage-raw-bios/Dockerfile index 864b139c7..c436d37f1 100644 --- a/tools/mkimage-raw-bios/Dockerfile +++ b/tools/mkimage-raw-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-raw-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile index 656f0c351..a525fd58d 100644 --- a/tools/mkimage-raw-efi/Dockerfile +++ b/tools/mkimage-raw-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:a4ba33f2ef880947862eaaeceadb2a51bfebb688 AS grub -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-rpi3/Dockerfile b/tools/mkimage-rpi3/Dockerfile index 7928a9215..1a14bd3f6 100644 --- a/tools/mkimage-rpi3/Dockerfile +++ b/tools/mkimage-rpi3/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 as build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as build RUN apk add \ bc \ dtc \ diff --git a/tools/mkimage-squashfs/Dockerfile b/tools/mkimage-squashfs/Dockerfile index 4e9accd92..e780952d0 100644 --- a/tools/mkimage-squashfs/Dockerfile +++ b/tools/mkimage-squashfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/qemu/Dockerfile b/tools/qemu/Dockerfile index 9f2d4eeae..75ab1dfc7 100644 --- a/tools/qemu/Dockerfile +++ b/tools/qemu/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 da3f1e9c6c9180e1d10f812920dc10588347cf0f Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 16 Apr 2019 23:16:18 +0100 Subject: [PATCH 02/12] Update use of tools to latest Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- docs/vendoring.md | 4 ++-- src/cmd/linuxkit/moby/output.go | 16 ++++++++-------- src/cmd/linuxkit/run_qemu.go | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 619cfa8e8..5b84b266e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION="v0.6+" GIT_COMMIT=$(shell git rev-list -1 HEAD) -GO_COMPILE=linuxkit/go-compile:0a927ab41060951b15645f0f9cc257ec810c0a0f +GO_COMPILE=linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba ifeq ($(OS),Windows_NT) LINUXKIT?=bin/linuxkit.exe diff --git a/docs/vendoring.md b/docs/vendoring.md index 8e69e80fa..3c6007bf4 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:0a927ab41060951b15645f0f9cc257ec810c0a0f +linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba ``` 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:0a927ab41060951b15645f0f9cc257ec810c0a0f +linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba github.com/docker/docker ``` diff --git a/src/cmd/linuxkit/moby/output.go b/src/cmd/linuxkit/moby/output.go index c2666077a..1b3d65df1 100644 --- a/src/cmd/linuxkit/moby/output.go +++ b/src/cmd/linuxkit/moby/output.go @@ -16,18 +16,18 @@ import ( var ( outputImages = map[string]string{ - "iso": "linuxkit/mkimage-iso:17c68596851349c9d8917459116f7d3409f12fdd", - "iso-bios": "linuxkit/mkimage-iso-bios:50aedc359bc13ee2d472a73d6e6740740b809c95", - "iso-efi": "linuxkit/mkimage-iso-efi:a74d5b0d6656c2147772f867751ae8fc295b13d2", - "raw-bios": "linuxkit/mkimage-raw-bios:71a966249ffbb23a499cfca280bbabb8afbbd530", - "raw-efi": "linuxkit/mkimage-raw-efi:f0dc5faa8c75a0aba2de6d24076c544cddd7f3e7", - "squashfs": "linuxkit/mkimage-squashfs:c409c0f2045a0b9bffec38b981994a3e02852443", + "iso": "linuxkit/mkimage-iso:3d81e29b28ddf739becf10758eb6077b198d26d8", + "iso-bios": "linuxkit/mkimage-iso-bios:131849cfc4f3ede87c2ca19b6e2a4ef86354d1ce", + "iso-efi": "linuxkit/mkimage-iso-efi:1fdcfa6ae73907eb41cbfe2db8eddcbfe11a6c66", + "raw-bios": "linuxkit/mkimage-raw-bios:3d6a6d932e124a0430e36d232dd51af1deef53c3", + "raw-efi": "linuxkit/mkimage-raw-efi:623c9a4a3282d05eeb145c615638dfb1f9919e54", + "squashfs": "linuxkit/mkimage-squashfs:c771872c292081a36333425c12e57393bd79f4e9", "gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1", - "qcow2-efi": "linuxkit/mkimage-qcow2-efi:b461760411b7295c91246b1d2df8ce13a96ce3c9", + "qcow2-efi": "linuxkit/mkimage-qcow2-efi:ec1f27cff4f84cef7ec4bf7e77c18c8a58b9a356", "vhd": "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242", "dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6", "vmdk": "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5", - "rpi3": "linuxkit/mkimage-rpi3:b787b1210a0e13456a8f128722f1134e3933907b", + "rpi3": "linuxkit/mkimage-rpi3:97a9387ff0ff5db867dd8af931b825e55108bea4", } ) diff --git a/src/cmd/linuxkit/run_qemu.go b/src/cmd/linuxkit/run_qemu.go index 98114d33d..1a6b93524 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:54a48513e11041731039ebf3b6a8ac02da197764" + QemuImg = "linuxkit/qemu:68b072e1ae36415cb76eea610de508dbf2bbec7c" defaultFWPath = "/usr/share/ovmf/bios.bin" ) From bb313ac560825711f21a4c5e9101d59c5a6c11ab Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 16 Apr 2019 23:16:56 +0100 Subject: [PATCH 03/12] tests: Update packages to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- 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 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/pkg/docker-bench/Dockerfile b/test/pkg/docker-bench/Dockerfile index ff0ceee13..5aa6899fc 100644 --- a/test/pkg/docker-bench/Dockerfile +++ b/test/pkg/docker-bench/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 e29c759c1..a129331b8 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 1163e393d..d2c08da79 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add --no-cache \ build-base \ git \ diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile index cefdc5fc8..ac340f20e 100644 --- a/test/pkg/poweroff/Dockerfile +++ b/test/pkg/poweroff/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 0005818f8..6fcb9f053 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin From 344cba78e5af20c342ff46833afcb985994950c1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 16 Apr 2019 23:23:27 +0100 Subject: [PATCH 04/12] Update use of test packages to latest Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/moby/linuxkit.go | 2 +- .../010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/000_qemu/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- .../010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_hyperkit/005_run_kernel+squashfs/test.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test.yml | 4 ++-- test/cases/020_kernel/002_config_4.14.x/test.yml | 4 ++-- test/cases/020_kernel/005_config_4.19.x/test.yml | 4 ++-- test/cases/020_kernel/007_config_5.0.x/test.yml | 4 ++-- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 2 +- test/cases/020_kernel/012_kmod_4.14.x/test.yml | 2 +- test/cases/020_kernel/015_kmod_4.19.x/test.yml | 2 +- test/cases/020_kernel/017_kmod_5.0.x/test.yml | 2 +- .../010_echo-tcp-ipv4-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml | 4 ++-- .../011_echo-tcp-ipv4-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml | 4 ++-- .../012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml | 4 ++-- .../015_echo-tcp-ipv4-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml | 4 ++-- .../016_echo-tcp-ipv4-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml | 4 ++-- .../017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml | 4 ++-- .../020_echo-tcp-ipv6-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml | 4 ++-- .../021_echo-tcp-ipv6-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml | 4 ++-- .../022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml | 4 ++-- .../025_echo-tcp-ipv6-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml | 4 ++-- .../026_echo-tcp-ipv6-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml | 4 ++-- .../027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml | 4 ++-- .../030_echo-udp-ipv4-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/030_echo-udp-ipv4-short-1con-single/test.yml | 4 ++-- .../031_echo-udp-ipv4-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/031_echo-udp-ipv4-short-10con-single/test.yml | 4 ++-- .../032_echo-udp-ipv4-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml | 4 ++-- .../035_echo-udp-ipv4-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/035_echo-udp-ipv4-long-1con-single/test.yml | 4 ++-- .../036_echo-udp-ipv4-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/036_echo-udp-ipv4-long-10con-single/test.yml | 4 ++-- .../037_echo-udp-ipv4-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml | 4 ++-- .../040_echo-udp-ipv6-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/040_echo-udp-ipv6-short-1con-single/test.yml | 4 ++-- .../041_echo-udp-ipv6-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/041_echo-udp-ipv6-short-10con-single/test.yml | 4 ++-- .../042_echo-udp-ipv6-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml | 4 ++-- .../045_echo-udp-ipv6-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/045_echo-udp-ipv6-long-1con-single/test.yml | 4 ++-- .../046_echo-udp-ipv6-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/046_echo-udp-ipv6-long-10con-single/test.yml | 4 ++-- .../047_echo-udp-ipv6-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml | 4 ++-- .../010_echo-short-1con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/010_echo-short-1con-single/test.yml | 4 ++-- .../011_echo-short-10con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/011_echo-short-10con-single/test.yml | 4 ++-- .../012_echo-short-5con-multi-reverse/test.yml | 4 ++-- .../050_unix-domain/012_echo-short-5con-multi/test.yml | 4 ++-- .../015_echo-long-1con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/015_echo-long-1con-single/test.yml | 4 ++-- .../016_echo-long-10con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/016_echo-long-10con-single/test.yml | 4 ++-- .../050_unix-domain/017_echo-long-5con-multi-reverse/test.yml | 4 ++-- .../050_unix-domain/017_echo-long-5con-multi/test.yml | 4 ++-- .../110_namespace/100_mix/010_veth-unix-domain-echo/test.yml | 4 ++-- .../100_mix/011_veth-unix-domain-echo-reverse/test.yml | 4 ++-- .../110_namespace/100_mix/012_veth-ipv4-echo/test.yml | 4 ++-- .../110_namespace/100_mix/013_veth-ipv6-echo/test.yml | 4 ++-- .../110_namespace/100_mix/014_veth-tcp-echo/test.yml | 4 ++-- .../110_namespace/100_mix/015_veth-udp-echo/test.yml | 4 ++-- .../110_namespace/100_mix/020_unix-domain-echo/test.yml | 4 ++-- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/002_bpftrace/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/000_simple/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/001_luks/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/002_key/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- .../cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../006_format_mount/005_by_device_force/test.yml | 2 +- .../cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/012_losetup/test.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- test/cases/040_packages/032_bcc/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 4 ++-- test/pkg/ns/template.yml | 2 +- 117 files changed, 189 insertions(+), 189 deletions(-) diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index 5ccedb65d..fb787e5a9 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -23,7 +23,7 @@ onboot: - name: mkimage image: linuxkit/mkimage:a8680e89070591c8b9e80d54e185787c19921668 - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 trust: org: - linuxkit diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index 2f6d09511..bf3c69f38 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index 2f6d09511..bf3c69f38 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 d9f81c990..9393a4e8d 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 3eae614ce..5b85605b5 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 3eae614ce..5b85605b5 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 3eae614ce..5b85605b5 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 3eae614ce..5b85605b5 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 839a5f0d8..ae8a014cc 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 3eae614ce..5b85605b5 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 3eae614ce..5b85605b5 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] 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 82b580981..b23294f1f 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:e17f234c439535d1a297b020774301709adc5832 + image: linuxkit/test-kernel-config:0e9308f871ac86c680d64836a050547a2feebb36 - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/002_config_4.14.x/test.yml b/test/cases/020_kernel/002_config_4.14.x/test.yml index 8112f65ee..a5b2a5c0f 100644 --- a/test/cases/020_kernel/002_config_4.14.x/test.yml +++ b/test/cases/020_kernel/002_config_4.14.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:e17f234c439535d1a297b020774301709adc5832 + image: linuxkit/test-kernel-config:0e9308f871ac86c680d64836a050547a2feebb36 - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/005_config_4.19.x/test.yml b/test/cases/020_kernel/005_config_4.19.x/test.yml index 4431b397b..f97c666cd 100644 --- a/test/cases/020_kernel/005_config_4.19.x/test.yml +++ b/test/cases/020_kernel/005_config_4.19.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:e17f234c439535d1a297b020774301709adc5832 + image: linuxkit/test-kernel-config:0e9308f871ac86c680d64836a050547a2feebb36 - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/007_config_5.0.x/test.yml b/test/cases/020_kernel/007_config_5.0.x/test.yml index e28c4bff9..2a446bd0c 100644 --- a/test/cases/020_kernel/007_config_5.0.x/test.yml +++ b/test/cases/020_kernel/007_config_5.0.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:e17f234c439535d1a297b020774301709adc5832 + image: linuxkit/test-kernel-config:0e9308f871ac86c680d64836a050547a2feebb36 - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index 780632053..2d626ff01 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/012_kmod_4.14.x/test.yml b/test/cases/020_kernel/012_kmod_4.14.x/test.yml index 26b975959..ecddf508f 100644 --- a/test/cases/020_kernel/012_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/012_kmod_4.14.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/015_kmod_4.19.x/test.yml b/test/cases/020_kernel/015_kmod_4.19.x/test.yml index 9207d6674..6b73d72f3 100644 --- a/test/cases/020_kernel/015_kmod_4.19.x/test.yml +++ b/test/cases/020_kernel/015_kmod_4.19.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/017_kmod_5.0.x/test.yml b/test/cases/020_kernel/017_kmod_5.0.x/test.yml index ee25c096b..84fb31e96 100644 --- a/test/cases/020_kernel/017_kmod_5.0.x/test.yml +++ b/test/cases/020_kernel/017_kmod_5.0.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index a3f249825..bd9f0f95c 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index bf8d157bc..99118bffe 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index fdc72e0f3..6baab7dad 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index fdc72e0f3..6baab7dad 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 08c73dd1b..9af9ac9d6 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 08c73dd1b..9af9ac9d6 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index 6a18e95d4..7ad25060c 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index d760a53e1..2b96ddde9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index abbc3ba5e..ad0d0db8f 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index abbc3ba5e..ad0d0db8f 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index 3a4b262c9..f96bf294b 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index 3a4b262c9..f96bf294b 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index c180623c9..5f3617b8b 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index e666dfba2..71db78959 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index 7181dbcc5..d3bb3813f 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index 7181dbcc5..d3bb3813f 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index f9c4701fb..ecfd18988 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index f9c4701fb..ecfd18988 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 1097c5a93..9e1803dcd 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index ac6114279..316aaf62a 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index 69585835b..f6f5883d6 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index 69585835b..f6f5883d6 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index 6c9da9357..c86d345d4 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index 6c9da9357..c86d345d4 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 1a1865ea3..b5d56af3d 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 65eac1565..5bcb21051 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index 7666760fd..a48de35e5 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index 7666760fd..a48de35e5 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index b0f3d04d7..fdbc45e0f 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index b0f3d04d7..fdbc45e0f 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index f508ab0c7..033a94b39 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index ed1712150..c27b5048d 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index 987fc7c22..3c946da45 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index 987fc7c22..3c946da45 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index 36458ec71..19f4e2d0e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index 36458ec71..19f4e2d0e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index e86d48846..78f59d86d 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index 91eb288f7..205c999c3 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index da7280380..42940053a 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index da7280380..42940053a 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index 47d31a01d..1516296b6 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index 47d31a01d..1516296b6 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index 87dc771ff..f0a25c239 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index c344bdc3f..ece3da1e9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index d3d5d1f8e..8d6125504 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index d3d5d1f8e..8d6125504 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index 19d5f6f6d..ff63cb7d6 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index 19d5f6f6d..ff63cb7d6 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index a6ac9157a..fba510c4c 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml index 8a75b4b54..9cceb5be8 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index 9947498d5..e786841d3 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml index 9947498d5..e786841d3 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index 4c209fd69..46bfb64e3 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml index 4c209fd69..46bfb64e3 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index 1b35b6ba7..4991aef1a 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml index e6110d62e..637af6125 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index 64478e919..a320575a9 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml index 64478e919..a320575a9 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index a15d859a2..918c4c30d 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml index a15d859a2..918c4c30d 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 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:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml index 12eb3927c..450c598d9 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml index 78938b088..6c873237c 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml index 8c4ff564e..efaf1d182 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml index 81f083ab0..386997177 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml index 118e53c2b..f7b4f3b3b 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml index c51fb9664..443bece65 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml index ff4649b46..4238b5c74 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f + image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index fd37215ba..8bcabb891 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -34,7 +34,7 @@ services: - /run:/var/run command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] - name: test-docker-bench - image: linuxkit/test-docker-bench:80593c1e8fcb5bd28788cbe8fba2df15e7aa2c3e + image: linuxkit/test-docker-bench:f1076f4c5addc6bc3026edeed5cf6d6da6b5c165 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 c90598649..1115edc8a 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -12,7 +12,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 7505cde09..88bc1352f 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -14,7 +14,7 @@ onboot: - /proc/sys/fs/binfmt_misc:/binfmt_misc command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index ef2947e48..8b7b59952 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -17,7 +17,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 18f1f7e2b..cba8fe4e7 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -13,7 +13,7 @@ onboot: - /etc:/host-etc command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 3eed6230f..a0ddb0692 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -20,7 +20,7 @@ onboot: - name: test image: linuxkit/test-containerd:6450109185b6678866b76867b7394c5c90f46225 - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 trust: org: - linuxkit diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 530c825fd..1cb634fa5 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -15,7 +15,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index 254fad449..943c8b72e 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -16,7 +16,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index 678f9bcdf..b20bf9ece 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -16,7 +16,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index e6f9e919f..aeb278f99 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -19,7 +19,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 d0103c139..f572332c4 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -16,7 +16,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 cfacfc84e..c3d551249 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -17,7 +17,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 b312405f6..1016df185 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -20,7 +20,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 41f3cf145..e54a0398b 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -21,7 +21,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 56b90fd50..d558b3267 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -17,7 +17,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 008424f91..67d6fd308 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 f8a3f7f2b..df40a1762 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 75f773900..7b50fcbbd 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 9d7bda0eb..b8cf03434 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 be7d279e5..145e882fa 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -21,7 +21,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 c471ab86d..910aea008 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 a06219274..df2347cac 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -26,7 +26,7 @@ onboot: - CAP_SYS_ADMIN - CAP_MKNOD - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 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 4e45db5d4..3fd7d1c77 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -25,7 +25,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 1cb0c1884..603fae85f 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -16,7 +16,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index f491c4df9..31e42db7b 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -8,7 +8,7 @@ onboot: - name: mkimage image: linuxkit/mkimage:a8680e89070591c8b9e80d54e185787c19921668 - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 trust: org: - linuxkit diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 920c08a51..0c3e9b931 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 onboot: - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 trust: org: - linuxkit diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 146bb88a8..d3316a079 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -16,7 +16,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index 1d8029127..c4d77741b 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -17,7 +17,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 5602a523b..c87a8fb84 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -11,7 +11,7 @@ onboot: binds: - /etc/ltp/baseline:/etc/ltp/baseline - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 files: - path: /etc/ltp/baseline contents: "100" diff --git a/test/hack/test.yml b/test/hack/test.yml index ae7b6f57b..cbe75acb0 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -12,9 +12,9 @@ onboot: image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: linuxkit/test-kernel-config:e17f234c439535d1a297b020774301709adc5832 + image: linuxkit/test-kernel-config:0e9308f871ac86c680d64836a050547a2feebb36 - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "120"] trust: org: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 8d13639e9..8f853b884 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -14,7 +14,7 @@ onboot: - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 + image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: From ba9a266b6a93559df16c653f2592986d8571d9af Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 16 Apr 2019 23:23:41 +0100 Subject: [PATCH 05/12] tests: Update tests cases to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/011_kmod_4.9.x/Dockerfile | 2 +- test/cases/020_kernel/012_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/015_kmod_4.19.x/Dockerfile | 2 +- test/cases/020_kernel/017_kmod_5.0.x/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index 6862a8fe3..58c2745b7 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.9.168 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile index 8b26cb99f..318e93cd0 100644 --- a/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.14.111 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile b/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile index 0aea0e9bb..eb1ef9445 100644 --- a/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile +++ b/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.19.34 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/017_kmod_5.0.x/Dockerfile b/test/cases/020_kernel/017_kmod_5.0.x/Dockerfile index 956597d19..a2aa6727f 100644 --- a/test/cases/020_kernel/017_kmod_5.0.x/Dockerfile +++ b/test/cases/020_kernel/017_kmod_5.0.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:5.0.7 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / From c7799a908054d28e1b190a7053122d4918215cf6 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 16 Apr 2019 23:25:22 +0100 Subject: [PATCH 06/12] pkgs: Update packages to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- pkg/acpid/Dockerfile | 4 ++-- pkg/auditd/Dockerfile | 2 +- pkg/binfmt/Dockerfile | 2 +- pkg/ca-certificates/Dockerfile | 2 +- pkg/cadvisor/Dockerfile | 4 ++-- pkg/dhcpcd/Dockerfile | 2 +- pkg/dm-crypt/Dockerfile | 2 +- pkg/extend/Dockerfile | 4 ++-- pkg/firmware-all/Dockerfile | 2 +- pkg/firmware/Dockerfile | 2 +- pkg/format/Dockerfile | 4 ++-- pkg/getty/Dockerfile | 2 +- pkg/host-timesync-daemon/Dockerfile | 2 +- pkg/ip/Dockerfile | 2 +- pkg/kmsg/Dockerfile | 2 +- pkg/logwrite/Dockerfile | 2 +- pkg/losetup/Dockerfile | 2 +- pkg/memlogd/Dockerfile | 2 +- pkg/metadata/Dockerfile | 2 +- pkg/mkimage/Dockerfile | 2 +- pkg/modprobe/Dockerfile | 2 +- pkg/mount/Dockerfile | 4 ++-- pkg/node_exporter/Dockerfile | 2 +- pkg/open-vm-tools/Dockerfile | 2 +- pkg/openntpd/Dockerfile | 2 +- pkg/qemu-ga/Dockerfile | 2 +- pkg/rngd/Dockerfile | 2 +- pkg/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 +- 36 files changed, 41 insertions(+), 41 deletions(-) diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile index 6e660eec1..edd97e881 100644 --- a/pkg/acpid/Dockerfile +++ b/pkg/acpid/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror2 +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 b9b666869..a1bcc3998 100644 --- a/pkg/auditd/Dockerfile +++ b/pkg/auditd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --initdb -p /out alpine-baselayout apk-tools audit busybox tini diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 6c5d04c82..c361ddfa6 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y qemu-user-static && \ mv /usr/bin/qemu-ppc64le-static /usr/bin/qemu-ppc64le && \ mv /usr/bin/qemu-s390x-static /usr/bin/qemu-s390x -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 fc4024388..91b7d5ca9 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed as alpine +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as alpine RUN apk add ca-certificates diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index 06ae2f4a6..453ebfe0e 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed as build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as build RUN apk add --no-cache bash go git musl-dev linux-headers make @@ -16,7 +16,7 @@ RUN go get -d ${GITREPO} \ && mv cadvisor /usr/bin/ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index 16260c700..d1121a510 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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/dm-crypt/Dockerfile b/pkg/dm-crypt/Dockerfile index 44b41c023..2518e2505 100644 --- a/pkg/dm-crypt/Dockerfile +++ b/pkg/dm-crypt/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 9af834e45..abf6b58ac 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/firmware-all/Dockerfile b/pkg/firmware-all/Dockerfile index 0040cff84..547fbd7ea 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add --no-cache git # Make sure you also update the FW_COMMIT in ../firmware/Dockerfile diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index d540aeec4..be3ade96a 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -1,7 +1,7 @@ # Make modules from a recentish kernel available FROM linuxkit/kernel:4.14.28 AS kernel -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add --no-cache git kmod # Clone the firmware repository diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 50c4772e4..3108d4c4f 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 23b8624b7..483ac677f 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 587069097..80649a7f9 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN apk add --no-cache go musl-dev git ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile index 91b8c67ef..db8771404 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add curl RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/kmsg/Dockerfile b/pkg/kmsg/Dockerfile index b27dc4c5f..44869edd0 100644 --- a/pkg/kmsg/Dockerfile +++ b/pkg/kmsg/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN apk add --no-cache go musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/logwrite/Dockerfile b/pkg/logwrite/Dockerfile index 33e8c6881..56b58f904 100644 --- a/pkg/logwrite/Dockerfile +++ b/pkg/logwrite/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/losetup/Dockerfile b/pkg/losetup/Dockerfile index d4ee2c392..3dd5131e1 100644 --- a/pkg/losetup/Dockerfile +++ b/pkg/losetup/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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/memlogd/Dockerfile b/pkg/memlogd/Dockerfile index 9ab756829..724c51623 100644 --- a/pkg/memlogd/Dockerfile +++ b/pkg/memlogd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/metadata/Dockerfile b/pkg/metadata/Dockerfile index 63ae3cdcc..7f797f739 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 0a4d100c2..05c5c3336 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 b23032db4..c94fa3df3 100644 --- a/pkg/modprobe/Dockerfile +++ b/pkg/modprobe/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 eed8475bb..1ea8e95fb 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/node_exporter/Dockerfile b/pkg/node_exporter/Dockerfile index 001a680cd..d95cb0030 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed as build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as build RUN apk add --no-cache go git musl-dev make diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index 70c742f5e..2fdd6442b 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 33a32ede2..c90cd2648 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 cc51bf6be..b07d19081 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 0ac4ed850..125e6a6c7 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN apk add --no-cache go gcc musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index 5e2d6ff59..6c9c08711 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 7013c5303..6a056bb51 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 a50aacbfd..de2a038f5 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 9daa508ed..3d08ab4e8 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 53afe1494..7fcd4a8d5 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:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 d3a027987..49ecc4073 100644 --- a/pkg/tss/Dockerfile +++ b/pkg/tss/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 f8b2fb345..21b17cbb9 100644 --- a/pkg/vpnkit-expose-port/Dockerfile +++ b/pkg/vpnkit-expose-port/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 3cd17b523..78590e2b5 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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 7ef04773b..32b1c6b1a 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin From 291a95d3fa993ef84ddfb934aa9671444b39e5f9 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 16 Apr 2019 23:46:27 +0100 Subject: [PATCH 07/12] Update package tags to v0.7 Signed-off-by: Rolf Neugebauer --- examples/aws.yml | 18 ++++----- examples/azure.yml | 16 ++++---- examples/cadvisor.yml | 26 ++++++------ examples/dm-crypt-loop.yml | 26 ++++++------ examples/dm-crypt.yml | 22 +++++----- examples/docker-for-mac.yml | 40 +++++++++---------- examples/docker.yml | 24 +++++------ examples/gcp.yml | 20 +++++----- examples/getty.yml | 16 ++++---- examples/hostmount-writeable-overlay.yml | 16 ++++---- examples/influxdb-os.yml | 12 +++--- examples/logging.yml | 20 +++++----- examples/minimal.yml | 10 ++--- examples/node_exporter.yml | 14 +++---- examples/openstack.yml | 18 ++++----- examples/packet.arm64.yml | 2 +- examples/packet.yml | 24 +++++------ examples/redis-os.yml | 10 ++--- examples/rt-for-vmware.yml | 18 ++++----- examples/scaleway.yml | 20 +++++----- examples/sshd.yml | 20 +++++----- examples/static-ip.yml | 10 ++--- examples/swap.yml | 22 +++++----- examples/tpm.yml | 18 ++++----- examples/vmware.yml | 16 ++++---- examples/vpnkit-forwarder.yml | 12 +++--- examples/vsudd-containerd.yml | 10 ++--- examples/vultr.yml | 20 +++++----- examples/wireguard.yml | 20 +++++----- linuxkit.yml | 16 ++++---- .../clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 24 +++++------ projects/compose/compose-static.yml | 24 +++++------ projects/ima-namespace/ima-namespace.yml | 14 +++---- projects/landlock/landlock.yml | 2 +- projects/memorizer/memorizer.yml | 10 ++--- projects/miragesdk/examples/fdd.yml | 16 ++++---- projects/miragesdk/examples/mirage-dhcp.yml | 12 +++--- projects/okernel/examples/okernel_simple.yaml | 14 +++---- projects/shiftfs/shiftfs.yml | 16 ++++---- src/cmd/linuxkit/moby/linuxkit.go | 6 +-- test/cases/000_build/000_formats/test.yml | 6 +-- .../cases/000_build/010_reproducible/test.yml | 10 ++--- .../000_qemu/000_run_kernel+initrd/test.yml | 4 +- .../000_qemu/005_run_kernel+squashfs/test.yml | 4 +- .../000_qemu/010_run_iso/test.yml | 4 +- .../000_qemu/020_run_efi/test.yml | 4 +- .../000_qemu/030_run_qcow_bios/test.yml | 4 +- .../000_qemu/040_run_raw_bios/test.yml | 4 +- .../000_qemu/050_run_aws/test.yml | 4 +- .../000_qemu/100_container/test.yml | 4 +- .../000_run_kernel+initrd/test.yml | 4 +- .../005_run_kernel+squashfs/test.yml | 4 +- .../010_hyperkit/010_acpi/test.yml | 8 ++-- .../020_kernel/001_config_4.9.x/test.yml | 4 +- .../020_kernel/002_config_4.14.x/test.yml | 4 +- .../020_kernel/005_config_4.19.x/test.yml | 4 +- .../020_kernel/007_config_5.0.x/test.yml | 4 +- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 4 +- .../cases/020_kernel/012_kmod_4.14.x/test.yml | 4 +- .../cases/020_kernel/015_kmod_4.19.x/test.yml | 4 +- test/cases/020_kernel/017_kmod_5.0.x/test.yml | 4 +- .../cases/020_kernel/110_namespace/common.yml | 4 +- .../030_security/000_docker-bench/test.yml | 20 +++++----- test/cases/030_security/010_ports/test.yml | 4 +- test/cases/040_packages/002_binfmt/test.yml | 6 +-- test/cases/040_packages/002_bpftrace/test.yml | 6 +-- .../040_packages/003_ca-certificates/test.yml | 6 +-- .../040_packages/003_containerd/test.yml | 16 ++++---- test/cases/040_packages/004_dhcpcd/test.yml | 6 +-- .../004_dm-crypt/000_simple/test.yml | 6 +-- .../004_dm-crypt/001_luks/test.yml | 6 +-- .../004_dm-crypt/002_key/test.yml | 6 +-- .../005_extend/000_ext4/test-create.yml | 8 ++-- .../040_packages/005_extend/000_ext4/test.yml | 8 ++-- .../005_extend/001_btrfs/test-create.yml | 10 ++--- .../005_extend/001_btrfs/test.yml | 10 ++--- .../005_extend/002_xfs/test-create.yml | 8 ++-- .../040_packages/005_extend/002_xfs/test.yml | 8 ++-- .../006_format_mount/000_auto/test.yml | 8 ++-- .../006_format_mount/001_by_label/test.yml | 8 ++-- .../006_format_mount/002_by_name/test.yml.in | 8 ++-- .../006_format_mount/003_btrfs/test.yml | 10 ++--- .../006_format_mount/004_xfs/test.yml | 8 ++-- .../005_by_device_force/test.yml | 14 +++---- .../006_format_mount/010_multiple/test.yml | 12 +++--- .../007_getty-containerd/test.yml | 12 +++--- test/cases/040_packages/012_losetup/test.yml | 6 +-- .../040_packages/013_mkimage/mkimage.yml | 6 +-- test/cases/040_packages/013_mkimage/run.yml | 4 +- test/cases/040_packages/019_sysctl/test.yml | 6 +-- .../cases/040_packages/023_wireguard/test.yml | 14 +++---- test/cases/040_packages/030_logwrite/test.yml | 12 +++--- test/cases/040_packages/031_kmsg/test.yml | 14 +++---- test/cases/040_packages/032_bcc/test.yml | 4 +- test/hack/test-ltp.yml | 6 +-- test/hack/test.yml | 8 ++-- test/pkg/ns/template.yml | 4 +- 98 files changed, 537 insertions(+), 537 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index 2257612bc..52f411e03 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 + image: linuxkit/metadata:v0.7 services: - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: sshd - image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 + image: linuxkit/sshd:v0.7 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index 17979ccfb..669ffa8b3 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 services: - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 - name: sshd - image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 + image: linuxkit/sshd:v0.7 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 005184786..7d3658a33 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysfs - image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 + image: linuxkit/sysfs:v0.7 - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: ntpd - image: linuxkit/openntpd:7f48912e995d0eb6d021b5c0d2d2a062b3b2e4d3 + image: linuxkit/openntpd:v0.7 - name: docker image: docker:18.06.0-ce-dind @@ -46,7 +46,7 @@ services: - /etc/docker/daemon.json:/etc/docker/daemon.json command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] - name: cadvisor - image: linuxkit/cadvisor:0fbe6a4a89a555d749ea99735477833757d24d5d + image: linuxkit/cadvisor:v0.7 files: - path: var/lib/docker directory: true diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 8adbfe44c..da7a7a9f4 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,30 +2,30 @@ kernel: image: linuxkit/kernel:4.14.88 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "/dev/sda"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/dev/sda1", "/var/external"] - name: loop - image: linuxkit/losetup:4ceebb2672031d87a8fa60ac5e93e54c2ff1f0f2 + image: linuxkit/losetup:v0.7 command: ["/usr/bin/loopy", "--create", "/var/external/storage_file"] - name: dm-crypt - image: linuxkit/dm-crypt:6ace64a97f2db77301be0c1106dd2e2ddf9e2eab + image: linuxkit/dm-crypt:v0.7 command: ["/usr/bin/crypto", "crypt_loop_dev", "/dev/loop0"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/dev/mapper/crypt_loop_dev", "/var/secure_storage"] - name: bbox image: busybox @@ -34,11 +34,11 @@ onboot: - /var:/var services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 files: - path: etc/dm-crypt/key # the below key is just to keep the example self-contained diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index 33ce342be..656dcae09 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.88 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "/dev/sda"] - name: dm-crypt - image: linuxkit/dm-crypt:6ace64a97f2db77301be0c1106dd2e2ddf9e2eab + image: linuxkit/dm-crypt:v0.7 command: ["/usr/bin/crypto", "crypt_dev", "/dev/sda1"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/dev/mapper/crypt_dev", "/var/secure_storage"] - name: bbox image: busybox @@ -28,11 +28,11 @@ onboot: - /var:/var services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 files: - path: etc/dm-crypt/key # the below key is just to keep the example self-contained diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 725a7f642..0beb66b5b 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -3,30 +3,30 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/vpnkit-expose-port:b5f279abaa0386efeb3c03f46771609ff7c25bc3 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/vpnkit-expose-port:v0.7 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 + image: linuxkit/metadata:v0.7 - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: sysfs - image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 + image: linuxkit/sysfs:v0.7 - name: binfmt - image: linuxkit/binfmt:1d336b31146564a799673ff1a869c9717c2a86e0 + image: linuxkit/binfmt:v0.7 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:0b230ed5cbf5f920935f371dfa9e34d838d863fe + image: linuxkit/swap:v0.7 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:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:c4559f5fdce997de5dedc4c750c7a0d1044b3425 + image: linuxkit/acpid:v0.7 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:7f48912e995d0eb6d021b5c0d2d2a062b3b2e4d3 + image: linuxkit/openntpd:v0.7 # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:ad3014aba09dd15a82fae6e0f18c482810490c9a + image: linuxkit/vsudd:v0.7 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:47a75f790250c01d18d0463de9d9943dab50f027 + image: linuxkit/vpnkit-forwarder:v0.7 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:05a7b353e54371d396655610afbd5d0b830e16ac + image: linuxkit/trim-after-delete:v0.7 # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:dfe46e1f3227ac10d98655d95b2061283afc2f3d + image: linuxkit/host-timesync-daemon:v0.7 # Run dockerd with the vpnkit userland proxy from the vpnkit-forwarder container. # Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit # for vpnkit coordination and /run/config/docker for the configuration file. diff --git a/examples/docker.yml b/examples/docker.yml index 4ddb3bc55..a3a5b08fc 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,31 +2,31 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: sysfs - image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 + image: linuxkit/sysfs:v0.7 - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 - name: ntpd - image: linuxkit/openntpd:7f48912e995d0eb6d021b5c0d2d2a062b3b2e4d3 + image: linuxkit/openntpd:v0.7 - name: docker image: docker:18.06.0-ce-dind capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index 528bad0f4..e96ea5b73 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 + image: linuxkit/metadata:v0.7 services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: sshd - image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 + image: linuxkit/sshd:v0.7 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 34f639936..ba346faa4 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index ecfb6f2d2..05b422eef 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true runtime: @@ -30,7 +30,7 @@ services: destination: writeable-host-etc options: ["rw", "lowerdir=/etc", "upperdir=/run/hostetc/upper", "workdir=/run/hostetc/work"] - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 16315bcbe..36df19776 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: influxdb diff --git a/examples/logging.yml b/examples/logging.yml index 0d7434213..3bf560cc3 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,21 +3,21 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 - - linuxkit/memlogd:3d74c1153f99948d92c0fa9c759f816ab48d9855 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 + - linuxkit/memlogd:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Inside the getty type `/proc/1/root/usr/bin/logread -F` to follow the log - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true # A service which generates log messages for testing @@ -25,9 +25,9 @@ services: image: alpine:3.9 command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); sleep 1; done" ] - name: write-and-rotate-logs - image: linuxkit/logwrite:62cbf48ee2fcd374f26de7b901adc287ff6f4696 + image: linuxkit/logwrite:v0.7 - name: kmsg - image: linuxkit/kmsg:9329a7bb25b27974d74b765fe15d5f1b76609198 + image: linuxkit/kmsg:v0.7 trust: org: - linuxkit diff --git a/examples/minimal.yml b/examples/minimal.yml index 4ae425773..4928d2124 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 69f6a431b..d295e48f0 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 - name: node_exporter - image: linuxkit/node_exporter:4e895be53436f2732f206302f193d5e7b0a1a841 + image: linuxkit/node_exporter:v0.7 trust: org: - linuxkit diff --git a/examples/openstack.yml b/examples/openstack.yml index 0e06152df..9a43282ca 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 + image: linuxkit/metadata:v0.7 command: ["/usr/bin/metadata", "openstack"] services: - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: sshd - image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 + image: linuxkit/sshd:v0.7 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/packet.arm64.yml b/examples/packet.arm64.yml index bf4a7dc5a..73ad6a1ce 100644 --- a/examples/packet.arm64.yml +++ b/examples/packet.arm64.yml @@ -10,5 +10,5 @@ kernel: ucode: "" onboot: - name: modprobe - image: linuxkit/modprobe:90db3b2e63ceb633b7f66626c935c00d48e47c89 + image: linuxkit/modprobe:v0.7 command: ["modprobe", "nicvf"] diff --git a/examples/packet.yml b/examples/packet.yml index 229c17c4f..b8250eef3 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 - - linuxkit/firmware:0e37338a2c994f768fc4569fce47fcf8d9133506 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 + - linuxkit/firmware:v0.7 onboot: - name: rngd1 - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 + image: linuxkit/metadata:v0.7 command: ["/usr/bin/metadata", "packet"] services: - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 + image: linuxkit/sshd:v0.7 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index b8c3f9cdf..a51f68348 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true # Currently redis:4.0.6-alpine has trust issue with multi-arch diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index f88a20ce2..369982616 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.19.25-rt cmdline: "console=tty0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 - name: open-vm-tools - image: linuxkit/open-vm-tools:ff7d6c5789fe82c901c8a83a20f5a4182838cb3d + image: linuxkit/open-vm-tools:v0.7 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/scaleway.yml b/examples/scaleway.yml index d45374921..f9ba1ed62 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: rngd1 - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 command: ["/sbin/rngd", "-1"] - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 + image: linuxkit/metadata:v0.7 services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 trust: org: - linuxkit diff --git a/examples/sshd.yml b/examples/sshd.yml index f4487deb1..a883369f6 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: rngd1 - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 - name: sshd - image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 + image: linuxkit/sshd:v0.7 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 6ba174f68..1d59d183e 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 onboot: - name: ip - image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b + image: linuxkit/ip:v0.7 binds: - /etc/ip:/etc/ip command: ["ip", "-b", "/etc/ip/eth0.conf"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true files: diff --git a/examples/swap.yml b/examples/swap.yml index d75bef830..7dec927fe 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:0b230ed5cbf5f920935f371dfa9e34d838d863fe + image: linuxkit/swap:v0.7 # 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:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 trust: org: - linuxkit diff --git a/examples/tpm.yml b/examples/tpm.yml index 637e3d657..47a02d1ea 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:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: tss - image: linuxkit/tss:8c5284d5302485234c6390e00c42546bc505a5ca + image: linuxkit/tss:v0.7 - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 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 71182a7ab..ac50f16d9 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,22 +2,22 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 39da40a81..af7decae5 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.9 @@ -19,9 +19,9 @@ onboot: command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] services: - name: sshd - image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 + image: linuxkit/sshd:v0.7 - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:47a75f790250c01d18d0463de9d9943dab50f027 + image: linuxkit/vpnkit-forwarder:v0.7 binds: - /var/vpnkit:/port net: host diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 05a6be60d..71a341738 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:ad3014aba09dd15a82fae6e0f18c482810490c9a + image: linuxkit/vsudd:v0.7 binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/examples/vultr.yml b/examples/vultr.yml index 528bad0f4..e96ea5b73 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 + image: linuxkit/metadata:v0.7 services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: sshd - image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 + image: linuxkit/sshd:v0.7 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 23ca1aaf3..7fcc070cf 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b + image: linuxkit/ip:v0.7 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b + image: linuxkit/ip:v0.7 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,12 +40,12 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true net: /run/netns/wg1 - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: nginx image: nginx:1.13.8-alpine net: /run/netns/wg0 diff --git a/linuxkit.yml b/linuxkit.yml index 2eba37ac5..2798482bd 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 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:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 3a99a25a7..d7615bb1f 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:3a772fafa2e45b872c72375dd6bc34993257b6d1 + - linuxkit/init:v0.7 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index d5ba66419..e89050ccb 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,32 +2,32 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: sysfs - image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 + image: linuxkit/sysfs:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: ntpd - image: linuxkit/openntpd:7f48912e995d0eb6d021b5c0d2d2a062b3b2e4d3 + image: linuxkit/openntpd:v0.7 - name: docker image: docker:18.06.0-ce-dind capabilities: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 5ff95a419..41c8d74ab 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,32 +2,32 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: sysfs - image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 + image: linuxkit/sysfs:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: ntpd - image: linuxkit/openntpd:7f48912e995d0eb6d021b5c0d2d2a062b3b2e4d3 + image: linuxkit/openntpd:v0.7 - name: docker image: docker:18.06.0-ce-dind capabilities: diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 7a8a94cec..b74f44338 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:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index a189f36ca..f69d4698c 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:3a772fafa2e45b872c72375dd6bc34993257b6d1 + - linuxkit/init:v0.7 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index e1a40ec28..8004796f8 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,16 +2,16 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540" cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 2569f4a56..8d4bf88ce 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:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 - samoht/fdd onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 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 dfc1d4f9e..baccd2f6e 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcp-client image: miragesdk/dhcp-client:22aa9d527820534295a8cd59901c0c5197af6585 net: host @@ -28,9 +28,9 @@ onboot: - /lib:/lib # for ifconfig services: - name: sshd - image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 + image: linuxkit/sshd:v0.7 - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 45918a707..d81412fb7 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:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 services: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 93a105e43..e082b0aa9 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:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index fb787e5a9..e795e946a 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -17,11 +17,11 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: mkimage - image: linuxkit/mkimage:a8680e89070591c8b9e80d54e185787c19921668 + image: linuxkit/mkimage:v0.7 - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 trust: diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 67d1fa655..5b286a76d 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: org: diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 16921d926..35714db24 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -3,13 +3,13 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] # Add some random unsorted caps capabilities: @@ -18,7 +18,7 @@ onboot: services: - name: testservice - image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b + image: linuxkit/ip:v0.7 # Some environments env: - BENV=true diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index bf3c69f38..f9dfad8d9 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index bf3c69f38..f9dfad8d9 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 9393a4e8d..e07ab8ba2 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 5b85605b5..b8729098a 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 5b85605b5..b8729098a 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 5b85605b5..b8729098a 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 5b85605b5..b8729098a 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index ae8a014cc..3e73b72f2 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 5b85605b5..b8729098a 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 5b85605b5..b8729098a 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index 35891360c..a12091409 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.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 services: - name: acpid - image: linuxkit/acpid:c4559f5fdce997de5dedc4c750c7a0d1044b3425 + image: linuxkit/acpid:v0.7 trust: org: - linuxkit 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 b23294f1f..b84f7c577 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.168 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:0e9308f871ac86c680d64836a050547a2feebb36 diff --git a/test/cases/020_kernel/002_config_4.14.x/test.yml b/test/cases/020_kernel/002_config_4.14.x/test.yml index a5b2a5c0f..8dfef93ce 100644 --- a/test/cases/020_kernel/002_config_4.14.x/test.yml +++ b/test/cases/020_kernel/002_config_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:0e9308f871ac86c680d64836a050547a2feebb36 diff --git a/test/cases/020_kernel/005_config_4.19.x/test.yml b/test/cases/020_kernel/005_config_4.19.x/test.yml index f97c666cd..95316fab4 100644 --- a/test/cases/020_kernel/005_config_4.19.x/test.yml +++ b/test/cases/020_kernel/005_config_4.19.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:0e9308f871ac86c680d64836a050547a2feebb36 diff --git a/test/cases/020_kernel/007_config_5.0.x/test.yml b/test/cases/020_kernel/007_config_5.0.x/test.yml index 2a446bd0c..bc60c9e27 100644 --- a/test/cases/020_kernel/007_config_5.0.x/test.yml +++ b/test/cases/020_kernel/007_config_5.0.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.0.7 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:0e9308f871ac86c680d64836a050547a2feebb36 diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index 2d626ff01..fb32653bc 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.168 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/012_kmod_4.14.x/test.yml b/test/cases/020_kernel/012_kmod_4.14.x/test.yml index ecddf508f..24b8cb9e9 100644 --- a/test/cases/020_kernel/012_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/012_kmod_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/015_kmod_4.19.x/test.yml b/test/cases/020_kernel/015_kmod_4.19.x/test.yml index 6b73d72f3..4c831ee3f 100644 --- a/test/cases/020_kernel/015_kmod_4.19.x/test.yml +++ b/test/cases/020_kernel/015_kmod_4.19.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/017_kmod_5.0.x/test.yml b/test/cases/020_kernel/017_kmod_5.0.x/test.yml index 84fb31e96..7990d3358 100644 --- a/test/cases/020_kernel/017_kmod_5.0.x/test.yml +++ b/test/cases/020_kernel/017_kmod_5.0.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.0.7 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/110_namespace/common.yml b/test/cases/020_kernel/110_namespace/common.yml index 99d1b4a7c..e51204203 100644 --- a/test/cases/020_kernel/110_namespace/common.yml +++ b/test/cases/020_kernel/110_namespace/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 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 8bcabb891..b6088600f 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.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: sysfs - image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 + image: linuxkit/sysfs:v0.7 - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce + image: linuxkit/rngd:v0.7 - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 - name: docker image: docker:18.06.0-ce-dind capabilities: diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 1115edc8a..616d526d2 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 88bc1352f..415846ddb 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: binfmt - image: linuxkit/binfmt:1d336b31146564a799673ff1a869c9717c2a86e0 + image: linuxkit/binfmt:v0.7 - name: test image: alpine:3.9 binds: diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 8b7b59952..041658e17 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 - - linuxkit/runc:v0.5 - - linuxkit/bpftrace:67b5c3b4f13a4acf22eab8f422091e1efc06852d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/bpftrace:v0.7 onboot: - name: bpftrace-test image: alpine:3.9 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index cba8fe4e7..b9f691377 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index a0ddb0692..3a5f93e8d 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib"] - name: test image: linuxkit/test-containerd:6450109185b6678866b76867b7394c5c90f46225 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 1cb634fa5..0585e2365 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index 943c8b72e..8c22bc536 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.88 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:6ace64a97f2db77301be0c1106dd2e2ddf9e2eab + image: linuxkit/dm-crypt:v0.7 command: ["/usr/bin/crypto", "it_is_encrypted", "/dev/sda"] - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index b20bf9ece..235662afb 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.88 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:6ace64a97f2db77301be0c1106dd2e2ddf9e2eab + image: linuxkit/dm-crypt:v0.7 command: ["/usr/bin/crypto", "-l", "it_is_encrypted", "/dev/sda"] - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index aeb278f99..7b3ca7384 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.88 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:6ace64a97f2db77301be0c1106dd2e2ddf9e2eab + image: linuxkit/dm-crypt:v0.7 command: ["/usr/bin/crypto", "-k", "/some/other/enc_key", "it_is_encrypted", "/dev/sda"] binds: - /dev/:/dev 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 f572332c4..fb9374319 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 c3d551249..93545f658 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: extend - image: linuxkit/extend:4af9cb8282eabb1df184a0c4f74e0d651f16bf24 + image: linuxkit/extend:v0.7 - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 1016df185..165b93317 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: modprobe - image: linuxkit/modprobe:90db3b2e63ceb633b7f66626c935c00d48e47c89 + image: linuxkit/modprobe:v0.7 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 e54a0398b..73ecb3251 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: modprobe - image: linuxkit/modprobe:90db3b2e63ceb633b7f66626c935c00d48e47c89 + image: linuxkit/modprobe:v0.7 command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:4af9cb8282eabb1df184a0c4f74e0d651f16bf24 + image: linuxkit/extend:v0.7 command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 d558b3267..c9355b28b 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 67d6fd308..7c23ae2b4 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: extend - image: linuxkit/extend:4af9cb8282eabb1df184a0c4f74e0d651f16bf24 + image: linuxkit/extend:v0.7 command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 df40a1762..60ad11cc4 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 7b50fcbbd..ba04fbf09 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.9 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 b8cf03434..6e33ce41d 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.9 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 145e882fa..c375c9788 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: modprobe - image: linuxkit/modprobe:90db3b2e63ceb633b7f66626c935c00d48e47c89 + image: linuxkit/modprobe:v0.7 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 910aea008..9191f64f1 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 df2347cac..1580eac76 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 3fd7d1c77..34c7a1599 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 + image: linuxkit/format:v0.7 command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe + image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 372873e1a..b8ef55b08 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 + image: linuxkit/getty:v0.7 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 603fae85f..a7af50b07 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.88 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: losetup - image: linuxkit/losetup:4ceebb2672031d87a8fa60ac5e93e54c2ff1f0f2 + image: linuxkit/losetup:v0.7 command: ["/usr/bin/loopy", "-c", "/var/test.img"] - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 31e42db7b..01bae36d6 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: mkimage - image: linuxkit/mkimage:a8680e89070591c8b9e80d54e185787c19921668 + image: linuxkit/mkimage:v0.7 - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 trust: diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 0c3e9b931..72dbeb53b 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: poweroff image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index d3316a079..fd906a471 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: sysctl - image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 + image: linuxkit/sysctl:v0.7 - name: test image: alpine:3.9 net: host diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index e1dc5407c..d0d8e7867 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.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b + image: linuxkit/ip:v0.7 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b + image: linuxkit/ip:v0.7 net: new binds: - /etc/wireguard:/etc/wireguard diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index 1b88a4153..826a3ff79 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 - - linuxkit/memlogd:3d74c1153f99948d92c0fa9c759f816ab48d9855 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 + - linuxkit/memlogd:v0.7 services: # A service which generates logs of log messages - name: fill-the-logs image: alpine command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); done" ] - name: write-and-rotate-logs - image: linuxkit/logwrite:62cbf48ee2fcd374f26de7b901adc287ff6f4696 + image: linuxkit/logwrite:v0.7 command: ["/usr/bin/logwrite", "-max-log-size", "1024"] - name: check-the-logs image: alpine:3.9 diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 6dcfadb6c..6ddabfef3 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d - - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 - - linuxkit/memlogd:3d74c1153f99948d92c0fa9c759f816ab48d9855 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 + - linuxkit/ca-certificates:v0.7 + - linuxkit/memlogd:v0.7 services: - name: kmsg - image: linuxkit/kmsg:9329a7bb25b27974d74b765fe15d5f1b76609198 + image: linuxkit/kmsg:v0.7 - name: write-and-rotate-logs - image: linuxkit/logwrite:62cbf48ee2fcd374f26de7b901adc287ff6f4696 + image: linuxkit/logwrite:v0.7 - name: check-the-logs image: alpine:3.9 binds: diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index c4d77741b..021a3c577 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 - linuxkit/kernel-bcc:4.19.34 onboot: - name: check-bcc diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index c87a8fb84..4c7b19ccc 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index cbe75acb0..58989806c 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,12 +4,12 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 - - linuxkit/containerd:d197495c30d0c6e81cb038d8ab3b8f793736b39d + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 + - linuxkit/containerd:v0.7 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee + image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config image: linuxkit/test-kernel-config:0e9308f871ac86c680d64836a050547a2feebb36 diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 8f853b884..bc33f46f5 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" init: - - linuxkit/init:3a772fafa2e45b872c72375dd6bc34993257b6d1 - - linuxkit/runc:02f2f6dd425eb3ff98f488b5cdef0125be787332 + - linuxkit/init:v0.7 + - linuxkit/runc:v0.7 onboot: - name: test-ns image: linuxkit/test-ns: From 03e0d67051fd71f4849d3d1a7930b1ce523cd474 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 17 Apr 2019 07:42:40 +0100 Subject: [PATCH 08/12] kernel: Update alpine to latest Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 2 +- kernel/Dockerfile.bcc | 4 ++-- kernel/Dockerfile.kconfig | 2 +- kernel/Dockerfile.perf | 2 +- kernel/Dockerfile.zfs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 02c62a066..510e82ceb 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS kernel-build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS kernel-build RUN apk add \ argp-standalone \ automake \ diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc index 4d437d8f1..3cd990b8d 100644 --- a/kernel/Dockerfile.bcc +++ b/kernel/Dockerfile.bcc @@ -1,7 +1,7 @@ ARG IMAGE FROM ${IMAGE} as ksrc -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk update && apk upgrade -a && \ apk add --no-cache \ argp-standalone \ @@ -103,7 +103,7 @@ RUN mkdir -p /out/usr/bin && \ RUN mkdir -p /out/usr/local/share/ && \ cp -a /usr/local/share/lua /out/usr/local/share/ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed as mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk update && apk upgrade -a && \ apk add --no-cache --initdb -p /out \ diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig index d36cdf599..e7739a3dc 100644 --- a/kernel/Dockerfile.kconfig +++ b/kernel/Dockerfile.kconfig @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS kernel-build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS kernel-build RUN apk add \ argp-standalone \ bison \ diff --git a/kernel/Dockerfile.perf b/kernel/Dockerfile.perf index a996d5b2a..37ec944e1 100644 --- a/kernel/Dockerfile.perf +++ b/kernel/Dockerfile.perf @@ -3,7 +3,7 @@ ARG IMAGE FROM ${IMAGE} AS ksrc -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add \ argp-standalone \ bash \ diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs index 12a15e5c0..580d59bb7 100644 --- a/kernel/Dockerfile.zfs +++ b/kernel/Dockerfile.zfs @@ -1,6 +1,6 @@ ARG IMAGE FROM ${IMAGE} AS ksrc -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add \ attr-dev \ autoconf \ From 51fd2916c67bcaf334929342eac0194b85dbfaaf Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 17 Apr 2019 08:11:09 +0100 Subject: [PATCH 09/12] kernel: Update gcc version in kernel config files Signed-off-by: Rolf Neugebauer --- kernel/config-4.19.x-aarch64 | 4 ++-- kernel/config-4.19.x-s390x | 4 ++-- kernel/config-4.19.x-x86_64 | 4 ++-- kernel/config-5.0.x-aarch64 | 4 ++-- kernel/config-5.0.x-s390x | 4 ++-- kernel/config-5.0.x-x86_64 | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kernel/config-4.19.x-aarch64 b/kernel/config-4.19.x-aarch64 index d2091e6cf..436a410b1 100644 --- a/kernel/config-4.19.x-aarch64 +++ b/kernel/config-4.19.x-aarch64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.2.0) 8.2.0 +# Compiler: gcc (Alpine 8.3.0) 8.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80200 +CONFIG_GCC_VERSION=80300 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/kernel/config-4.19.x-s390x b/kernel/config-4.19.x-s390x index f784651bd..bf8e48416 100644 --- a/kernel/config-4.19.x-s390x +++ b/kernel/config-4.19.x-s390x @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.2.0) 8.2.0 +# Compiler: gcc (Alpine 8.3.0) 8.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80200 +CONFIG_GCC_VERSION=80300 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/kernel/config-4.19.x-x86_64 b/kernel/config-4.19.x-x86_64 index 78c52cd18..23445f69f 100644 --- a/kernel/config-4.19.x-x86_64 +++ b/kernel/config-4.19.x-x86_64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.2.0) 8.2.0 +# Compiler: gcc (Alpine 8.3.0) 8.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80200 +CONFIG_GCC_VERSION=80300 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/kernel/config-5.0.x-aarch64 b/kernel/config-5.0.x-aarch64 index a0f576f31..041a3b87e 100644 --- a/kernel/config-5.0.x-aarch64 +++ b/kernel/config-5.0.x-aarch64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.2.0) 8.2.0 +# Compiler: gcc (Alpine 8.3.0) 8.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80200 +CONFIG_GCC_VERSION=80300 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y diff --git a/kernel/config-5.0.x-s390x b/kernel/config-5.0.x-s390x index 89a4cdfa5..00372ade5 100644 --- a/kernel/config-5.0.x-s390x +++ b/kernel/config-5.0.x-s390x @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.2.0) 8.2.0 +# Compiler: gcc (Alpine 8.3.0) 8.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80200 +CONFIG_GCC_VERSION=80300 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y diff --git a/kernel/config-5.0.x-x86_64 b/kernel/config-5.0.x-x86_64 index 0ea8d8569..c309d01d9 100644 --- a/kernel/config-5.0.x-x86_64 +++ b/kernel/config-5.0.x-x86_64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.2.0) 8.2.0 +# Compiler: gcc (Alpine 8.3.0) 8.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80200 +CONFIG_GCC_VERSION=80300 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y From 087badc8b70930d1450bfbc2d46473e362066119 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 16 Apr 2019 23:47:59 +0100 Subject: [PATCH 10/12] Update AUTHORS Signed-off-by: Rolf Neugebauer --- .mailmap | 1 + AUTHORS | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index 91741a88c..adca1fa52 100644 --- a/.mailmap +++ b/.mailmap @@ -30,6 +30,7 @@ Ian Campbell Isaac Rodman Isaac Rodman Istvan Szukacs +James McCoy Jeff Wu Jeremy Yallop Justin Cormack diff --git a/AUTHORS b/AUTHORS index ce5a71524..0a9da0267 100644 --- a/AUTHORS +++ b/AUTHORS @@ -50,6 +50,7 @@ Ilya Dmitrichenko Isaac Rodman Istvan Szukacs Ivan Markin +James McCoy Jason A. Donenfeld Jeff Wu Jeffrey Hogan @@ -108,6 +109,7 @@ Rui Lopes Ryoga Saito Scott Coulton Sebastiaan van Stijn +sethp Simarpreet Singh Simon Ferquel Sotiris Salloumis From ac81de2ac383e15576711ff673cca72801dc223e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 16 Apr 2019 23:48:35 +0100 Subject: [PATCH 11/12] Update version in top-level Makefile Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5b84b266e..ab7799ff4 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION="v0.6+" +VERSION="v0.7" GIT_COMMIT=$(shell git rev-list -1 HEAD) GO_COMPILE=linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba From ea9a9dd7632cffb1e554c4f85e28a520f5431425 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 17 Apr 2019 00:05:46 +0100 Subject: [PATCH 12/12] Update CHANGELOG Signed-off-by: Rolf Neugebauer --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e83e130ad..d2b1b6587 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,26 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). +## [v0.7] - 2019-04-17 +### Added +- Reproducible `linuxkit build` for some output formats +- Support uncompressed kernels, e.g., for crosvm and firecracker. +- Support encrypted disks via `dm-crypt` +- New `bpftrace` package +- Support for USB devices in `qemu` + +### Changed +- Alpine base updated to 3.9 +- `containerd` updated to v1.2.6 +- WireGuard updated to 0.0.20190227 +- Updated Docker base API level +- VirtualBox improvements (multiple drives and network adapters) +- Fixed Windows path handling in `linuxkit` +- GCP: Improve error checking/handling + +### Removed + + ## [v0.6] - 2018-07-26 ### Added - `linuxkit build` now works with private repositories and registries.