From e862410a07fa01faa029ff8d3f2f6e6d6253f8b2 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 12 Jan 2018 10:36:25 +0000 Subject: [PATCH 1/4] alpine: Bump to containerd v1.0.1-rc.0 Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 2 +- tools/alpine/versions.aarch64 | 22 +++++++++++----------- tools/alpine/versions.x86_64 | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 830062555..e5a8ccd0e 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -43,7 +43,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.0.0 +ENV CONTAINERD_COMMIT=v1.0.1-rc.0 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 81b5e869b..ec81b02e0 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,10 +1,10 @@ -# linuxkit/alpine:9d29dc154440859d729ba864ffd67bb4c90e630d-arm64 +# linuxkit/alpine:7dedd0ef748530ece641d931b6f77aa2992d90e5-arm64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 alpine-keys-2.1-r1 alsa-lib-1.1.4.1-r2 -apk-tools-2.8.1-r2 +apk-tools-2.8.2-r0 argp-standalone-1.3-r2 attr-2.4.47-r6 attr-dev-2.4.47-r6 @@ -115,7 +115,7 @@ libcap-2.25-r1 libcap-ng-0.7.8-r1 libcap-ng-dev-0.7.8-r1 libcom_err-1.43.7-r0 -libcrypto1.0-1.0.2m-r0 +libcrypto1.0-1.0.2n-r0 libcurl-7.57.0-r0 libdrm-2.4.88-r0 libedit-20170329.3.1-r3 @@ -160,7 +160,7 @@ libseccomp-2.3.2-r0 libseccomp-dev-2.3.2-r0 libsmartcols-2.31-r0 libssh2-1.8.0-r2 -libssl1.0-1.0.2m-r0 +libssl1.0-1.0.2n-r0 libstdc++-6.4.0-r5 libtasn1-4.12-r2 libtirpc-1.0.1-r2 @@ -204,11 +204,11 @@ open-iscsi-2.0.874-r0 open-isns-lib-0.97-r2 openntpd-6.2_p3-r0 openrc-0.24.1-r4 -openssh-keygen-7.5_p1-r7 -openssh-server-7.5_p1-r7 -openssh-server-common-7.5_p1-r7 -openssl-1.0.2m-r0 -openssl-dev-1.0.2m-r0 +openssh-keygen-7.5_p1-r8 +openssh-server-7.5_p1-r8 +openssh-server-common-7.5_p1-r8 +openssl-1.0.2n-r0 +openssl-dev-1.0.2n-r0 opus-1.2.1-r1 p11-kit-0.23.2-r2 patch-2.7.5-r1 @@ -234,7 +234,7 @@ qemu-system-x86_64-2.10.1-r2 readline-7.0.003-r0 rhash-libs-1.3.5-r1 rpcbind-0.2.4-r0 -rsync-3.1.2-r6 +rsync-3.1.2-r7 scanelf-1.2.2-r1 sed-4.4-r1 sfdisk-2.31-r0 @@ -266,7 +266,7 @@ 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.20171211-r0 +wireguard-tools-0.0.20171221-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 xfsprogs-4.14.0-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 7f037ed54..465a587a1 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,10 +1,10 @@ -# linuxkit/alpine:4584958639b2378246371fe219f33b270667e22e-amd64 +# linuxkit/alpine:99dec12a5e8524b7a262c6bdfcea733191354883-amd64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 alpine-keys-2.1-r1 alsa-lib-1.1.4.1-r2 -apk-tools-2.8.1-r2 +apk-tools-2.8.2-r0 argp-standalone-1.3-r2 attr-2.4.47-r6 attr-dev-2.4.47-r6 @@ -211,9 +211,9 @@ open-isns-lib-0.97-r2 open-vm-tools-10.1.15-r0 openntpd-6.2_p3-r0 openrc-0.24.1-r4 -openssh-keygen-7.5_p1-r7 -openssh-server-7.5_p1-r7 -openssh-server-common-7.5_p1-r7 +openssh-keygen-7.5_p1-r8 +openssh-server-7.5_p1-r8 +openssh-server-common-7.5_p1-r8 openssl-1.0.2n-r0 openssl-dev-1.0.2n-r0 opus-1.2.1-r1 @@ -241,7 +241,7 @@ qemu-system-x86_64-2.10.1-r2 readline-7.0.003-r0 rhash-libs-1.3.5-r1 rpcbind-0.2.4-r0 -rsync-3.1.2-r6 +rsync-3.1.2-r7 scanelf-1.2.2-r1 sed-4.4-r1 sfdisk-2.31-r0 @@ -274,7 +274,7 @@ 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.20171211-r0 +wireguard-tools-0.0.20171221-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 xfsprogs-4.14.0-r0 From 913e6420bae0d6be2b4725548ac5a9616365a84a Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 12 Jan 2018 10:51:01 +0000 Subject: [PATCH 2/4] Bump packages to new alpine w/ containerd v1.0.1-rc.0 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 0917fe30e..0f754d54e 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 as alpine +FROM linuxkit/alpine:99dec12a5e8524b7a262c6bdfcea733191354883 as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 98b9f0e76..b0af37620 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build +FROM linuxkit/alpine:99dec12a5e8524b7a262c6bdfcea733191354883 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:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS mirror +FROM linuxkit/alpine:99dec12a5e8524b7a262c6bdfcea733191354883 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 d94e31127..5401a66c0 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS mirror +FROM linuxkit/alpine:99dec12a5e8524b7a262c6bdfcea733191354883 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 e0b871560a3076042449ba9f6f7ff6a6f04fd709 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 12 Jan 2018 10:51:34 +0000 Subject: [PATCH 3/4] Bump to runc 7f24b40cc5423 as used by containerd v1.0.1-rc.0 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 8b5cf2f22..fa6446d1f 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=74a17296470088de3805e138d3d87c62e613dfc4 +ENV RUNC_COMMIT=7f24b40cc5423969b4554ef04ba0b00e2b4ba010 RUN mkdir -p $GOPATH/src/github.com/opencontainers && \ cd $GOPATH/src/github.com/opencontainers && \ git clone https://github.com/opencontainers/runc.git From db5c8a7da8122325ef0eee7f29097951b74e798f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 12 Jan 2018 10:58:07 +0000 Subject: [PATCH 4/4] Bump yml to pickup containerd v1.0.1-rc.0 Signed-off-by: Ian Campbell --- blueprints/docker-for-mac/base.yml | 6 +++--- examples/aws.yml | 6 +++--- examples/azure.yml | 6 +++--- examples/cadvisor.yml | 6 +++--- examples/docker.yml | 6 +++--- examples/gcp.yml | 6 +++--- examples/getty.yml | 6 +++--- examples/hostmount-writeable-overlay.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/sshd.yml | 6 +++--- examples/swap.yml | 6 +++--- examples/tpm.yml | 6 +++--- examples/vmware.yml | 6 +++--- examples/vpnkit-forwarder.yml | 6 +++--- examples/vsudd.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/logging/examples/logging.yml | 6 +++--- 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 +++--- test/cases/000_build/000_formats/test.yml | 4 ++-- test/cases/010_platforms/000_qemu/000_run_kernel/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_platforms/010_hyperkit/000_run_kernel/test.yml | 4 ++-- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 6 +++--- test/cases/020_kernel/000_config_4.4.x/test.yml | 4 ++-- test/cases/020_kernel/001_config_4.9.x/test.yml | 4 ++-- test/cases/020_kernel/006_config_4.14.x/test.yml | 4 ++-- test/cases/020_kernel/010_kmod_4.4.x/test.yml | 4 ++-- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 4 ++-- test/cases/020_kernel/016_kmod_4.14.x/test.yml | 4 ++-- .../020_kernel/110_namespace/000_kernel-4.4.x/common.yml | 4 ++-- .../020_kernel/110_namespace/001_kernel-4.9.x/common.yml | 4 ++-- .../020_kernel/110_namespace/006_kernel-4.14.x/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/hack/test-ltp.yml | 6 +++--- test/hack/test.yml | 6 +++--- test/pkg/ns/template.yml | 4 ++-- 79 files changed, 195 insertions(+), 195 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 7b9ff8528..f647ee902 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -4,9 +4,9 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:728e5fe9e6b818d9825b28826b929ae75a386e9e # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: # support metadata for optional config in /var/config diff --git a/examples/aws.yml b/examples/aws.yml index ff81ad4b4..a74ea779a 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index d9be3e92e..267bc6630 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index c026c2641..a93622a49 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/docker.yml b/examples/docker.yml index 9f2b3d7ae..0aa5160a4 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 016993483..b2662ca52 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index c30484e49..9ec09abda 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index b26135853..8ef74c2ca 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index fc224e49e..31ef1caae 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 onboot: - name: dhcpcd image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 11417365b..d3d7b0c48 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 services: - name: getty image: linuxkit/getty:22e27189b6b354e1d5d38fc0536a5af3f2adb79f diff --git a/examples/openstack.yml b/examples/openstack.yml index 0e3186881..db3f132c8 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/packet.yml b/examples/packet.yml index 3d6bb8128..5b3fb3fb3 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS1 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: rngd1 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 6e88f9f52..09c33edf7 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 onboot: - name: dhcpcd image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 diff --git a/examples/sshd.yml b/examples/sshd.yml index 91280ccc1..aff4e49b1 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index 4a7625641..e30a877e7 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index f00f79cfe..6b7a50d9b 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:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index abcd4cd7f..f3048ca17 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 238334371..8f3146e2d 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 onboot: - name: dhcpcd image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 8afdf95bb..1cd855d63 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 onboot: - name: dhcpcd image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 diff --git a/examples/vultr.yml b/examples/vultr.yml index 016993483..b2662ca52 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 9c1186ba1..8c0d3374c 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index bb5829ec3..0aee2558c 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index e00cdbe89..667717b65 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:81fc00e879cf56fa6f058f6c891b012bc867de7f + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 45df23109..66b7a5f63 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index c5a9603c8..4662e6ff1 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 5d057004d..e2fff7aa7 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:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index ed142c244..7e015f8b6 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:81fc00e879cf56fa6f058f6c891b012bc867de7f + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 - 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 b07d090d8..6798d2c99 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f # with runc, logwrite, startmemlogd - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 # with runc, logwrite, startmemlogd + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 3bf8dd4b4..2e3276fd8 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 page_poison=1" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 onboot: - name: dhcpcd image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 7cc41e64c..577501fe2 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:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 9a46017b7..33d24bf9b 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 onboot: - name: sysctl image: linuxkit/sysctl:4c1ef93bb5eb1a877318db4b2daa6768ed002e21 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 1aaf8e4aa..4919b436f 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:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 6cb8eb4fa..b0ab8ab7b 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:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 61229a80f..3e3b936b7 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.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: dhcpcd image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 3ca0ce897..2477bb4b5 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: poweroff image: linuxkit/poweroff:bccfe1cb04fc7bb9f03613d2314f38abd2620f29 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 444916cf4..6d1e70b15 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.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: poweroff image: linuxkit/poweroff:bccfe1cb04fc7bb9f03613d2314f38abd2620f29 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 44d7fb151..e1d5e92c7 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.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: poweroff image: linuxkit/poweroff:bccfe1cb04fc7bb9f03613d2314f38abd2620f29 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 44d7fb151..e1d5e92c7 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.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: poweroff image: linuxkit/poweroff:bccfe1cb04fc7bb9f03613d2314f38abd2620f29 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 44d7fb151..e1d5e92c7 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.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: poweroff image: linuxkit/poweroff:bccfe1cb04fc7bb9f03613d2314f38abd2620f29 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 44d7fb151..e1d5e92c7 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.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: poweroff image: linuxkit/poweroff:bccfe1cb04fc7bb9f03613d2314f38abd2620f29 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 aa1d7f09f..92cdde797 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.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: poweroff image: linuxkit/poweroff:bccfe1cb04fc7bb9f03613d2314f38abd2620f29 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index 44d7fb151..e1d5e92c7 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: poweroff image: linuxkit/poweroff:bccfe1cb04fc7bb9f03613d2314f38abd2620f29 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 78017cc52..51316f314 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.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 services: - name: acpid image: linuxkit/acpid:fa37afe931844fb834e1906ec244d13b031741b9 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 127c55e32..a79ff25c5 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:9c3668b834540d2e776d0bf4aff661b3bcc35616 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 0d216f82b..e9397fd83 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:9c3668b834540d2e776d0bf4aff661b3bcc35616 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 ba62196b4..400e0c931 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:9c3668b834540d2e776d0bf4aff661b3bcc35616 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 2aec64cab..ca5b0d7f5 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index e78d96602..ecfa8ef64 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml index b01c6eed4..e751fa259 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml index fa5f3e51b..a3c1a0dba 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff trust: org: - linuxkit diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml index 8d84cc754..47c100d23 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff trust: org: - linuxkit diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml index f740bcb5d..bd2c6efb2 100644 --- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml +++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 1946a45ab..2f82c1ada 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.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index cd6c2d21d..8a48455c8 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index ce0e3d4e3..b6b1e295b 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: binfmt image: linuxkit/binfmt:4b1d7a8dab03c09855fb4b6060a42b2294674b47 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index ea22472fd..b52590dbf 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 214ccc772..85b4cae8e 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: dhcpcd @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:59bd2ba406162087169e2dd0bbce0ab73bc31da1 + image: linuxkit/test-containerd:bbec657082ed2126ccb7f0e8d2a2c5c30eefd3dc - name: poweroff image: linuxkit/poweroff:bccfe1cb04fc7bb9f03613d2314f38abd2620f29 trust: diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 13f4437ef..9683369b7 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: dhcpcd image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 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 83decfd3f..c70a68052 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: format image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab 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 144be99a2..2a62bdfb2 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: extend image: linuxkit/extend:e550c16d8464cabeffdff80f27e6fa8278f06dbb 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 528c1fdef..0f0943062 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: modprobe image: linuxkit/modprobe:1a192d168adadec47afa860e3fc874fbc2a823ff 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 e51e8a70e..087c2aca3 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: modprobe image: linuxkit/modprobe:1a192d168adadec47afa860e3fc874fbc2a823ff 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 305dd2827..b410643a7 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: format image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab 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 6fffc0583..906cad789 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: extend image: linuxkit/extend:e550c16d8464cabeffdff80f27e6fa8278f06dbb 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 b7518c550..b2fc10895 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: format image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab 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 6143c84a1..dea19f23d 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: format image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab 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 3f31557f2..d6bcdd02a 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.9.38 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: format image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab 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 d63d778e0..401bc5465 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: modprobe image: linuxkit/modprobe:1a192d168adadec47afa860e3fc874fbc2a823ff 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 b8bea3df5..f7d27ea0c 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: format image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab 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 d6366bbb7..676ee0ea3 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.9.51 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: format image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab 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 77bcbef7b..36c57ea9a 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: format image: linuxkit/format:5a1140cb65e733f26de727fa684fef1326e9d5ab diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 8d6cff3a0..68d73b5e6 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:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 7493dbac5..9125d3a14 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: mkimage image: linuxkit/mkimage:e439d6108466186948ca7ea2a293fc6c1d1183fa diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index dd12180db..212e62508 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: poweroff image: linuxkit/poweroff:bccfe1cb04fc7bb9f03613d2314f38abd2620f29 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 3fc5c8c21..0c6bd49c2 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: sysctl image: linuxkit/sysctl:4c1ef93bb5eb1a877318db4b2daa6768ed002e21 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 95f32f752..8a0c4b672 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.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 93aca6d11..61402b52f 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index 91a57ea64..adcd1af86 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff + - linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95 onboot: - name: dhcpcd image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 088b031b9..975f8c153 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0" init: - - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/init:7c405a03c8467b3aa7999d2a729aeb5d3fa7dae5 + - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: test-ns image: linuxkit/test-ns: