From b5c6c3ceeba9a5fe88260a5103e5977c914ef115 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 11 Feb 2019 15:59:26 +0000 Subject: [PATCH 1/6] test/pkg/containerd: move config to build.yml ... from the old-skool label scheme. No semantic change intended. Some keys are in different orders and the "mounts" entry gained an empty "destination" key, neither of which makes a practical difference. Signed-off-by: Ian Campbell --- test/pkg/containerd/Dockerfile | 1 - test/pkg/containerd/build.yml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 79c5cfc63..547d31afe 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -29,4 +29,3 @@ WORKDIR $GOPATH/src/github.com/containerd/containerd ADD run.sh ./run.sh ENTRYPOINT ["/bin/sh", "run.sh"] -LABEL org.mobyproject.config='{"capabilities": ["all"], "tmpfs": ["/tmp"], "binds": ["/dev:/dev", "/var/lib:/var/lib", "/etc/resolv.conf:/etc/resolv.conf", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/containerd:/usr/bin/containerd", "/usr/bin/containerd-shim:/usr/bin/containerd-shim"], "mounts": [{"type": "cgroup", "options": ["rw","nosuid","noexec","nodev","relatime"]}],}' diff --git a/test/pkg/containerd/build.yml b/test/pkg/containerd/build.yml index fb2956359..52b324254 100644 --- a/test/pkg/containerd/build.yml +++ b/test/pkg/containerd/build.yml @@ -1 +1,16 @@ image: test-containerd +config: + capabilities: + - all + tmpfs: + - /tmp + binds: + - /dev:/dev + - /var/lib:/var/lib + - /etc/resolv.conf:/etc/resolv.conf + - /usr/bin/runc:/usr/bin/runc + - /usr/bin/containerd:/usr/bin/containerd + - /usr/bin/containerd-shim:/usr/bin/containerd-shim + mounts: + - type: cgroup + options: ["rw","nosuid","noexec","nodev","relatime"] From f3ec48417c43a9e2e2ffdb5a5bfebf7e00ea8b11 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 11 Feb 2019 16:06:38 +0000 Subject: [PATCH 2/6] Redirect $TMPDIR when running containerd tests These tests expect a $TMPDIR which supports user xattrs, which the tmpfs on /tmp does not. Redirect it to the persistent disk which does. Signed-off-by: Ian Campbell --- test/pkg/containerd/run.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/pkg/containerd/run.sh b/test/pkg/containerd/run.sh index 23dc8d2b8..a08e4bffa 100755 --- a/test/pkg/containerd/run.sh +++ b/test/pkg/containerd/run.sh @@ -9,6 +9,10 @@ function failed { git describe HEAD git rev-parse HEAD +# The unit tests need user_xattr support, which /tmp (a tmpfs) does not support. +mkdir -p /var/lib/tmp +export TMPDIR=/var/lib/tmp + # unset -race (does not work on alpine; see golang/go#14481) export TESTFLAGS= make root-test || failed From 236d68f409fa04557cf7272a737e6dfe2e80ef7f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 14 Feb 2019 09:46:58 +0000 Subject: [PATCH 3/6] alpine: Bump to containerd v1.2.4 Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 2 +- tools/alpine/versions.aarch64 | 2 +- tools/alpine/versions.s390x | 2 +- tools/alpine/versions.x86_64 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index b00e9049f..fd38259e4 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -54,7 +54,7 @@ RUN go get -u github.com/LK4D4/vndr # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # `test/pkg/containerd/Dockerfile` when changing this. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.2.3 +ENV CONTAINERD_COMMIT=v1.2.4 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 9948eb4eb..230d5e48b 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:65ce4957b08baf27c6cce9dd3af2e869472f32d8-arm64 +# linuxkit/alpine:915a4c2f6bef52a89ec1e573d05431bbef4a546d-arm64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index 0b0758e7e..f93a3467c 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:6b8f260bcaa4d7037049fab41cb1cca84a061568-s390x +# linuxkit/alpine:61cdbbff3e159a0c082036f0c4bda4b5c03b7802-s390x # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index d735b87b6..0c8b310f5 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:19576072dd2b2f17fa73828e4bbd442e954992a3-amd64 +# linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac-amd64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 From 24c13f222c09e1da227048a96b9bd4711c2d2f3c Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 14 Feb 2019 10:01:33 +0000 Subject: [PATCH 4/6] Bump runc to version from containerd v1.2.4 Signed-off-by: Ian Campbell --- pkg/runc/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index 769ac0f99..665135b9f 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -11,7 +11,7 @@ RUN \ make \ && true ENV GOPATH=/go PATH=$PATH:/go/bin -ENV RUNC_COMMIT=12f6a991201fdb8f82579582d5e00e28fba06d0a +ENV RUNC_COMMIT=6635b4f0c6af3810594d2770f662f34ddc15b40d RUN mkdir -p $GOPATH/src/github.com/opencontainers && \ cd $GOPATH/src/github.com/opencontainers && \ git clone https://github.com/opencontainers/runc.git From 39ee6c0e9b79082e40ca881ed6ab9420bb8c6db3 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 14 Feb 2019 10:01:33 +0000 Subject: [PATCH 5/6] Bump packages to new alpine w/ containerd v1.2.4 Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 2 +- pkg/init/Dockerfile | 4 ++-- pkg/runc/Dockerfile | 2 +- test/pkg/containerd/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 241570a87..32f9afb96 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:19576072dd2b2f17fa73828e4bbd442e954992a3 as alpine +FROM linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 94b7933e6..f7bb199e1 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:19576072dd2b2f17fa73828e4bbd442e954992a3 AS build +FROM linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service -FROM linuxkit/alpine:19576072dd2b2f17fa73828e4bbd442e954992a3 AS mirror +FROM linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index 665135b9f..b76cd98fe 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:19576072dd2b2f17fa73828e4bbd442e954992a3 as alpine +FROM linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac as alpine RUN \ apk add \ bash \ diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 547d31afe..cc7e3eedc 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:19576072dd2b2f17fa73828e4bbd442e954992a3 AS mirror +FROM linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) From 16df1af13962a3c4cfc61665dcc57389e097df49 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 14 Feb 2019 10:16:47 +0000 Subject: [PATCH 6/6] Bump yml to pickup containerd v1.2.4 Also pick a newer version of runc. Signed-off-by: Ian Campbell --- examples/aws.yml | 6 +++--- examples/azure.yml | 6 +++--- examples/cadvisor.yml | 6 +++--- examples/docker-for-mac.yml | 6 +++--- examples/docker.yml | 6 +++--- examples/gcp.yml | 6 +++--- examples/getty.yml | 6 +++--- examples/hostmount-writeable-overlay.yml | 6 +++--- examples/influxdb-os.yml | 6 +++--- examples/logging.yml | 6 +++--- examples/minimal.yml | 6 +++--- examples/node_exporter.yml | 6 +++--- examples/openstack.yml | 6 +++--- examples/packet.yml | 6 +++--- examples/redis-os.yml | 6 +++--- examples/rt-for-vmware.yml | 6 +++--- examples/scaleway.yml | 6 +++--- examples/sshd.yml | 6 +++--- examples/swap.yml | 6 +++--- examples/tpm.yml | 6 +++--- examples/vmware.yml | 6 +++--- examples/vpnkit-forwarder.yml | 6 +++--- examples/vsudd-containerd.yml | 6 +++--- examples/vultr.yml | 6 +++--- examples/wireguard.yml | 6 +++--- linuxkit.yml | 6 +++--- projects/clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 6 +++--- projects/compose/compose-static.yml | 6 +++--- projects/ima-namespace/ima-namespace.yml | 6 +++--- projects/landlock/landlock.yml | 2 +- projects/memorizer/memorizer.yml | 6 +++--- projects/miragesdk/examples/fdd.yml | 6 +++--- projects/miragesdk/examples/mirage-dhcp.yml | 6 +++--- projects/okernel/examples/okernel_simple.yaml | 6 +++--- projects/shiftfs/shiftfs.yml | 6 +++--- src/cmd/linuxkit/moby/linuxkit.go | 4 ++-- test/cases/000_build/000_formats/test.yml | 4 ++-- test/cases/000_build/010_reproducible/test.yml | 6 +++--- .../010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 4 ++-- .../000_qemu/005_run_kernel+squashfs/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 4 ++-- .../010_platforms/000_qemu/030_run_qcow_bios/test.yml | 4 ++-- .../010_platforms/000_qemu/040_run_raw_bios/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/100_container/test.yml | 4 ++-- .../010_hyperkit/000_run_kernel+initrd/test.yml | 4 ++-- .../010_hyperkit/005_run_kernel+squashfs/test.yml | 4 ++-- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 6 +++--- 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/006_config_4.20.x/test.yml | 4 ++-- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 4 ++-- test/cases/020_kernel/012_kmod_4.14.x/test.yml | 4 ++-- test/cases/020_kernel/015_kmod_4.19.x/test.yml | 4 ++-- test/cases/020_kernel/016_kmod_4.20.x/test.yml | 4 ++-- test/cases/020_kernel/110_namespace/common.yml | 4 ++-- test/cases/030_security/000_docker-bench/test.yml | 6 +++--- test/cases/030_security/010_ports/test.yml | 4 ++-- test/cases/040_packages/002_binfmt/test.yml | 4 ++-- test/cases/040_packages/003_ca-certificates/test.yml | 4 ++-- test/cases/040_packages/003_containerd/test.yml | 8 ++++---- test/cases/040_packages/004_dhcpcd/test.yml | 4 ++-- .../040_packages/005_extend/000_ext4/test-create.yml | 4 ++-- test/cases/040_packages/005_extend/000_ext4/test.yml | 4 ++-- .../040_packages/005_extend/001_btrfs/test-create.yml | 4 ++-- test/cases/040_packages/005_extend/001_btrfs/test.yml | 4 ++-- .../cases/040_packages/005_extend/002_xfs/test-create.yml | 4 ++-- test/cases/040_packages/005_extend/002_xfs/test.yml | 4 ++-- .../cases/040_packages/006_format_mount/000_auto/test.yml | 4 ++-- .../040_packages/006_format_mount/001_by_label/test.yml | 4 ++-- .../040_packages/006_format_mount/002_by_name/test.yml.in | 4 ++-- .../040_packages/006_format_mount/003_btrfs/test.yml | 4 ++-- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 4 ++-- .../006_format_mount/005_by_device_force/test.yml | 4 ++-- .../040_packages/006_format_mount/010_multiple/test.yml | 4 ++-- test/cases/040_packages/007_getty-containerd/test.yml | 6 +++--- test/cases/040_packages/013_mkimage/mkimage.yml | 4 ++-- test/cases/040_packages/013_mkimage/run.yml | 4 ++-- test/cases/040_packages/019_sysctl/test.yml | 4 ++-- test/cases/040_packages/023_wireguard/test.yml | 6 +++--- test/cases/040_packages/030_logwrite/test.yml | 6 +++--- test/cases/040_packages/031_kmsg/test.yml | 6 +++--- test/hack/test-ltp.yml | 6 +++--- test/hack/test.yml | 6 +++--- test/pkg/ns/template.yml | 4 ++-- 88 files changed, 219 insertions(+), 219 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index b78009c87..c7b18359b 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index b7bc6193f..37f0ca732 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index fde1c5c3e..a03d1c502 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index f12a83c5b..d89fb0fd9 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -4,9 +4,9 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:v0.6 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: # support metadata for optional config in /run/config diff --git a/examples/docker.yml b/examples/docker.yml index fb162469b..3792cdfea 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index d94fa9c0e..5139db700 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 85985f405..727159cbd 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 887737471..777d439ea 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index fb7971512..7c481daba 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd diff --git a/examples/logging.yml b/examples/logging.yml index 5f7e4899d..c7ac56be6 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 - linuxkit/memlogd:v0.6 onboot: diff --git a/examples/minimal.yml b/examples/minimal.yml index 5d1705b9e..26066fd29 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index a15b024ee..a99bf576c 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 services: - name: getty image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 diff --git a/examples/openstack.yml b/examples/openstack.yml index 061ab631c..ac802d030 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/packet.yml b/examples/packet.yml index 0a4a6cb82..63dea73da 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,9 +3,9 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 - linuxkit/firmware:v0.6 onboot: diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 6c5f80645..e7d755d4c 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index e7cca4c0a..77fb6dede 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.87-rt cmdline: "console=tty0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/scaleway.yml b/examples/scaleway.yml index 25ac03651..630b89e4e 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/sshd.yml b/examples/sshd.yml index 13cdef729..cb7e545bf 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index b492470a1..b3d857423 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index ed51e929c..e790fbf62 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index a85595557..2757eae55 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 1ce8e62b7..91c07d74d 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 648a9a481..f392f1959 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 diff --git a/examples/vultr.yml b/examples/vultr.yml index d94fa9c0e..5139db700 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 3ab5d967a..cb6d601c0 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 4c8a261f3..1ea17346f 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index e72433efb..fbeaa323e 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:4448c4b6d4308244160b71c423bc9df32bc180db + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index d481233bc..20ce57efd 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 535f73ecb..3e2332448 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index f080a4ab3..e2295f1f3 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 6d7e4abc2..7f1a635db 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:4448c4b6d4308244160b71c423bc9df32bc180db + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 059536b58..5dd591e9f 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540" cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 6aae0337a..094e2bebf 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 88acfcd52..746332fb5 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 onboot: - name: sysctl image: linuxkit/sysctl:v0.6 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 84455b121..32982ba98 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,9 +2,9 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index c37620672..56f8121f8 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,9 +2,9 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index 9168c280e..fd9dd38f1 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -17,8 +17,8 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: mkimage image: linuxkit/mkimage:v0.6 diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 6eb99df94..f2c3d3145 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index f82fe9f6a..19f000e30 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 onboot: - name: dhcpcd 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 7ed03b5d6..f59168a15 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.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index 7ed03b5d6..f59168a15 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.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index b606a1126..d4e5f1a23 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.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 9688fbbaf..4ffa1c441 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.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 9688fbbaf..4ffa1c441 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.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 9688fbbaf..4ffa1c441 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.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 9688fbbaf..4ffa1c441 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.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index c13af6cbd..01ced3b06 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.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 9688fbbaf..4ffa1c441 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.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 9688fbbaf..4ffa1c441 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.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index 4cecb479c..7d27476f4 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 services: - name: acpid image: linuxkit/acpid:v0.6 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 dc9355271..6c2a98751 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.155 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 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 236024a0e..e0ba3c55d 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.98 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 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 2cfde9f01..197914a42 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.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 diff --git a/test/cases/020_kernel/006_config_4.20.x/test.yml b/test/cases/020_kernel/006_config_4.20.x/test.yml index 55b6960cb..8af750b00 100644 --- a/test/cases/020_kernel/006_config_4.20.x/test.yml +++ b/test/cases/020_kernel/006_config_4.20.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.20.7 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 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 2b3b1c132..6eafb13a8 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.155 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 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 af8cde544..da18302cc 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.98 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 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 d46300411..bc751bf95 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.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/016_kmod_4.20.x/test.yml b/test/cases/020_kernel/016_kmod_4.20.x/test.yml index ca955a716..9fa08d169 100644 --- a/test/cases/020_kernel/016_kmod_4.20.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.20.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.20.7 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 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 82580f897..886440ead 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.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 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 d31416287..f52c92730 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index a280a9ebf..c1448d7d6 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.20 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index f307a18e5..f94ebac64 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: binfmt image: linuxkit/binfmt:e2d222038867ebd13b0b723c8351be559267050b diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 47d6348c6..4542a6bbd 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - linuxkit/ca-certificates:v0.6 onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index b98401635..1f174857c 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:8c7abc5cfdce5677d477f4a3d384a019aea339c9 + image: linuxkit/test-containerd:c519056cae689157ab6805a309ff1ca0f1de11dc - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 trust: diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 1e745504d..733110270 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 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 87d7ec509..0cf699f54 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: format image: linuxkit/format:v0.6 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 93fbb5dba..f724a8553 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: extend image: linuxkit/extend:v0.6 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 c8a80a075..2907328d3 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: modprobe image: linuxkit/modprobe:v0.6 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 8e315005f..1b9d13f3e 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: modprobe image: linuxkit/modprobe:v0.6 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 f3b15d00e..2f8fa1b69 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: format image: linuxkit/format:v0.6 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 b13ba7dc0..64a516193 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: extend image: linuxkit/extend:v0.6 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 60f5d9db4..820978c10 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: format image: linuxkit/format:v0.6 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 55b695a5a..417ecc44e 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: format image: linuxkit/format:v0.6 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 e9301050b..7e7d7ba96 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: format image: linuxkit/format:v0.6 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 c54c2e123..e8656926b 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: modprobe image: linuxkit/modprobe:v0.6 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 6ac1aa830..c2bf68555 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: format image: linuxkit/format:v0.6 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 8d3dba878..0bcec2737 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: format image: linuxkit/format:v0.6 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 ec241ea1c..1d5d1ec21 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,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: format image: linuxkit/format:v0.6 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index cda77b4a9..66064616e 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 95a4ed76a..ca7e14694 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: mkimage image: linuxkit/mkimage:v0.6 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 966a71b65..cb8a0bb8e 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.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index daac9df10..fc82805d0 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: sysctl image: linuxkit/sysctl:v0.6 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 544c8ae91..922e599fe 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index 2e6db0288..7be72534b 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 - linuxkit/memlogd:v0.6 services: diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 118e76fc7..b8d48bc94 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - linuxkit/ca-certificates:v0.6 - linuxkit/memlogd:v0.6 services: diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 24f445a7c..b3b1c71d1 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index c665cd4d8..ece9ac5f8 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc - - linuxkit/containerd:56e03cfa92d75d6eb5a7fc44742e50f427ba29a3 + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 005cd2902..c117992ea 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:4.19.20 cmdline: "console=ttyS0" init: - - linuxkit/init:4448c4b6d4308244160b71c423bc9df32bc180db - - linuxkit/runc:a81d48a1568f41b1c2e048fe017dbd88c6a4bdcc + - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: test-ns image: linuxkit/test-ns: