From ea8ecd146d1426e81b28d1bc83a0679da1a117c0 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 10 May 2020 14:52:05 +0100 Subject: [PATCH 1/4] pkgs: Update packages to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- pkg/acpid/Dockerfile | 4 ++-- pkg/auditd/Dockerfile | 2 +- pkg/binfmt/Dockerfile | 2 +- pkg/bpftrace/Dockerfile | 2 +- pkg/ca-certificates/Dockerfile | 2 +- pkg/cadvisor/Dockerfile | 4 ++-- pkg/dhcpcd/Dockerfile | 2 +- pkg/dm-crypt/Dockerfile | 2 +- pkg/extend/Dockerfile | 4 ++-- pkg/firmware-all/Dockerfile | 2 +- pkg/firmware/Dockerfile | 2 +- pkg/format/Dockerfile | 4 ++-- pkg/getty/Dockerfile | 2 +- pkg/host-timesync-daemon/Dockerfile | 2 +- pkg/ip/Dockerfile | 2 +- pkg/kmsg/Dockerfile | 2 +- pkg/logwrite/Dockerfile | 2 +- pkg/losetup/Dockerfile | 2 +- pkg/memlogd/Dockerfile | 2 +- pkg/metadata/Dockerfile | 2 +- pkg/mkimage/Dockerfile | 2 +- pkg/modprobe/Dockerfile | 2 +- pkg/mount/Dockerfile | 4 ++-- pkg/node_exporter/Dockerfile | 2 +- pkg/open-vm-tools/Dockerfile | 2 +- pkg/openntpd/Dockerfile | 2 +- pkg/qemu-ga/Dockerfile | 2 +- pkg/rngd/Dockerfile | 2 +- pkg/runc/Dockerfile | 2 +- pkg/sshd/Dockerfile | 2 +- pkg/swap/Dockerfile | 2 +- pkg/sysctl/Dockerfile | 2 +- pkg/sysfs/Dockerfile | 2 +- pkg/trim-after-delete/Dockerfile | 2 +- pkg/tss/Dockerfile | 2 +- pkg/vpnkit-expose-port/Dockerfile | 2 +- pkg/vpnkit-forwarder/Dockerfile | 2 +- pkg/vsudd/Dockerfile | 2 +- 38 files changed, 43 insertions(+), 43 deletions(-) diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile index 50627242f..0108c2d35 100644 --- a/pkg/acpid/Dockerfile +++ b/pkg/acpid/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -6,7 +6,7 @@ RUN apk add --no-cache --initdb -p /out \ busybox RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror2 +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror2 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ busybox-initscripts diff --git a/pkg/auditd/Dockerfile b/pkg/auditd/Dockerfile index 88772dbc3..76b36192a 100644 --- a/pkg/auditd/Dockerfile +++ b/pkg/auditd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --initdb -p /out alpine-baselayout apk-tools audit busybox tini diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 3a4fc7826..c60b90067 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y qemu-user-static && \ mv /usr/bin/qemu-riscv64-static /usr/bin/qemu-riscv64 && \ rm /usr/bin/qemu-*-static -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/bpftrace/Dockerfile b/pkg/bpftrace/Dockerfile index e2e25bf88..23aef7b5d 100644 --- a/pkg/bpftrace/Dockerfile +++ b/pkg/bpftrace/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add --update \ bison \ build-base \ diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile index 9a0af4406..06440991a 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as alpine +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as alpine RUN apk add ca-certificates diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index 805e0b505..8c2724541 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as build RUN apk add --no-cache bash go git musl-dev linux-headers make # Hack to work around an issue with go on arm64 requiring gcc @@ -18,7 +18,7 @@ RUN go get -d ${GITREPO} \ && mv cadvisor /usr/bin/ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index 8bbd897a9..3f2e835b9 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/dm-crypt/Dockerfile b/pkg/dm-crypt/Dockerfile index 60a12fdf1..55ab6ed28 100644 --- a/pkg/dm-crypt/Dockerfile +++ b/pkg/dm-crypt/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/extend/Dockerfile b/pkg/extend/Dockerfile index 6c33cdfe6..a09401a0a 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/firmware-all/Dockerfile b/pkg/firmware-all/Dockerfile index dd60092a7..d16f6438e 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add --no-cache git # Make sure you also update the FW_COMMIT in ../firmware/Dockerfile diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index c22732ad6..6517c532e 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -1,7 +1,7 @@ # Make modules from a recentish kernel available FROM linuxkit/kernel:5.4.28 AS kernel -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add --no-cache git kmod # Clone the firmware repository diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 002f8d2d5..70feace10 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index 6a3f7773e..8c92aa46e 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/host-timesync-daemon/Dockerfile b/pkg/host-timesync-daemon/Dockerfile index e7c05ce49..87e2c7cba 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN apk add --no-cache go musl-dev git ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile index 072265618..7ac600366 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add curl RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/kmsg/Dockerfile b/pkg/kmsg/Dockerfile index cf3363c41..520081591 100644 --- a/pkg/kmsg/Dockerfile +++ b/pkg/kmsg/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN apk add --no-cache go musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/logwrite/Dockerfile b/pkg/logwrite/Dockerfile index 60c0444f4..dd542db28 100644 --- a/pkg/logwrite/Dockerfile +++ b/pkg/logwrite/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/losetup/Dockerfile b/pkg/losetup/Dockerfile index 3af6de8e0..b9ca5dbf0 100644 --- a/pkg/losetup/Dockerfile +++ b/pkg/losetup/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/memlogd/Dockerfile b/pkg/memlogd/Dockerfile index 5d89937c6..b544aaa8e 100644 --- a/pkg/memlogd/Dockerfile +++ b/pkg/memlogd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/metadata/Dockerfile b/pkg/metadata/Dockerfile index 88c2f0f6f..89a488174 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN apk add --no-cache go musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/mkimage/Dockerfile b/pkg/mkimage/Dockerfile index d893a9963..1557c4656 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/modprobe/Dockerfile b/pkg/modprobe/Dockerfile index e95692dc6..bd5a041f1 100644 --- a/pkg/modprobe/Dockerfile +++ b/pkg/modprobe/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile index 1c0c8dec6..3444c3459 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -9,7 +9,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/node_exporter/Dockerfile b/pkg/node_exporter/Dockerfile index b070fadf9..469707a56 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as build RUN apk add --no-cache go git musl-dev make curl gcc diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index 72426b31b..a7b483341 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile index 60c0baac6..44dc2838f 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/qemu-ga/Dockerfile b/pkg/qemu-ga/Dockerfile index 4415780a0..89f399307 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/var/run RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index 16d9b6487..374f00063 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN apk add --no-cache go gcc musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index a584d5e44..dbc5be3bc 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as alpine +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index 33e745d7d..07dc25878 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/swap/Dockerfile b/pkg/swap/Dockerfile index e76f7e381..c6ead36bd 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/sysctl/Dockerfile b/pkg/sysctl/Dockerfile index fbab2fd21..26a9b06f3 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile index 302488030..1da25ec6d 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/trim-after-delete/Dockerfile b/pkg/trim-after-delete/Dockerfile index 2f00e25b9..c4945e029 100644 --- a/pkg/trim-after-delete/Dockerfile +++ b/pkg/trim-after-delete/Dockerfile @@ -1,5 +1,5 @@ # We need the `fstrim` binary: -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/tss/Dockerfile b/pkg/tss/Dockerfile index eb3fe8081..1dc9da495 100644 --- a/pkg/tss/Dockerfile +++ b/pkg/tss/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build ENV TROUSERS_COMMIT de57f069ef2297d6a6b3a0353e217a5a2f66e444 ENV TPM_TOOLS_COMMIT bdf9f1bc8f63cd6fc370c2deb58d03ac55079e84 diff --git a/pkg/vpnkit-expose-port/Dockerfile b/pkg/vpnkit-expose-port/Dockerfile index 4af40f59c..e7a784073 100644 --- a/pkg/vpnkit-expose-port/Dockerfile +++ b/pkg/vpnkit-expose-port/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vpnkit-forwarder/Dockerfile b/pkg/vpnkit-forwarder/Dockerfile index 30ebdae87..cfe436465 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vsudd/Dockerfile b/pkg/vsudd/Dockerfile index 1e5bddfd3..213e9ef61 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin From 0331aacfe260044af71b19b2df7efcb24df1784e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 10 May 2020 16:04:07 +0100 Subject: [PATCH 2/4] Update package tags to v0.8 Signed-off-by: Rolf Neugebauer --- contrib/open-vm-tools/open-vm-tools-ds.yaml | 2 +- examples/aws.yml | 18 ++++----- examples/azure.yml | 16 ++++---- examples/cadvisor.yml | 26 ++++++------ examples/dm-crypt-loop.yml | 26 ++++++------ examples/dm-crypt.yml | 22 +++++----- examples/docker-for-mac.yml | 40 +++++++++---------- examples/docker.yml | 24 +++++------ examples/gcp.yml | 20 +++++----- examples/getty.yml | 16 ++++---- examples/hetzner.yml | 24 +++++------ examples/hostmount-writeable-overlay.yml | 16 ++++---- examples/influxdb-os.yml | 12 +++--- examples/logging.yml | 20 +++++----- examples/minimal.yml | 10 ++--- examples/node_exporter.yml | 14 +++---- examples/openstack.yml | 18 ++++----- examples/packet.arm64.yml | 2 +- examples/packet.yml | 24 +++++------ examples/redis-os.yml | 10 ++--- examples/rt-for-vmware.yml | 18 ++++----- examples/scaleway.yml | 20 +++++----- examples/sshd.yml | 20 +++++----- examples/static-ip.yml | 10 ++--- examples/swap.yml | 22 +++++----- examples/tpm.yml | 18 ++++----- examples/vmware.yml | 16 ++++---- examples/vpnkit-forwarder.yml | 12 +++--- examples/vsudd-containerd.yml | 10 ++--- examples/vultr.yml | 20 +++++----- examples/wireguard.yml | 20 +++++----- linuxkit.yml | 16 ++++---- .../clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 24 +++++------ projects/compose/compose-static.yml | 24 +++++------ projects/ima-namespace/ima-namespace.yml | 14 +++---- projects/landlock/landlock.yml | 2 +- projects/memorizer/memorizer.yml | 10 ++--- projects/miragesdk/examples/fdd.yml | 16 ++++---- projects/miragesdk/examples/mirage-dhcp.yml | 12 +++--- projects/okernel/examples/okernel_simple.yaml | 14 +++---- projects/shiftfs/shiftfs.yml | 16 ++++---- src/cmd/linuxkit/moby/linuxkit.go | 6 +-- test/cases/000_build/000_formats/test.yml | 6 +-- .../cases/000_build/010_reproducible/test.yml | 10 ++--- .../000_qemu/000_run_kernel+initrd/test.yml | 4 +- .../000_qemu/005_run_kernel+squashfs/test.yml | 4 +- .../000_qemu/010_run_iso/test.yml | 4 +- .../000_qemu/020_run_efi/test.yml | 4 +- .../000_qemu/030_run_qcow_bios/test.yml | 4 +- .../000_qemu/040_run_raw_bios/test.yml | 4 +- .../000_qemu/050_run_aws/test.yml | 4 +- .../000_qemu/100_container/test.yml | 4 +- .../000_run_kernel+initrd/test.yml | 4 +- .../005_run_kernel+squashfs/test.yml | 4 +- .../010_hyperkit/010_acpi/test.yml | 8 ++-- .../010_platforms/110_gcp/000_run/test.yml | 4 +- .../020_kernel/002_config_4.14.x/test.yml | 4 +- .../020_kernel/005_config_4.19.x/test.yml | 4 +- .../020_kernel/011_config_5.4.x/test.yml | 4 +- .../020_kernel/012_config_5.6.x/test.yml | 4 +- .../cases/020_kernel/102_kmod_4.14.x/test.yml | 4 +- .../cases/020_kernel/105_kmod_4.19.x/test.yml | 4 +- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 4 +- test/cases/020_kernel/112_kmod_5.6.x/test.yml | 4 +- .../cases/020_kernel/200_namespace/common.yml | 4 +- .../030_security/000_docker-bench/test.yml | 20 +++++----- test/cases/030_security/010_ports/test.yml | 4 +- test/cases/040_packages/002_binfmt/test.yml | 6 +-- test/cases/040_packages/002_bpftrace/test.yml | 6 +-- .../040_packages/003_ca-certificates/test.yml | 6 +-- .../040_packages/003_containerd/test.yml | 16 ++++---- test/cases/040_packages/004_dhcpcd/test.yml | 6 +-- .../004_dm-crypt/000_simple/test.yml | 6 +-- .../004_dm-crypt/001_luks/test.yml | 6 +-- .../004_dm-crypt/002_key/test.yml | 6 +-- .../005_extend/000_ext4/test-create.yml | 8 ++-- .../040_packages/005_extend/000_ext4/test.yml | 8 ++-- .../005_extend/001_btrfs/test-create.yml | 10 ++--- .../005_extend/001_btrfs/test.yml | 10 ++--- .../005_extend/002_xfs/test-create.yml | 8 ++-- .../040_packages/005_extend/002_xfs/test.yml | 8 ++-- .../005_extend/003_gpt/test-create.yml | 8 ++-- .../040_packages/005_extend/003_gpt/test.yml | 8 ++-- .../006_format_mount/000_auto/test.yml | 8 ++-- .../006_format_mount/001_by_label/test.yml | 8 ++-- .../006_format_mount/002_by_name/test.yml.in | 8 ++-- .../006_format_mount/003_btrfs/test.yml | 10 ++--- .../006_format_mount/004_xfs/test.yml | 8 ++-- .../005_by_device_force/test.yml | 14 +++---- .../006_format_mount/006_gpt/test.yml | 8 ++-- .../006_format_mount/010_multiple/test.yml | 12 +++--- .../007_getty-containerd/test.yml | 12 +++--- .../008_metadata/000_cidata/test.yml | 6 +-- test/cases/040_packages/012_losetup/test.yml | 6 +-- .../040_packages/013_mkimage/mkimage.yml | 6 +-- test/cases/040_packages/013_mkimage/run.yml | 4 +- test/cases/040_packages/019_sysctl/test.yml | 6 +-- .../cases/040_packages/023_wireguard/test.yml | 14 +++---- test/cases/040_packages/030_logwrite/test.yml | 12 +++--- test/cases/040_packages/031_kmsg/test.yml | 14 +++---- test/cases/040_packages/032_bcc/test.yml | 4 +- test/hack/test-ltp.yml | 6 +-- test/hack/test.yml | 8 ++-- test/pkg/ns/template.yml | 4 +- 105 files changed, 567 insertions(+), 567 deletions(-) diff --git a/contrib/open-vm-tools/open-vm-tools-ds.yaml b/contrib/open-vm-tools/open-vm-tools-ds.yaml index 22b5709c1..20b993a52 100644 --- a/contrib/open-vm-tools/open-vm-tools-ds.yaml +++ b/contrib/open-vm-tools/open-vm-tools-ds.yaml @@ -23,7 +23,7 @@ spec: effect: NoSchedule - key: node-role.kubernetes.io/master containers: - - image: linuxkit/open-vm-tools:3a312fca405bb749f6bd2bda96110fb2154da564 + - image: linuxkit/open-vm-tools:v0.8 name: open-vm-tools resources: requests: diff --git a/examples/aws.yml b/examples/aws.yml index c05ad906c..4f1d23e95 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:dc5bcfa45946053145391ceabe33729c8b9507a1 + image: linuxkit/metadata:v0.8 services: - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: sshd - image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 + image: linuxkit/sshd:v0.8 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index bd2ca6caf..838b938d7 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 services: - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 - name: sshd - image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 + image: linuxkit/sshd:v0.8 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index e63f6cd86..376577b77 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysfs - image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a + image: linuxkit/sysfs:v0.8 - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: ntpd - image: linuxkit/openntpd:9b33f59f6d66c0f5027754a75e52f972e11882c1 + image: linuxkit/openntpd:v0.8 - name: docker image: docker:19.03.8-dind @@ -46,7 +46,7 @@ services: - /etc/docker/daemon.json:/etc/docker/daemon.json command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] - name: cadvisor - image: linuxkit/cadvisor:07bf2e8e6ec05dc0644f1a974df1ce465d028b59 + image: linuxkit/cadvisor:v0.8 files: - path: var/lib/docker directory: true diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 273268869..1f21d069d 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,30 +2,30 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "/dev/sda"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/dev/sda1", "/var/external"] - name: loop - image: linuxkit/losetup:0730b61ac5c8803ba73318c2dd5121dc15cfbf34 + image: linuxkit/losetup:v0.8 command: ["/usr/bin/loopy", "--create", "/var/external/storage_file"] - name: dm-crypt - image: linuxkit/dm-crypt:0ea63bfd97b719d185b69994b4856d97fbc8a2dd + image: linuxkit/dm-crypt:v0.8 command: ["/usr/bin/crypto", "crypt_loop_dev", "/dev/loop0"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/dev/mapper/crypt_loop_dev", "/var/secure_storage"] - name: bbox image: busybox @@ -34,11 +34,11 @@ onboot: - /var:/var services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 files: - path: etc/dm-crypt/key # the below key is just to keep the example self-contained diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index ee7e3c271..9e8bb73fc 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "/dev/sda"] - name: dm-crypt - image: linuxkit/dm-crypt:0ea63bfd97b719d185b69994b4856d97fbc8a2dd + image: linuxkit/dm-crypt:v0.8 command: ["/usr/bin/crypto", "crypt_dev", "/dev/sda1"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/dev/mapper/crypt_dev", "/var/secure_storage"] - name: bbox image: busybox @@ -28,11 +28,11 @@ onboot: - /var:/var services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 files: - path: etc/dm-crypt/key # the below key is just to keep the example self-contained diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 7da111ad1..009cd5dac 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -3,30 +3,30 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/vpnkit-expose-port:3fd88b7025065843792484b1ad83ddd5c4b28684 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/vpnkit-expose-port:v0.8 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:dc5bcfa45946053145391ceabe33729c8b9507a1 + image: linuxkit/metadata:v0.8 - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: sysfs - image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a + image: linuxkit/sysfs:v0.8 - name: binfmt - image: linuxkit/binfmt:5d33e7346e79f9c13a73c6952669e47a53b063d4 + image: linuxkit/binfmt:v0.8 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:2cf5c3f08c4b238bb5fe231fd59ce19faee0fbc6 + image: linuxkit/swap:v0.8 command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"] # mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding - name: mount-vpnkit @@ -44,41 +44,41 @@ onboot: - /var:/host_var command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:d5692a8c9d7cfceb7922acb8e356928c920bc280 + image: linuxkit/acpid:v0.8 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:9b33f59f6d66c0f5027754a75e52f972e11882c1 + image: linuxkit/openntpd:v0.8 # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:0366cd7fb47398de85b176f3b0420355cda235fa + image: linuxkit/vsudd:v0.8 binds: - /var/run:/var/run command: ["/vsudd", "-inport", "2376:unix:/var/run/docker.sock"] # vpnkit-forwarder forwards network traffic to/from the host via VSOCK port 62373. # It needs access to the vpnkit 9P coordination share - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:e0964f3c34f92f7e7ff7b13e360d57559c64581c + image: linuxkit/vpnkit-forwarder:v0.8 binds: - /var/vpnkit:/port net: host command: ["/vpnkit-forwarder", "-vsockPort", "62373"] # Monitor for image deletes and invoke a TRIM on the container filesystem - name: trim-after-delete - image: linuxkit/trim-after-delete:f5a83f55b1bc24d61bca4891d997bca33474945d + image: linuxkit/trim-after-delete:v0.8 # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:8625ccdbda099c94b9635acd167e8f0e2f9c6318 + image: linuxkit/host-timesync-daemon:v0.8 # Run dockerd with the vpnkit userland proxy from the vpnkit-forwarder container. # Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit # for vpnkit coordination and /run/config/docker for the configuration file. diff --git a/examples/docker.yml b/examples/docker.yml index 32a8b5c87..0374ae7a3 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,31 +2,31 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: sysfs - image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a + image: linuxkit/sysfs:v0.8 - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 - name: ntpd - image: linuxkit/openntpd:9b33f59f6d66c0f5027754a75e52f972e11882c1 + image: linuxkit/openntpd:v0.8 - name: docker image: docker:19.03.8-dind capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index 1cc3b07c4..b27305be1 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:dc5bcfa45946053145391ceabe33729c8b9507a1 + image: linuxkit/metadata:v0.8 services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: sshd - image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 + image: linuxkit/sshd:v0.8 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 82032d492..967894bbd 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/hetzner.yml b/examples/hetzner.yml index 402f2ea70..b5d69380d 100644 --- a/examples/hetzner.yml +++ b/examples/hetzner.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 - - linuxkit/firmware:2b5688289ec6708e41a20a10aa4b5a05d4b331f6 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 + - linuxkit/firmware:v0.8 onboot: - name: rngd1 - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:dc5bcfa45946053145391ceabe33729c8b9507a1 + image: linuxkit/metadata:v0.8 command: ["/usr/bin/metadata", "hetzner"] services: - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 + image: linuxkit/sshd:v0.8 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 839e00fc0..49fc7dfa6 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true runtime: @@ -30,7 +30,7 @@ services: destination: writeable-host-etc options: ["rw", "lowerdir=/etc", "upperdir=/run/hostetc/upper", "workdir=/run/hostetc/work"] - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 21f732f41..f40fc0305 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: influxdb diff --git a/examples/logging.yml b/examples/logging.yml index dbc1aec1e..395d11ebd 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,21 +3,21 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 - - linuxkit/memlogd:ddfd99754f0cfc63a675f49aa32a8f2c92785551 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 + - linuxkit/memlogd:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Inside the getty type `/proc/1/root/usr/bin/logread -F` to follow the log - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true # A service which generates log messages for testing @@ -25,9 +25,9 @@ services: image: alpine:3.11 command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); sleep 1; done" ] - name: write-and-rotate-logs - image: linuxkit/logwrite:0031a6ee2be4c842ce40246f93e5059048b367aa + image: linuxkit/logwrite:v0.8 - name: kmsg - image: linuxkit/kmsg:ea49dddf9275b10188ba45f57cb7c9c561db4758 + image: linuxkit/kmsg:v0.8 trust: org: - linuxkit diff --git a/examples/minimal.yml b/examples/minimal.yml index 9c7fb1edb..f9fe4a2d9 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index c9372a8fc..403d4d336 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 - name: node_exporter - image: linuxkit/node_exporter:1d5694bb1b148368d53945d22944289a2127d69c + image: linuxkit/node_exporter:v0.8 trust: org: - linuxkit diff --git a/examples/openstack.yml b/examples/openstack.yml index 06d996b4b..823e84b28 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:dc5bcfa45946053145391ceabe33729c8b9507a1 + image: linuxkit/metadata:v0.8 command: ["/usr/bin/metadata", "openstack"] services: - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: sshd - image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 + image: linuxkit/sshd:v0.8 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/packet.arm64.yml b/examples/packet.arm64.yml index dad851549..16750c92b 100644 --- a/examples/packet.arm64.yml +++ b/examples/packet.arm64.yml @@ -10,5 +10,5 @@ kernel: ucode: "" onboot: - name: modprobe - image: linuxkit/modprobe:944769462b9d10b1b1506498d3eb03dcc5416f7f + image: linuxkit/modprobe:v0.8 command: ["modprobe", "nicvf"] diff --git a/examples/packet.yml b/examples/packet.yml index 43ffd2b6b..59942bdd9 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 - - linuxkit/firmware:2b5688289ec6708e41a20a10aa4b5a05d4b331f6 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 + - linuxkit/firmware:v0.8 onboot: - name: rngd1 - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:dc5bcfa45946053145391ceabe33729c8b9507a1 + image: linuxkit/metadata:v0.8 command: ["/usr/bin/metadata", "packet"] services: - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 + image: linuxkit/sshd:v0.8 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index a1691d36c..e3fc64482 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true # Currently redis:4.0.6-alpine has trust issue with multi-arch diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index 4701a7257..ede93d32f 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.4.28-rt cmdline: "console=tty0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 - name: open-vm-tools - image: linuxkit/open-vm-tools:3a312fca405bb749f6bd2bda96110fb2154da564 + image: linuxkit/open-vm-tools:v0.8 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/scaleway.yml b/examples/scaleway.yml index a64d42b38..d10d57e96 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: rngd1 - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 command: ["/sbin/rngd", "-1"] - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:dc5bcfa45946053145391ceabe33729c8b9507a1 + image: linuxkit/metadata:v0.8 services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 trust: org: - linuxkit diff --git a/examples/sshd.yml b/examples/sshd.yml index 124e53eaa..dc55b68e4 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: rngd1 - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 - name: sshd - image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 + image: linuxkit/sshd:v0.8 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 2814b6f9d..222d1916a 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 onboot: - name: ip - image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 + image: linuxkit/ip:v0.8 binds: - /etc/ip:/etc/ip command: ["ip", "-b", "/etc/ip/eth0.conf"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true files: diff --git a/examples/swap.yml b/examples/swap.yml index c221d2848..ca82a4c03 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:2cf5c3f08c4b238bb5fe231fd59ce19faee0fbc6 + image: linuxkit/swap:v0.8 # to use unencrypted swap, use: # command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G"] command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 trust: org: - linuxkit diff --git a/examples/tpm.yml b/examples/tpm.yml index 779c2754e..749036442 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: tss - image: linuxkit/tss:734902b23bc9a7a5e36cce4bd9742a66d37f0a9a + image: linuxkit/tss:v0.8 - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/vmware.yml b/examples/vmware.yml index 23937cd0c..89616d906 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,22 +2,22 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 91fd8b93d..a16027463 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.11 @@ -19,9 +19,9 @@ onboot: command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] services: - name: sshd - image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 + image: linuxkit/sshd:v0.8 - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:e0964f3c34f92f7e7ff7b13e360d57559c64581c + image: linuxkit/vpnkit-forwarder:v0.8 binds: - /var/vpnkit:/port net: host diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index baec4ca9f..1dad8f724 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:0366cd7fb47398de85b176f3b0420355cda235fa + image: linuxkit/vsudd:v0.8 binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/examples/vultr.yml b/examples/vultr.yml index fc079887f..f98156bec 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:dc5bcfa45946053145391ceabe33729c8b9507a1 + image: linuxkit/metadata:v0.8 command: ["/usr/bin/metadata", "vultr"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: sshd - image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 + image: linuxkit/sshd:v0.8 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 9a350917c..3b83c40d4 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 + image: linuxkit/ip:v0.8 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 + image: linuxkit/ip:v0.8 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,12 +40,12 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true net: /run/netns/wg1 - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: nginx image: nginx:1.13.8-alpine net: /run/netns/wg0 diff --git a/linuxkit.yml b/linuxkit.yml index 384c22211..da8315c79 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -18,11 +18,11 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 29966d631..39a9a37b9 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:e93b0bf37b030238d33e04b98e90d087637f3d2c + - linuxkit/init:v0.8 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 2e527522d..e54af320b 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,32 +2,32 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: sysfs - image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a + image: linuxkit/sysfs:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: ntpd - image: linuxkit/openntpd:9b33f59f6d66c0f5027754a75e52f972e11882c1 + image: linuxkit/openntpd:v0.8 - name: docker image: docker:19.03.8-dind capabilities: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 4102583b9..ad6d5330d 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,32 +2,32 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: sysfs - image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a + image: linuxkit/sysfs:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: ntpd - image: linuxkit/openntpd:9b33f59f6d66c0f5027754a75e52f972e11882c1 + image: linuxkit/openntpd:v0.8 - name: docker image: docker:19.03.8-dind capabilities: diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 61a1ae40d..800762086 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 082079b93..84b9ab8a1 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:e93b0bf37b030238d33e04b98e90d087637f3d2c + - linuxkit/init:v0.8 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index e30981bcf..23d0ad269 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,16 +2,16 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 484adaec6..66c00fd1c 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 - samoht/fdd onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 files: - path: etc/init.d/020-fdd-init mode: "0700" diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index d4ef5f9c5..c460dbf68 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcp-client image: miragesdk/dhcp-client:22aa9d527820534295a8cd59901c0c5197af6585 net: host @@ -28,9 +28,9 @@ onboot: - /lib:/lib # for ifconfig services: - name: sshd - image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 + image: linuxkit/sshd:v0.8 - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 519fa133d..9dc694930 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,18 +2,18 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 services: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 3d1d3327a..9cd42b6ce 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,23 +2,23 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index 1f843d4c4..ec66bf210 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -17,11 +17,11 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: mkimage - image: linuxkit/mkimage:cad5659e03d5e6d81c26bb0a9724cc626dee57b4 + image: linuxkit/mkimage:v0.8 - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 trust: diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index d8ad925e3..a2419080f 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: org: diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 01877ab0c..b234a7986 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -3,13 +3,13 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] # Add some random unsorted caps capabilities: @@ -18,7 +18,7 @@ onboot: services: - name: testservice - image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 + image: linuxkit/ip:v0.8 # Some environments env: - BENV=true diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index 0eea3afbe..c2f3e492a 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 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 0eea3afbe..c2f3e492a 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 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 d0fcf832f..9440aef3c 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:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 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 7ee7664a2..affb24193 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:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 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 7ee7664a2..affb24193 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:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 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 7ee7664a2..affb24193 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:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 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 7ee7664a2..affb24193 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:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 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 0fb17876b..2e01432bd 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:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 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 7ee7664a2..affb24193 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 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 7ee7664a2..affb24193 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 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 41faad9ee..f8364d301 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 services: - name: acpid - image: linuxkit/acpid:d5692a8c9d7cfceb7922acb8e356928c920bc280 + image: linuxkit/acpid:v0.8 trust: org: - linuxkit diff --git a/test/cases/010_platforms/110_gcp/000_run/test.yml b/test/cases/010_platforms/110_gcp/000_run/test.yml index 7ee7664a2..affb24193 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 diff --git a/test/cases/020_kernel/002_config_4.14.x/test.yml b/test/cases/020_kernel/002_config_4.14.x/test.yml index f3ac64e47..e4e62c49c 100644 --- a/test/cases/020_kernel/002_config_4.14.x/test.yml +++ b/test/cases/020_kernel/002_config_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.179 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 diff --git a/test/cases/020_kernel/005_config_4.19.x/test.yml b/test/cases/020_kernel/005_config_4.19.x/test.yml index 333db67bd..baf52d24c 100644 --- a/test/cases/020_kernel/005_config_4.19.x/test.yml +++ b/test/cases/020_kernel/005_config_4.19.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.121 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 diff --git a/test/cases/020_kernel/011_config_5.4.x/test.yml b/test/cases/020_kernel/011_config_5.4.x/test.yml index 842245d1d..cd0f8ba79 100644 --- a/test/cases/020_kernel/011_config_5.4.x/test.yml +++ b/test/cases/020_kernel/011_config_5.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 diff --git a/test/cases/020_kernel/012_config_5.6.x/test.yml b/test/cases/020_kernel/012_config_5.6.x/test.yml index 3895beeda..8721ae478 100644 --- a/test/cases/020_kernel/012_config_5.6.x/test.yml +++ b/test/cases/020_kernel/012_config_5.6.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.6.11 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 diff --git a/test/cases/020_kernel/102_kmod_4.14.x/test.yml b/test/cases/020_kernel/102_kmod_4.14.x/test.yml index b4e9f48a4..6cbf4a721 100644 --- a/test/cases/020_kernel/102_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/102_kmod_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.179 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/105_kmod_4.19.x/test.yml b/test/cases/020_kernel/105_kmod_4.19.x/test.yml index 7387c4fb8..63e6aed9a 100644 --- a/test/cases/020_kernel/105_kmod_4.19.x/test.yml +++ b/test/cases/020_kernel/105_kmod_4.19.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.121 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.yml b/test/cases/020_kernel/111_kmod_5.4.x/test.yml index 99307676e..3e5cdfec8 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.yml +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/112_kmod_5.6.x/test.yml b/test/cases/020_kernel/112_kmod_5.6.x/test.yml index ac5e7d19f..57ccd0f70 100644 --- a/test/cases/020_kernel/112_kmod_5.6.x/test.yml +++ b/test/cases/020_kernel/112_kmod_5.6.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.6.11 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index 57e986c8f..331e71f0f 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 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 1c32358fa..f5c71486b 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: sysfs - image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a + image: linuxkit/sysfs:v0.8 - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb + image: linuxkit/rngd:v0.8 - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 - name: docker image: docker:19.03.8-dind capabilities: diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 1514f75b7..d6321cdd4 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:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: test image: alpine:3.11 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 7bf239c9c..53f55a30c 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: binfmt - image: linuxkit/binfmt:5d33e7346e79f9c13a73c6952669e47a53b063d4 + image: linuxkit/binfmt:v0.8 - name: test image: alpine:3.11 binds: diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index d61b878dd..e5ed8a187 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/bpftrace:65c4dc9f6dcb3bbb52f7f13acf067d01f7e6e538 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/bpftrace:v0.8 onboot: - name: bpftrace-test image: alpine:3.11 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 02a116e44..583feeaa3 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: test image: alpine:3.11 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 1ec3b6422..b81921b87 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib"] - name: test image: linuxkit/test-containerd:8e144d8bfc3bb10c1ed91ef65a82ac1997265e75 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index ab0c3050d..52d694b28 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: alpine:3.11 diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index 8cf44ac64..6f1da1310 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:0ea63bfd97b719d185b69994b4856d97fbc8a2dd + image: linuxkit/dm-crypt:v0.8 command: ["/usr/bin/crypto", "it_is_encrypted", "/dev/sda"] - name: test image: alpine:3.11 diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index 972621421..0694c4e23 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:0ea63bfd97b719d185b69994b4856d97fbc8a2dd + image: linuxkit/dm-crypt:v0.8 command: ["/usr/bin/crypto", "-l", "it_is_encrypted", "/dev/sda"] - name: test image: alpine:3.11 diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index da2f577e6..7d73d6039 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:0ea63bfd97b719d185b69994b4856d97fbc8a2dd + image: linuxkit/dm-crypt:v0.8 command: ["/usr/bin/crypto", "-k", "/some/other/enc_key", "it_is_encrypted", "/dev/sda"] binds: - /dev/:/dev diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index e73056437..16e3209c2 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 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 87a16d06e..d6531f0f4 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: extend - image: linuxkit/extend:10bc501a6890be931c6f6602c8caca31337eafeb + image: linuxkit/extend:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 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 04dddf23c..642951e21 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: modprobe - image: linuxkit/modprobe:944769462b9d10b1b1506498d3eb03dcc5416f7f + image: linuxkit/modprobe:v0.8 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 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 febde7157..f1a20cc6c 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: modprobe - image: linuxkit/modprobe:944769462b9d10b1b1506498d3eb03dcc5416f7f + image: linuxkit/modprobe:v0.8 command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:10bc501a6890be931c6f6602c8caca31337eafeb + image: linuxkit/extend:v0.8 command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 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 7d84022d7..8ac2e8fc1 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 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 ea62da728..5d53ef2f9 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: extend - image: linuxkit/extend:10bc501a6890be931c6f6602c8caca31337eafeb + image: linuxkit/extend:v0.8 command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 diff --git a/test/cases/040_packages/005_extend/003_gpt/test-create.yml b/test/cases/040_packages/005_extend/003_gpt/test-create.yml index 7ecadb075..df7f2dc94 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test-create.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test-create.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-partition", "gpt"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 diff --git a/test/cases/040_packages/005_extend/003_gpt/test.yml b/test/cases/040_packages/005_extend/003_gpt/test.yml index 87a16d06e..d6531f0f4 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: extend - image: linuxkit/extend:10bc501a6890be931c6f6602c8caca31337eafeb + image: linuxkit/extend:v0.8 - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 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 6e7196693..c218c59e7 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 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 ac8a92fe4..f6838c30d 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.11 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 e39694cd1..3300f10b8 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.11 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 7b106da9b..0202ae0e5 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: modprobe - image: linuxkit/modprobe:944769462b9d10b1b1506498d3eb03dcc5416f7f + image: linuxkit/modprobe:v0.8 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 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 faac0d21d..c02b4973a 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 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 ea9856875..2d9586679 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.yml b/test/cases/040_packages/006_format_mount/006_gpt/test.yml index 1cf0a3302..3284b6e70 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-partition", "gpt"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.11 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 8472feb92..17d09fa9b 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 + image: linuxkit/format:v0.8 command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:19fa297189166206ac97261679c3e31fb140d48f + image: linuxkit/mount:v0.8 command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.11 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 81dbad892..207458994 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 + image: linuxkit/getty:v0.8 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.yml b/test/cases/040_packages/008_metadata/000_cidata/test.yml index adb003596..6d0a0f175 100644 --- a/test/cases/040_packages/008_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/008_metadata/000_cidata/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: metadata - image: linuxkit/metadata:dc5bcfa45946053145391ceabe33729c8b9507a1 + image: linuxkit/metadata:v0.8 - name: test image: alpine:3.11 binds: diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 5c4e6587b..bd8f73084 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: losetup - image: linuxkit/losetup:0730b61ac5c8803ba73318c2dd5121dc15cfbf34 + image: linuxkit/losetup:v0.8 command: ["/usr/bin/loopy", "-c", "/var/test.img"] - name: test image: alpine:3.11 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index ae468a7e2..502c9d519 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: mkimage - image: linuxkit/mkimage:cad5659e03d5e6d81c26bb0a9724cc626dee57b4 + image: linuxkit/mkimage:v0.8 - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 trust: diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 5988df0e0..54a942e3f 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:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: poweroff image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index b328a452f..66c2c0e92 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: sysctl - image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa + image: linuxkit/sysctl:v0.8 - name: test image: alpine:3.11 net: host diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 4ac4f828b..778f6f437 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 + image: linuxkit/ip:v0.8 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 + image: linuxkit/ip:v0.8 net: new binds: - /etc/wireguard:/etc/wireguard diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index 893b37109..d905f3168 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 - - linuxkit/memlogd:ddfd99754f0cfc63a675f49aa32a8f2c92785551 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 + - linuxkit/memlogd:v0.8 services: # A service which generates logs of log messages - name: fill-the-logs image: alpine command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); done" ] - name: write-and-rotate-logs - image: linuxkit/logwrite:0031a6ee2be4c842ce40246f93e5059048b367aa + image: linuxkit/logwrite:v0.8 command: ["/usr/bin/logwrite", "-max-log-size", "1024"] - name: check-the-logs image: alpine:3.11 diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 0eb9d4df7..f36d133e7 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef - - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 - - linuxkit/memlogd:ddfd99754f0cfc63a675f49aa32a8f2c92785551 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 + - linuxkit/ca-certificates:v0.8 + - linuxkit/memlogd:v0.8 services: - name: kmsg - image: linuxkit/kmsg:ea49dddf9275b10188ba45f57cb7c9c561db4758 + image: linuxkit/kmsg:v0.8 - name: write-and-rotate-logs - image: linuxkit/logwrite:0031a6ee2be4c842ce40246f93e5059048b367aa + image: linuxkit/logwrite:v0.8 - name: check-the-logs image: alpine:3.11 binds: diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index 21bdf4416..481fc231f 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 - linuxkit/kernel-bcc:5.4.39 onboot: - name: check-bcc diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index a5a7a9aac..bbb7029b3 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index 8914ead59..ea6cd4636 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,12 +4,12 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/containerd:6ef473a228db6f6ee163f9b9a051102a1552a4ef + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 + - linuxkit/containerd:v0.8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee + image: linuxkit/dhcpcd:v0.8 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 08e4d9790..a5c1bcfd7 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 + - linuxkit/init:v0.8 + - linuxkit/runc:v0.8 onboot: - name: test-ns image: linuxkit/test-ns: From b1fbe407129fa8c4215c3d79997068c2ac0accb7 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 10 May 2020 15:24:58 +0100 Subject: [PATCH 3/4] tool: Bump version to v0.8 Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f69714e00..e9e570162 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION="v0.7+" +VERSION="v0.8" GIT_COMMIT=$(shell git rev-list -1 HEAD) GO_COMPILE=linuxkit/go-compile:b1446b2ba407225011f97ae1dba0f512ae7f9b84 From 2884ed1996d0a06dabf7caf793acc287822b8e23 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 10 May 2020 15:44:23 +0100 Subject: [PATCH 4/4] Update CHANGELOG Signed-off-by: Rolf Neugebauer --- CHANGELOG.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2b1b6587..c3f8480ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,30 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). +## [v0.8] - 2020-05-10 +### Added + +- Removed dependency on external `notary` and `manifest-tool` binaries for package builds +- Risc-V support for `binfmt` +- Support for GPT partitions +- `metadata` package support for Digital Ocean and Hetzner as well as loading from a file +- Support for `/sys/fs/bpf` in `init` +- Github Actions for CI + +### Changed +- `alpine` base updated to 3.11 +- `containerd` updated to v1.3.4 +- `runc` updated to v1.0.0-rc9 +- `binfmt` updated to qemu 4.2 +- `node_exporter` updated to v0.18.1 +- `cadvisor` updated to v0.36.0 +- WireGuard updated to 1.0.20200319 +- Improved CDROM support and fixes to GCP and Scaleway providers in the `metadata` package +- Improved creation of `swap` files +- Improved RPI3 build + +### Removed + ## [v0.7] - 2019-04-17 ### Added - Reproducible `linuxkit build` for some output formats