From a5ed0cf40a3a5deedfcdebcebefe508504d1632f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 19 Jun 2018 10:27:55 +0100 Subject: [PATCH 1/3] alpine: Bump to containerd v1.1.1-rc.1 Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 2 +- tools/alpine/versions.aarch64 | 30 +++++++++++++++--------------- tools/alpine/versions.s390x | 30 +++++++++++++++--------------- tools/alpine/versions.x86_64 | 28 ++++++++++++++-------------- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index b0ac56180..7b695e395 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.1.1-rc.0 +ENV CONTAINERD_COMMIT=v1.1.1-rc.1 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 fd7a20cc1..00007239b 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:feb9760984b371182ac18cfc978963a25177ffa9-arm64 +# linuxkit/alpine:8a99b84b99a3d3082fbdba657bb4628a1f253b6f-arm64 # automatically generated list of installed packages abuild-3.1.0-r4 alpine-baselayout-3.0.5-r2 @@ -25,7 +25,7 @@ btrfs-progs-4.13.2-r0 btrfs-progs-dev-4.13.2-r0 btrfs-progs-libs-4.13.2-r0 build-base-0.5-r0 -busybox-1.27.2-r10 +busybox-1.27.2-r11 busybox-initscripts-3.1-r2 bzip2-1.0.6-r6 ca-certificates-20171114-r0 @@ -74,7 +74,7 @@ git-2.15.2-r0 glib-2.54.2-r0 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 -gnupg-2.2.3-r0 +gnupg-2.2.3-r1 gnutls-3.6.1-r0 go-1.9.4-r0 go1.10-1.10-r0 @@ -130,7 +130,7 @@ libexecinfo-dev-1.1-r0 libfdisk-2.31-r0 libffi-3.2.1-r4 libgcc-6.4.0-r5 -libgcrypt-1.8.1-r0 +libgcrypt-1.8.3-r0 libgmpxx-6.1.2-r1 libgomp-6.4.0-r5 libgpg-error-1.27-r1 @@ -152,11 +152,11 @@ libnl3-3.2.28-r1 libogg-1.3.3-r1 libpcap-1.8.1-r1 libpng-1.6.34-r1 -libressl-2.6.4-r2 -libressl-dev-2.6.4-r2 -libressl2.6-libcrypto-2.6.4-r2 -libressl2.6-libssl-2.6.4-r2 -libressl2.6-libtls-2.6.4-r2 +libressl-2.6.5-r0 +libressl-dev-2.6.5-r0 +libressl2.6-libcrypto-2.6.5-r0 +libressl2.6-libssl-2.6.5-r0 +libressl2.6-libtls-2.6.5-r0 libsasl-2.1.26-r11 libseccomp-2.3.2-r1 libseccomp-dev-2.3.2-r1 @@ -218,7 +218,7 @@ pax-utils-1.2.2-r1 pcre-8.41-r1 pcre2-10.30-r0 pcsc-lite-libs-1.8.22-r0 -perl-5.26.2-r0 +perl-5.26.2-r1 pigz-2.3.4-r2 pinentry-1.0.0-r0 pixman-0.34.0-r3 @@ -251,7 +251,7 @@ socat-1.7.3.2-r3 spice-server-0.14.0-r6 sqlite-libs-3.21.0-r1 squashfs-tools-4.3-r4 -ssl_client-1.27.2-r10 +ssl_client-1.27.2-r11 strace-4.19-r0 sudo-1.8.21_p2-r1 swig-3.0.12-r1 @@ -271,12 +271,12 @@ vim-8.0.1359-r0 wayland-libs-client-1.14.0-r2 wayland-libs-cursor-1.14.0-r2 wayland-libs-server-1.14.0-r2 -wireguard-tools-0.0.20180519-r0 +wireguard-tools-0.0.20180613-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 -xfsprogs-4.14.0-r0 -xfsprogs-extra-4.14.0-r0 -xfsprogs-libs-4.14.0-r0 +xfsprogs-4.14.0-r1 +xfsprogs-extra-4.14.0-r1 +xfsprogs-libs-4.14.0-r1 xorriso-1.4.8-r0 xz-5.2.3-r1 xz-dev-5.2.3-r1 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index fb396c73a..5430a1d67 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:8c9ca0f61b97867d2680214b99999675c859c8e1-s390x +# linuxkit/alpine:ed0f780519d8ec06662ced70bbb65ef0362238e9-s390x # automatically generated list of installed packages abuild-3.1.0-r4 alpine-baselayout-3.0.5-r2 @@ -25,7 +25,7 @@ btrfs-progs-4.13.2-r0 btrfs-progs-dev-4.13.2-r0 btrfs-progs-libs-4.13.2-r0 build-base-0.5-r0 -busybox-1.27.2-r10 +busybox-1.27.2-r11 busybox-initscripts-3.1-r2 bzip2-1.0.6-r6 ca-certificates-20171114-r0 @@ -74,7 +74,7 @@ git-2.15.2-r0 glib-2.54.2-r0 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 -gnupg-2.2.3-r0 +gnupg-2.2.3-r1 gnutls-3.6.1-r0 go-1.9.4-r0 go1.10-1.10-r0 @@ -126,7 +126,7 @@ libevent-2.1.8-r2 libfdisk-2.31-r0 libffi-3.2.1-r4 libgcc-6.4.0-r5 -libgcrypt-1.8.1-r0 +libgcrypt-1.8.3-r0 libgmpxx-6.1.2-r1 libgomp-6.4.0-r5 libgpg-error-1.27-r1 @@ -148,11 +148,11 @@ libnl3-3.2.28-r1 libogg-1.3.3-r1 libpcap-1.8.1-r1 libpng-1.6.34-r1 -libressl-2.6.4-r2 -libressl-dev-2.6.4-r2 -libressl2.6-libcrypto-2.6.4-r2 -libressl2.6-libssl-2.6.4-r2 -libressl2.6-libtls-2.6.4-r2 +libressl-2.6.5-r0 +libressl-dev-2.6.5-r0 +libressl2.6-libcrypto-2.6.5-r0 +libressl2.6-libssl-2.6.5-r0 +libressl2.6-libtls-2.6.5-r0 libsasl-2.1.26-r11 libseccomp-2.3.2-r1 libseccomp-dev-2.3.2-r1 @@ -212,7 +212,7 @@ pax-utils-1.2.2-r1 pcre-8.41-r1 pcre2-10.30-r0 pcsc-lite-libs-1.8.22-r0 -perl-5.26.2-r0 +perl-5.26.2-r1 pigz-2.3.4-r2 pinentry-1.0.0-r0 pixman-0.34.0-r3 @@ -245,7 +245,7 @@ socat-1.7.3.2-r3 spice-server-0.14.0-r6 sqlite-libs-3.21.0-r1 squashfs-tools-4.3-r4 -ssl_client-1.27.2-r10 +ssl_client-1.27.2-r11 strace-4.19-r0 sudo-1.8.21_p2-r1 swig-3.0.12-r1 @@ -265,12 +265,12 @@ vim-8.0.1359-r0 wayland-libs-client-1.14.0-r2 wayland-libs-cursor-1.14.0-r2 wayland-libs-server-1.14.0-r2 -wireguard-tools-0.0.20180519-r0 +wireguard-tools-0.0.20180613-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 -xfsprogs-4.14.0-r0 -xfsprogs-extra-4.14.0-r0 -xfsprogs-libs-4.14.0-r0 +xfsprogs-4.14.0-r1 +xfsprogs-extra-4.14.0-r1 +xfsprogs-libs-4.14.0-r1 xorriso-1.4.8-r0 xz-5.2.3-r1 xz-dev-5.2.3-r1 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 19437c28c..07630f579 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:6d3165faaf08e34ed4e21333d4669b5fbdbc2a23-amd64 +# linuxkit/alpine:f43a74d6693a8f11d4016a8fc6dcb87365b71eb6-amd64 # automatically generated list of installed packages abuild-3.1.0-r4 alpine-baselayout-3.0.5-r2 @@ -25,7 +25,7 @@ btrfs-progs-4.13.2-r0 btrfs-progs-dev-4.13.2-r0 btrfs-progs-libs-4.13.2-r0 build-base-0.5-r0 -busybox-1.27.2-r10 +busybox-1.27.2-r11 busybox-initscripts-3.1-r2 bzip2-1.0.6-r6 ca-certificates-20171114-r0 @@ -75,7 +75,7 @@ git-2.15.2-r0 glib-2.54.2-r0 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 -gnupg-2.2.3-r0 +gnupg-2.2.3-r1 gnutls-3.6.1-r0 go-1.9.4-r0 go1.10-1.10-r0 @@ -157,11 +157,11 @@ libogg-1.3.3-r1 libpcap-1.8.1-r1 libpciaccess-0.13.5-r1 libpng-1.6.34-r1 -libressl-2.6.4-r2 -libressl-dev-2.6.4-r2 -libressl2.6-libcrypto-2.6.4-r2 -libressl2.6-libssl-2.6.4-r2 -libressl2.6-libtls-2.6.4-r2 +libressl-2.6.5-r0 +libressl-dev-2.6.5-r0 +libressl2.6-libcrypto-2.6.5-r0 +libressl2.6-libssl-2.6.5-r0 +libressl2.6-libtls-2.6.5-r0 libsasl-2.1.26-r11 libseccomp-2.3.2-r1 libseccomp-dev-2.3.2-r1 @@ -226,7 +226,7 @@ pax-utils-1.2.2-r1 pcre-8.41-r1 pcre2-10.30-r0 pcsc-lite-libs-1.8.22-r0 -perl-5.26.2-r0 +perl-5.26.2-r1 pigz-2.3.4-r2 pinentry-1.0.0-r0 pixman-0.34.0-r3 @@ -258,7 +258,7 @@ socat-1.7.3.2-r3 spice-server-0.14.0-r6 sqlite-libs-3.21.0-r1 squashfs-tools-4.3-r4 -ssl_client-1.27.2-r10 +ssl_client-1.27.2-r11 strace-4.19-r0 sudo-1.8.21_p2-r1 swig-3.0.12-r1 @@ -279,12 +279,12 @@ vim-8.0.1359-r0 wayland-libs-client-1.14.0-r2 wayland-libs-cursor-1.14.0-r2 wayland-libs-server-1.14.0-r2 -wireguard-tools-0.0.20180519-r0 +wireguard-tools-0.0.20180613-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 -xfsprogs-4.14.0-r0 -xfsprogs-extra-4.14.0-r0 -xfsprogs-libs-4.14.0-r0 +xfsprogs-4.14.0-r1 +xfsprogs-extra-4.14.0-r1 +xfsprogs-libs-4.14.0-r1 xorriso-1.4.8-r0 xz-5.2.3-r1 xz-dev-5.2.3-r1 From 90f7d1bed9c75f454159c14a06a8311df0ef0fad Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 19 Jun 2018 16:01:20 +0100 Subject: [PATCH 2/3] Bump packages to new alpine w/ containerd v1.1.1-rc.1 Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 2 +- pkg/init/Dockerfile | 4 ++-- test/pkg/containerd/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index a3605bd2d..cdc28e0f5 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:aacd96ba37a981d0ba659fd57316c7140cf59a36 as alpine +FROM linuxkit/alpine:f43a74d6693a8f11d4016a8fc6dcb87365b71eb6 as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index cb1e80adb..9e876f7e7 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:aacd96ba37a981d0ba659fd57316c7140cf59a36 AS build +FROM linuxkit/alpine:f43a74d6693a8f11d4016a8fc6dcb87365b71eb6 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -19,7 +19,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:aacd96ba37a981d0ba659fd57316c7140cf59a36 AS mirror +FROM linuxkit/alpine:f43a74d6693a8f11d4016a8fc6dcb87365b71eb6 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/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 89f04b954..43a3743a1 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:aacd96ba37a981d0ba659fd57316c7140cf59a36 AS mirror +FROM linuxkit/alpine:f43a74d6693a8f11d4016a8fc6dcb87365b71eb6 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 bb307079b076a29ec794b599124524a9eebc24a3 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 19 Jun 2018 16:50:56 +0100 Subject: [PATCH 3/3] Bump yml to pickup containerd v1.1.1-rc.1 Signed-off-by: Ian Campbell --- contrib/crosvm/README.md | 4 ++-- examples/aws.yml | 4 ++-- examples/azure.yml | 4 ++-- examples/cadvisor.yml | 4 ++-- examples/docker-for-mac.yml | 4 ++-- examples/docker.yml | 4 ++-- examples/gcp.yml | 4 ++-- examples/getty.yml | 4 ++-- examples/hostmount-writeable-overlay.yml | 4 ++-- examples/influxdb-os.yml | 4 ++-- examples/minimal.yml | 4 ++-- examples/node_exporter.yml | 4 ++-- examples/openstack.yml | 4 ++-- examples/packet.yml | 4 ++-- examples/redis-os.yml | 4 ++-- examples/rt-for-vmware.yml | 4 ++-- examples/scaleway.yml | 2 +- examples/sshd.yml | 4 ++-- examples/swap.yml | 4 ++-- examples/tpm.yml | 4 ++-- examples/vmware.yml | 4 ++-- examples/vpnkit-forwarder.yml | 4 ++-- examples/vsudd-containerd.yml | 4 ++-- examples/vultr.yml | 4 ++-- examples/wireguard.yml | 4 ++-- linuxkit.yml | 4 ++-- projects/clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 4 ++-- projects/compose/compose-static.yml | 4 ++-- projects/ima-namespace/ima-namespace.yml | 4 ++-- projects/landlock/landlock.yml | 2 +- projects/logging/examples/logging.yml | 4 ++-- projects/memorizer/memorizer.yml | 4 ++-- projects/miragesdk/examples/fdd.yml | 4 ++-- projects/miragesdk/examples/mirage-dhcp.yml | 4 ++-- projects/okernel/examples/okernel_simple.yaml | 4 ++-- projects/shiftfs/shiftfs.yml | 4 ++-- test/cases/000_build/000_formats/test.yml | 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 +- .../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_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_hyperkit/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 4 ++-- test/cases/020_kernel/000_config_4.4.x/test.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test.yml | 2 +- test/cases/020_kernel/006_config_4.14.x/test.yml | 2 +- test/cases/020_kernel/008_config_4.16.x/test.yml | 2 +- test/cases/020_kernel/009_config_4.17.x/test.yml | 2 +- test/cases/020_kernel/010_kmod_4.4.x/test.yml | 2 +- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 2 +- test/cases/020_kernel/016_kmod_4.14.x/test.yml | 2 +- test/cases/020_kernel/018_kmod_4.16.x/test.yml | 2 +- test/cases/020_kernel/019_kmod_4.17.x/test.yml | 2 +- test/cases/020_kernel/110_namespace/common.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 4 ++-- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 6 +++--- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- .../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 +- .../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 +- .../040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 4 ++-- 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/023_wireguard/test.yml | 4 ++-- test/hack/test-ltp.yml | 4 ++-- test/hack/test.yml | 4 ++-- test/pkg/ns/template.yml | 2 +- 87 files changed, 129 insertions(+), 129 deletions(-) diff --git a/contrib/crosvm/README.md b/contrib/crosvm/README.md index b9df46c4b..7cd431fa7 100644 --- a/contrib/crosvm/README.md +++ b/contrib/crosvm/README.md @@ -33,9 +33,9 @@ kernel: image: linuxkit/kernel:4.9.91 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b services: - name: getty image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 diff --git a/examples/aws.yml b/examples/aws.yml index 06dffab85..9206e7ab1 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index 8183caa58..c01fe710d 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index b6674e863..6a93c324b 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 591784191..c3d7a1826 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.4 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: # support metadata for optional config in /run/config diff --git a/examples/docker.yml b/examples/docker.yml index 0f38b6dbe..e15f61213 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index ada8a5f17..fb7999105 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index d4cb86a92..cde5a52e0 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 795ec9b87..1afc98b0c 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index b56d1c371..e317902d8 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: dhcpcd diff --git a/examples/minimal.yml b/examples/minimal.yml index 4c9c159e8..d8b064338 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.4 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index be48a456d..01faae369 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b services: - name: getty image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 diff --git a/examples/openstack.yml b/examples/openstack.yml index 27c6d3820..5871dfc60 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/packet.yml b/examples/packet.yml index 9b04d3aa0..9932b90f0 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,9 +3,9 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 - linuxkit/firmware:v0.4 onboot: diff --git a/examples/redis-os.yml b/examples/redis-os.yml index f4c8e4c29..fba74b821 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.4 diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index cf762fba1..be19e59db 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.40-rt cmdline: "console=tty0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/scaleway.yml b/examples/scaleway.yml index b12d9c502..534d0f2c1 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/sshd.yml b/examples/sshd.yml index cc96737bc..616219c22 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index cc9cb5fbe..27cea198d 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index 93baa17ea..3fd8be4f8 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:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index 5baf1293e..63d8885eb 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index a27b20e45..524173465 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.4 diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index e389c2273..fa9aaeba8 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.4 diff --git a/examples/vultr.yml b/examples/vultr.yml index ada8a5f17..fb7999105 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/examples/wireguard.yml b/examples/wireguard.yml index ad552b02d..cf4477d5a 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 37c8be5a5..dc6fe9991 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 4d73310ad..bfc93ca94 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:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index e4a45d99f..cba46f5bb 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index e8d6e13c7..36e27b82c 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index fc09fde52..688c9d6ca 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:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 971f9db1f..a9ac154a9 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:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index de26b865f..5827bb3f6 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 5c32bddc3..7bf09c0ab 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:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.4 diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index d78f200f2..4e7455b92 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:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index ce2e776ef..465901777 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b onboot: - name: sysctl image: linuxkit/sysctl:v0.4 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 8514dce72..fae946935 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:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 1fbd90f8f..1a8f03a0e 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:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index e93cbdd12..baf4c75e8 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 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 cdb29469a..906819977 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff 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 cdb29469a..906819977 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff 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 b050fddf6..44f25fcb2 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff 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 b6c3ac757..e1c904548 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff 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 b6c3ac757..e1c904548 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff 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 b6c3ac757..e1c904548 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff 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 b6c3ac757..e1c904548 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff 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 4f4d23bc7..682f16712 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff 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 b6c3ac757..e1c904548 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff 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 b6c3ac757..e1c904548 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff 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 b5dded54e..f06d8490c 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.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b services: - name: acpid image: linuxkit/acpid:v0.4 diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index 27fd946e7..ab84e44b6 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.136 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: check-kernel-config 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 26eaf896d..c5b5bab4b 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.107 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index d00cc575e..84e79b734 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/008_config_4.16.x/test.yml b/test/cases/020_kernel/008_config_4.16.x/test.yml index ccccfee22..09038b347 100644 --- a/test/cases/020_kernel/008_config_4.16.x/test.yml +++ b/test/cases/020_kernel/008_config_4.16.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.16.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/009_config_4.17.x/test.yml b/test/cases/020_kernel/009_config_4.17.x/test.yml index 782bfd627..8489c00b3 100644 --- a/test/cases/020_kernel/009_config_4.17.x/test.yml +++ b/test/cases/020_kernel/009_config_4.17.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.17.1 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml index 4d84827a5..b9eae8e9d 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.136 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: check 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 28fc9f659..d6d9f0ebe 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.107 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml index 127a9695d..d11922aa1 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/018_kmod_4.16.x/test.yml b/test/cases/020_kernel/018_kmod_4.16.x/test.yml index d99f6b570..1616ee4b5 100644 --- a/test/cases/020_kernel/018_kmod_4.16.x/test.yml +++ b/test/cases/020_kernel/018_kmod_4.16.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.16.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/019_kmod_4.17.x/test.yml b/test/cases/020_kernel/019_kmod_4.17.x/test.yml index 613836d1e..21d37db41 100644 --- a/test/cases/020_kernel/019_kmod_4.17.x/test.yml +++ b/test/cases/020_kernel/019_kmod_4.17.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.17.1 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/110_namespace/common.yml b/test/cases/020_kernel/110_namespace/common.yml index 743ed7ecd..75907779c 100644 --- a/test/cases/020_kernel/110_namespace/common.yml +++ b/test/cases/020_kernel/110_namespace/common.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 trust: org: diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index d598e634a..5a6a30ad8 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.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 3527b3dbe..3561f0ff3 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 951f47def..320609bd9 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: binfmt diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 33039935d..299e0be2b 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - linuxkit/ca-certificates:v0.4 onboot: diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 18c4e4a85..5526bf0a9 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.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: dhcpcd @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:v0.4 command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:b3c8567fdcdca2ab76a34c14fa6830ef480b463a + image: linuxkit/test-containerd:aef7af6178c04ba11e178e2d5c4b83c24ff7e848 - name: poweroff image: linuxkit/poweroff:d75d94d9603bde9ab95b914deed0d069d05d8b20 trust: diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index d7ad2ae4c..e7167cefa 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: dhcpcd 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 37ea4539e..3bbbe5174 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: format 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 be516afa1..6fa3b9081 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: extend 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 4fa2ac3e8..9919c6fb4 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: modprobe 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 53e344870..106640169 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: modprobe 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 56dec49ec..f09594f31 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: format 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 dfcb3ad07..e07a256db 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: extend 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 b2adc0576..3cae15df2 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: format 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 27febe9ea..72f4225ff 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: format 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 3d0a0ca52..d07926961 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: format 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 675bb7d07..4ac9bd425 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: modprobe 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 8f91fa636..e52780ef6 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: format 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 46546ad9f..310e574d0 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.51 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: format 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 70762d7b3..6d27fb5fb 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,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: format diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 8170b9012..af9061026 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.9.x cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 036ae1f7a..f3e6152ef 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index f38a93d0d..1ed13a26a 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 7e681bea5..e017ec918 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index eeee18253..8051bf6b8 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.14.49 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b - linuxkit/ca-certificates:v0.4 onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 2650cba4f..835ec5aa9 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index 722a4bab0..ddf972393 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.14.49 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 - - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f + - linuxkit/containerd:f2bc1bda1ab18146967fa1a149800aaf14bee81b onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.4 diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index bc3ea9eb8..3a9701f2e 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0" init: - - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e + - linuxkit/init:923355a5ed75f40ee394741829d42bf4b78cce46 - linuxkit/runc:v0.4 onboot: - name: test-ns