From 2e0e0fb5e7b00f7459f679b10a7143148c56405d Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 12 Apr 2020 12:46:49 +0100 Subject: [PATCH 01/33] alpine: Bump base to 3.11 Signed-off-by: Rolf Neugebauer --- tools/alpine/Dockerfile | 6 +++--- tools/alpine/packages | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 136004de7..a2b5db1a5 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 AS mirror +FROM alpine:3.11 AS mirror # update base image RUN apk update && apk upgrade -a @@ -47,7 +47,7 @@ RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" > COPY go-compile.sh /go/bin/ RUN apk add --no-cache git go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin -RUN go get -u github.com/golang/lint/golint +RUN go get -u golang.org/x/lint/golint RUN go get -u github.com/gordonklaus/ineffassign RUN go get -u github.com/LK4D4/vndr @@ -89,7 +89,7 @@ RUN set -e && \ cp iucode_tool /iucode_tool; \ fi -FROM alpine:3.9 +FROM alpine:3.11 COPY --from=mirror /etc/apk/repositories /etc/apk/repositories COPY --from=mirror /etc/apk/repositories.upstream /etc/apk/repositories.upstream diff --git a/tools/alpine/packages b/tools/alpine/packages index d06b4fce9..4b10784f1 100644 --- a/tools/alpine/packages +++ b/tools/alpine/packages @@ -66,7 +66,6 @@ libc-utils libc6-compat libcap-ng-dev libedit-dev -libelf-dev libressl-dev libseccomp-dev libtirpc-dev From 2320529f3deadbe07584edde3f842a08ace4bb7d Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 12 Apr 2020 22:56:50 +0100 Subject: [PATCH 02/33] alpine/go-compile: Fix go-compile Signed-off-by: Rolf Neugebauer --- tools/alpine/go-compile.sh | 2 +- tools/go-compile/compile.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/alpine/go-compile.sh b/tools/alpine/go-compile.sh index ed040c907..4ebdce8be 100755 --- a/tools/alpine/go-compile.sh +++ b/tools/alpine/go-compile.sh @@ -18,7 +18,7 @@ cd "$dir" test -z $(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr) >&2 echo "govet..." -test -z $(GOOS=linux go tool vet -printf=false . 2>&1 | grep -v vendor/ | tee /dev/stderr) +test -z $(GOOS=linux go vet -printf=false . 2>&1 | grep -v "^#" | grep -v vendor/ | tee /dev/stderr) >&2 echo "golint..." test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec golint {} \; | tee /dev/stderr) diff --git a/tools/go-compile/compile.sh b/tools/go-compile/compile.sh index 05f48be22..ca1e967bd 100755 --- a/tools/go-compile/compile.sh +++ b/tools/go-compile/compile.sh @@ -78,7 +78,7 @@ cd "$dir" test -z $(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr) >&2 echo "govet..." -test -z $(GOOS=linux go tool vet -printf=false . 2>&1 | grep -v vendor/ | tee /dev/stderr) +test -z $(GOOS=linux go vet -printf=false . 2>&1 | grep -v "^#" | grep -v vendor/ | tee /dev/stderr) >&2 echo "golint..." test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec golint {} \; | tee /dev/stderr) From 2ad6a6107999adb56f796c17d1057a1856c3e100 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 12 Apr 2020 12:47:35 +0100 Subject: [PATCH 03/33] alpine: Bump containerd to v1.3.3 Note this release has the workaround for the disabling tests. Signed-off-by: Rolf Neugebauer --- tools/alpine/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index a2b5db1a5..cb49ea0c3 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -56,15 +56,12 @@ RUN go get -u github.com/LK4D4/vndr # `test/pkg/containerd/Dockerfile` when changing this. # For v1.3.x cherry-pick a upstream commit to allow disabling some tests. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.3.2 +ENV CONTAINERD_COMMIT=v1.3.3 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ cd $GOPATH/src/github.com/containerd/containerd && \ - git checkout $CONTAINERD_COMMIT && \ - git config --global user.email "you@example.com" && \ - git config --global user.name "Your Name" && \ - git cherry-pick 94d499843c0202af9636cad522d30eaf9ffed798 + git checkout $CONTAINERD_COMMIT RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev RUN cd $GOPATH/src/github.com/containerd/containerd && \ make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper" From 2817cdac7c03dfeb86bdbf6178211b11fb683c2e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 12:26:02 +0100 Subject: [PATCH 04/33] alpine: Update packages Signed-off-by: Rolf Neugebauer --- tools/alpine/versions.aarch64 | 573 +++++++++++++++++--------------- tools/alpine/versions.s390x | 562 +++++++++++++++++--------------- tools/alpine/versions.x86_64 | 592 ++++++++++++++++++---------------- 3 files changed, 942 insertions(+), 785 deletions(-) diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 832821e5d..fe93f864c 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,318 +1,371 @@ -# linuxkit/alpine:dac4b3c8e27e76075127b3ce45df7fdf75943f54-arm64 +# linuxkit/alpine:684208fa9e2d0b1cea695324e6b310768b095a79-arm64 # automatically generated list of installed packages -abuild-3.3.1-r0 -alpine-baselayout-3.1.0-r3 -alpine-keys-2.1-r1 -apk-tools-2.10.3-r1 -argon2-libs-20171227-r2 +abuild-3.5.0-r0 +alpine-baselayout-3.2.0-r3 +alpine-keys-2.1-r2 +alsa-lib-1.2.1.2-r0 +apk-tools-2.10.5-r0 +argon2-libs-20190702-r1 argp-standalone-1.3-r3 -attr-2.4.47-r7 -attr-dev-2.4.47-r7 -audit-2.8.4-r0 -audit-libs-2.8.4-r0 -audit-openrc-2.8.4-r0 +attr-2.4.48-r0 +attr-dev-2.4.48-r0 +audit-2.8.5-r0 +audit-libs-2.8.5-r0 +audit-openrc-2.8.5-r0 autoconf-2.69-r2 automake-1.16.1-r0 -bash-4.4.19-r1 -bc-1.07.1-r0 -binutils-2.31.1-r2 -binutils-dev-2.31.1-r2 -bison-3.0.5-r0 -blkid-2.33-r0 +avahi-libs-0.7-r4 +bash-5.0.11-r1 +bc-1.07.1-r1 +binutils-2.33.1-r0 +binutils-dev-2.33.1-r0 +binutils-gold-2.33.1-r0 +bison-3.4.2-r0 +blkid-2.34-r1 bridge-utils-1.6-r0 -bsd-compat-headers-0.7.1-r0 -btrfs-progs-4.19.1-r0 -btrfs-progs-dev-4.19.1-r0 -btrfs-progs-libs-4.19.1-r0 +bsd-compat-headers-0.7.2-r0 +btrfs-progs-5.4-r0 +btrfs-progs-dev-5.4-r0 +btrfs-progs-libs-5.4-r0 build-base-0.5-r1 -busybox-1.29.3-r10 -busybox-initscripts-3.1-r6 -bzip2-1.0.6-r7 -ca-certificates-20190108-r0 -ca-certificates-cacert-20190108-r0 +busybox-1.31.1-r9 +busybox-initscripts-3.2-r2 +bzip2-1.0.8-r1 +ca-certificates-20191127-r1 +ca-certificates-cacert-20191127-r1 +cairo-1.16.0-r2 +cdparanoia-libs-10.2-r7 cdrkit-1.1.11-r2 -celt051-0.5.1.3-r0 -cifs-utils-6.8-r0 -clang-5.0.2-r0 -clang-dev-5.0.2-r0 -clang-libs-5.0.2-r0 -clang-static-5.0.2-r0 -cmake-3.13.0-r0 -cmake-bash-completion-3.13.0-r0 -coreutils-8.30-r0 -cryptsetup-2.0.6-r0 -cryptsetup-libs-2.0.6-r0 -cryptsetup-openrc-2.0.6-r0 -curl-7.64.0-r3 +cifs-utils-6.9-r1 +clang-9.0.0-r1 +clang-dev-9.0.0-r1 +clang-libs-9.0.0-r1 +clang-static-9.0.0-r1 +cmake-3.15.5-r0 +cmake-bash-completion-3.15.5-r0 +coreutils-8.31-r0 +cryptsetup-2.2.2-r0 +cryptsetup-libs-2.2.2-r0 +cryptsetup-openrc-2.2.2-r0 +cups-libs-2.2.12-r1 +curl-7.67.0-r0 db-5.3.28-r1 -dbus-libs-1.10.28-r0 -device-mapper-libs-2.02.182-r0 -dhcpcd-7.0.8-r0 -dhcpcd-openrc-7.0.8-r0 +dbus-libs-1.12.16-r2 +device-mapper-2.02.186-r0 +device-mapper-event-libs-2.02.186-r0 +device-mapper-libs-2.02.186-r0 +device-mapper-udev-2.02.186-r0 +dhcpcd-8.1.2-r0 +dhcpcd-openrc-8.1.2-r0 diffutils-3.7-r0 dosfstools-4.1-r1 -dtc-1.4.7-r0 -e2fsprogs-1.44.5-r1 -e2fsprogs-dev-1.44.5-r1 -e2fsprogs-extra-1.44.5-r1 -e2fsprogs-libs-1.44.5-r1 -ebtables-2.0.10.4-r2 +dtc-1.5.1-r0 +e2fsprogs-1.45.5-r0 +e2fsprogs-dev-1.45.5-r0 +e2fsprogs-extra-1.45.5-r0 +e2fsprogs-libs-1.45.5-r0 elfutils-dev-0.168-r2 elfutils-libelf-0.168-r2 -ethtool-4.19-r0 -eudev-3.2.7-r0 -eudev-libs-3.2.7-r0 -expat-2.2.8-r0 +ethtool-5.3-r0 +eudev-3.2.9-r1 +eudev-libs-3.2.9-r1 +eudev-openrc-3.2.9-r1 +expat-2.2.9-r1 expect-5.45.4-r0 -fakeroot-1.23-r0 -file-5.36-r1 -findmnt-2.33-r0 -findutils-4.6.0-r1 -flex-2.6.4-r1 -flex-dev-2.6.4-r1 -flex-libs-2.6.4-r1 -fortify-headers-1.0-r0 +fakeroot-1.24-r0 +file-5.37-r1 +findmnt-2.34-r1 +findutils-4.7.0-r0 +flex-2.6.4-r2 +flex-dev-2.6.4-r2 +flex-libs-2.6.4-r2 +fontconfig-2.13.1-r2 +fortify-headers-1.1-r0 +freetype-2.10.1-r0 +fribidi-1.0.8-r0 fts-1.2.7-r1 fts-dev-1.2.7-r1 -g++-8.3.0-r0 -gc-7.6.4-r2 -gcc-8.3.0-r0 +g++-9.2.0-r4 +gc-8.0.4-r0 +gcc-9.2.0-r4 gdbm-1.13-r1 -gettext-0.19.8.1-r4 -gettext-asprintf-0.19.8.1-r4 -gettext-dev-0.19.8.1-r4 -gettext-libs-0.19.8.1-r4 -git-2.20.2-r0 -glib-2.58.1-r3 +gettext-0.20.1-r2 +gettext-asprintf-0.20.1-r2 +gettext-dev-0.20.1-r2 +gettext-libs-0.20.1-r2 +git-2.24.1-r0 +git-perl-2.24.1-r0 +glib-2.62.6-r0 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 gnupg-2.2.19-r0 -gnutls-3.6.7-r0 -go-1.11.5-r0 -grep-3.1-r2 +gnutls-3.6.10-r1 +go-1.13.4-r1 +graphite2-1.3.13-r1 +grep-3.3-r0 +gst-plugins-base-1.16.2-r0 +gstreamer-1.16.2-r0 guile-2.0.14-r0 guile-libs-2.0.14-r0 +harfbuzz-2.6.4-r0 hvtools-4.11.9-r0 installkernel-3.5-r0 -iperf3-3.6-r0 -iperf3-openrc-3.6-r0 -iproute2-4.19.0-r0 -iptables-1.6.2-r1 -ipvsadm-1.29-r0 +iperf3-3.7-r0 +iperf3-openrc-3.7-r0 +iproute2-5.4.0-r1 +iptables-1.8.3-r2 +iptables-openrc-1.8.3-r2 +ipvsadm-1.30-r0 isl-0.18-r0 -jansson-2.11-r0 +jansson-2.12-r0 jq-1.6-r0 json-c-0.13.1-r0 -keyutils-1.6-r0 -keyutils-libs-1.6-r0 -kmod-24-r1 -kmod-openrc-24-r1 +keyutils-1.6.1-r0 +keyutils-libs-1.6.1-r0 +kmod-26-r0 +kmod-openrc-26-r0 krb5-conf-1.0-r1 -krb5-dev-1.15.5-r0 -krb5-libs-1.15.5-r0 -krb5-server-ldap-1.15.5-r0 -libacl-2.2.52-r5 -libaio-0.3.111-r0 -libarchive-3.3.3-r1 -libarchive-tools-3.3.3-r1 -libassuan-2.5.1-r0 -libatomic-8.3.0-r0 -libattr-2.4.47-r7 -libblkid-2.33-r0 -libbsd-0.8.6-r2 -libburn-1.5.0-r0 -libbz2-1.0.6-r7 -libc-dev-0.7.1-r0 -libc-utils-0.7.1-r0 -libc6-compat-1.1.20-r5 -libcap-2.26-r0 -libcap-ng-0.7.9-r1 -libcap-ng-dev-0.7.9-r1 -libcom_err-1.44.5-r1 -libcrypto1.1-1.1.1d-r2 -libcurl-7.64.0-r3 -libdrm-2.4.96-r0 -libedit-20181209.3.1-r0 -libedit-dev-20181209.3.1-r0 -libelf-0.8.13-r3 -libelf-dev-0.8.13-r3 -libepoxy-1.5.3-r0 -libevent-2.1.8-r6 -libexecinfo-1.1-r0 -libexecinfo-dev-1.1-r0 -libfdisk-2.33-r0 +krb5-dev-1.17.1-r0 +krb5-libs-1.17.1-r0 +krb5-server-ldap-1.17.1-r0 +ldb-2.0.8-r0 +libacl-2.2.53-r0 +libaio-0.3.112-r1 +libarchive-3.4.2-r0 +libarchive-tools-3.4.2-r0 +libassuan-2.5.3-r0 +libatomic-9.2.0-r4 +libattr-2.4.48-r0 +libblkid-2.34-r1 +libbsd-0.10.0-r0 +libburn-1.5.2-r0 +libbz2-1.0.8-r1 +libc-dev-0.7.2-r0 +libc-utils-0.7.2-r0 +libc6-compat-1.1.24-r2 +libcap-2.27-r0 +libcap-ng-0.7.10-r0 +libcap-ng-dev-0.7.10-r0 +libcom_err-1.45.5-r0 +libcrypto1.1-1.1.1d-r3 +libcurl-7.67.0-r0 +libdrm-2.4.100-r0 +libedit-20191211.3.1-r0 +libedit-dev-20191211.3.1-r0 +libepoxy-1.5.4-r0 +libevent-2.1.11-r0 +libexecinfo-1.1-r1 +libexecinfo-dev-1.1-r1 +libfdisk-2.34-r1 +libfdt-1.5.1-r0 libffi-3.2.1-r6 -libgcc-8.3.0-r0 +libgcc-9.2.0-r4 libgcrypt-1.8.5-r0 libgmpxx-6.1.2-r1 -libgomp-8.3.0-r0 -libgpg-error-1.33-r0 -libintl-0.19.8.1-r4 -libisoburn-1.4.8-r0 -libisofs-1.4.8-r0 -libjpeg-turbo-1.5.3-r5 +libgomp-9.2.0-r4 +libgpg-error-1.36-r2 +libintl-0.20.1-r2 +libisoburn-1.5.2-r0 +libisofs-1.5.2-r0 +libjpeg-turbo-2.0.4-r0 libksba-1.3.5-r0 -libldap-2.4.48-r0 -libltdl-2.4.6-r5 -libmagic-5.36-r1 +libldap-2.4.48-r1 +libltdl-2.4.6-r7 +libmagic-5.37-r1 libmnl-1.0.4-r0 -libmount-2.33-r0 -libnfsidmap-2.3.2-r1 -libnftnl-libs-1.1.1-r0 -libnl-1.1.4-r0 -libnl3-3.4.0-r0 -libogg-1.3.3-r2 -libpcap-1.9.0-r1 -libpng-1.6.37-r0 -libressl-dev-2.7.5-r0 -libressl2.7-libcrypto-2.7.5-r0 -libressl2.7-libssl-2.7.5-r0 -libressl2.7-libtls-2.7.5-r0 -libsasl-2.1.27-r2 -libseccomp-2.3.3-r1 -libseccomp-dev-2.3.3-r1 -libsmartcols-2.33-r0 -libssh2-1.9.0-r1 -libssl1.1-1.1.1d-r2 -libstdc++-8.3.0-r0 -libtasn1-4.14-r0 -libtirpc-1.0.3-r0 -libtirpc-dev-1.0.3-r0 -libtls-standalone-2.7.4-r6 -libtool-2.4.6-r5 +libmount-2.34-r1 +libnfsidmap-2.4.1-r2 +libnftnl-libs-1.1.5-r0 +libnl3-3.5.0-r0 +libogg-1.3.4-r0 +libpcap-1.9.1-r0 +libpng-1.6.37-r1 +libressl-dev-3.0.2-r0 +libressl3.0-libcrypto-3.0.2-r0 +libressl3.0-libssl-3.0.2-r0 +libressl3.0-libtls-3.0.2-r0 +libsasl-2.1.27-r5 +libseccomp-2.4.2-r2 +libseccomp-dev-2.4.2-r2 +libsecret-0.19.1-r0 +libsmartcols-2.34-r1 +libssl1.1-1.1.1d-r3 +libstdc++-9.2.0-r4 +libtasn1-4.15.0-r0 +libtheora-1.1.1-r14 +libtirpc-1.1.4-r0 +libtirpc-dev-1.1.4-r0 +libtls-standalone-2.9.1-r0 +libtool-2.4.6-r7 libunistring-0.9.10-r0 libunwind-1.2.1-r3 libunwind-dev-1.2.1-r3 -libusb-1.0.22-r0 -libuuid-2.33-r0 -libuv-1.23.2-r0 -libverto-0.3.0-r1 -libwbclient-4.8.12-r1 -libx11-1.6.7-r0 -libxau-1.0.8-r3 -libxcb-1.13-r2 -libxdmcp-1.1.2-r5 -libxkbcommon-0.8.2-r0 -libxml2-2.9.9-r2 -linux-headers-4.18.13-r1 -llvm5-5.0.2-r0 -llvm5-dev-5.0.2-r0 -llvm5-libs-5.0.2-r0 -llvm5-static-5.0.2-r0 +libusb-1.0.23-r0 +libuuid-2.34-r1 +libuv-1.34.0-r0 +libverto-0.3.1-r1 +libvorbis-1.3.6-r2 +libwbclient-4.11.5-r0 +libx11-1.6.9-r0 +libxau-1.0.9-r0 +libxcb-1.13.1-r0 +libxdamage-1.1.5-r0 +libxdmcp-1.1.3-r0 +libxext-1.3.4-r0 +libxfixes-5.0.3-r2 +libxft-2.3.3-r0 +libxkbcommon-0.9.1-r0 +libxml2-2.9.10-r2 +libxrender-0.9.10-r3 +libxshmfence-1.3-r0 +libxv-1.0.11-r2 +libxxf86vm-1.1.4-r2 +linux-headers-4.19.36-r0 +linux-pam-1.3.1-r1 +llvm9-9.0.0-r1 +llvm9-dev-9.0.0-r1 +llvm9-libs-9.0.0-r1 +llvm9-static-9.0.0-r1 +lmdb-0.9.24-r1 lsscsi-0.30-r0 lua5.3-libs-5.3.5-r2 -luajit-2.1.0_beta3-r4 -luajit-dev-2.1.0_beta3-r4 -lz4-libs-1.8.3-r2 -lzip-1.20-r0 +luajit-2.1.0_beta3-r6 +luajit-dev-2.1.0_beta3-r6 +lvm2-libs-2.02.186-r0 +lz4-libs-1.9.2-r0 +lzip-1.21-r0 lzo-2.10-r2 m4-1.4.18-r1 make-4.2.1-r2 -mesa-gbm-18.1.7-r2 -mpc1-1.0.3-r1 -mpc1-dev-1.0.3-r1 -mpfr-dev-3.1.5-r1 -mpfr3-3.1.5-r1 +mesa-19.2.7-r0 +mesa-egl-19.2.7-r0 +mesa-gbm-19.2.7-r0 +mesa-gl-19.2.7-r0 +mesa-glapi-19.2.7-r0 +mpc1-1.1.0-r1 +mpc1-dev-1.1.0-r1 +mpfr-dev-4.0.2-r1 +mpfr4-4.0.2-r1 mtools-4.0.23-r0 -multipath-tools-0.7.9-r0 -musl-1.1.20-r5 -musl-dev-1.1.20-r5 -musl-utils-1.1.20-r5 -ncurses-dev-6.1_p20190105-r0 -ncurses-libs-6.1_p20190105-r0 -ncurses-terminfo-6.1_p20190105-r0 -ncurses-terminfo-base-6.1_p20190105-r0 -nettle-3.4.1-r0 -nfs-utils-2.3.2-r1 -nfs-utils-openrc-2.3.2-r1 -nghttp2-libs-1.35.1-r1 +multipath-tools-0.8.3-r4 +multipath-tools-openrc-0.8.3-r4 +musl-1.1.24-r2 +musl-dev-1.1.24-r2 +musl-utils-1.1.24-r2 +ncurses-dev-6.1_p20200118-r3 +ncurses-libs-6.1_p20200118-r3 +ncurses-terminfo-base-6.1_p20200118-r3 +nettle-3.5.1-r0 +nfs-utils-2.4.1-r2 +nfs-utils-openrc-2.4.1-r2 +nghttp2-libs-1.40.0-r0 npth-1.6-r0 oniguruma-6.9.4-r0 -open-iscsi-2.0.874-r2 -open-isns-lib-0.97-r4 -openntpd-6.2_p3-r2 -openrc-0.39.2-r3 -openresolv-3.9.0-r0 -openssh-keygen-7.9_p1-r6 -openssh-server-7.9_p1-r6 -openssh-server-common-7.9_p1-r6 -openssl-1.1.1d-r2 -openssl-dev-1.1.1d-r2 -opus-1.3-r0 -p11-kit-0.23.14-r0 +open-iscsi-2.1.0-r2 +open-iscsi-libs-2.1.0-r2 +open-iscsi-openrc-2.1.0-r2 +open-isns-lib-0.99-r0 +openntpd-6.2_p3-r3 +openrc-0.42.1-r2 +openresolv-3.9.2-r0 +openssh-keygen-8.1_p1-r0 +openssh-server-8.1_p1-r0 +openssh-server-common-8.1_p1-r0 +openssl-1.1.1d-r3 +openssl-dev-1.1.1d-r3 +opus-1.3.1-r0 +orc-0.4.31-r0 +p11-kit-0.23.18.1-r0 +pango-1.44.7-r0 patch-2.7.6-r6 -pax-utils-1.2.3-r0 -pcre-8.42-r1 -pcre2-10.32-r1 -pcsc-lite-libs-1.8.24-r1 -perl-5.26.3-r0 +pax-utils-1.2.4-r0 +pcre-8.43-r0 +pcre2-10.34-r1 +pcsc-lite-libs-1.8.25-r2 +perl-5.30.1-r0 +perl-error-0.17028-r0 +perl-git-2.24.1-r0 pigz-2.4-r0 -pinentry-1.1.0-r0 -pixman-0.34.0-r6 -pkgconf-1.6.0-r0 +pinentry-1.1.0-r2 +pixman-0.38.4-r0 +pkgconf-1.6.3-r0 popt-1.16-r7 -python2-2.7.16-r1 -python3-3.6.9-r2 -qemu-3.1.0-r3 -qemu-aarch64-3.1.0-r3 -qemu-arm-3.1.0-r3 -qemu-guest-agent-3.1.0-r3 -qemu-img-3.1.0-r3 -qemu-ppc64le-3.1.0-r3 -qemu-system-aarch64-3.1.0-r3 -qemu-system-arm-3.1.0-r3 -qemu-system-x86_64-3.1.0-r3 -readline-7.0.003-r1 -rhash-libs-1.3.6-r2 -rpcbind-0.2.4-r1 -rsync-3.1.3-r1 -rsync-openrc-3.1.3-r1 -scanelf-1.2.3-r0 -sed-4.5-r0 -sfdisk-2.33-r0 -sg3_utils-1.42-r1 +python2-2.7.16-r3 +python3-3.8.2-r0 +qemu-4.2.0-r0 +qemu-aarch64-4.2.0-r0 +qemu-arm-4.2.0-r0 +qemu-guest-agent-4.2.0-r0 +qemu-img-4.2.0-r0 +qemu-ppc64le-4.2.0-r0 +qemu-system-aarch64-4.2.0-r0 +qemu-system-arm-4.2.0-r0 +qemu-system-x86_64-4.2.0-r0 +readline-8.0.1-r0 +rhash-libs-1.3.9-r0 +rpcbind-1.2.5-r0 +rpcbind-openrc-1.2.5-r0 +rsync-3.1.3-r2 +rsync-openrc-3.1.3-r2 +samba-client-libs-4.11.5-r0 +samba-common-libs-4.11.5-r0 +samba-common-server-libs-4.11.5-r0 +samba-heimdal-libs-4.11.5-r0 +samba-libs-4.11.5-r0 +samba-server-libs-4.11.5-r0 +scanelf-1.2.4-r0 +sed-4.7-r0 +sfdisk-2.34-r1 +sg3_utils-1.44-r0 sgdisk-1.0.4-r0 slang-2.3.2-r0 slang-dev-2.3.2-r0 snappy-1.1.7-r1 sntpc-0.9-r6 -socat-1.7.3.2-r5 -spice-server-0.14.1-r6 -sqlite-libs-3.28.0-r2 -squashfs-tools-4.3-r5 -ssl_client-1.29.3-r10 -strace-4.24-r0 -sudo-1.8.25_p1-r2 +socat-1.7.3.3-r1 +spice-server-0.14.2-r1 +sqlite-libs-3.30.1-r1 +squashfs-tools-4.4-r0 +ssl_client-1.31.1-r9 +strace-5.3-r1 +sudo-1.8.31-r0 swig-3.0.12-r4 -talloc-2.1.14-r0 -tar-1.32-r0 +talloc-2.3.1-r0 +tar-1.32-r1 tcl-8.6.9-r0 -tcpdump-4.9.2-r4 +tcpdump-4.9.3-r0 +tdb-libs-1.4.3-r0 +tevent-0.10.2-r0 tini-0.18.0-r0 tzdata-2019c-r0 -udev-init-scripts-32-r2 -udev-init-scripts-openrc-32-r2 -usbredir-0.7.1-r0 -userspace-rcu-0.10.1-r0 -util-linux-2.33-r0 -util-linux-dev-2.33-r0 -vde2-libs-2.3.2-r10 -vim-8.1.1365-r0 -virglrenderer-0.7.0-r1 -wayland-libs-server-1.16.0-r0 -wireguard-tools-1.0.20200102-r0 -wireguard-tools-wg-1.0.20200102-r0 -wireguard-tools-wg-quick-1.0.20200102-r0 -wireless-tools-30_pre9-r0 -wpa_supplicant-2.7-r5 -wpa_supplicant-openrc-2.7-r5 -xfsprogs-4.19.0-r1 -xfsprogs-extra-4.19.0-r1 -xorriso-1.4.8-r0 +udev-init-scripts-33-r0 +udev-init-scripts-openrc-33-r0 +usbredir-0.8.0-r0 +userspace-rcu-0.11.1-r0 +util-linux-2.34-r1 +util-linux-dev-2.34-r1 +vde2-libs-2.3.2-r12 +vim-8.2.0-r0 +virglrenderer-0.8.1-r0 +wayland-libs-client-1.17.0-r0 +wayland-libs-egl-1.17.0-r0 +wayland-libs-server-1.17.0-r0 +wireguard-tools-1.0.20200319-r0 +wireguard-tools-wg-1.0.20200319-r0 +wireguard-tools-wg-quick-1.0.20200319-r0 +wireless-tools-30_pre9-r1 +wpa_supplicant-2.9-r5 +wpa_supplicant-openrc-2.9-r5 +xfsprogs-5.3.0-r0 +xfsprogs-extra-5.3.0-r0 +xorriso-1.5.2-r0 +xxd-8.2.0-r0 xz-5.2.4-r0 xz-dev-5.2.4-r0 xz-libs-5.2.4-r0 -zfs-0.7.12-r1 -zfs-libs-0.7.12-r1 -zlib-1.2.11-r1 -zlib-dev-1.2.11-r1 +zfs-0.8.3-r1 +zfs-libs-0.8.3-r1 +zfs-openrc-0.8.3-r1 +zlib-1.2.11-r3 +zlib-dev-1.2.11-r3 +zstd-libs-1.4.4-r1 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index a9de8af1e..2337aa249 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,311 +1,363 @@ -# linuxkit/alpine:53d529742dd92e941f2dd5e551e114dc45022e73-s390x +# linuxkit/alpine:10ac4242d642b9c9c0ada11990b63cf4183efcf6-s390x # automatically generated list of installed packages -abuild-3.3.1-r0 -alpine-baselayout-3.1.0-r3 -alpine-keys-2.1-r1 -apk-tools-2.10.3-r1 -argon2-libs-20171227-r2 +abuild-3.5.0-r0 +alpine-baselayout-3.2.0-r3 +alpine-keys-2.1-r2 +alsa-lib-1.2.1.2-r0 +apk-tools-2.10.5-r0 +argon2-libs-20190702-r1 argp-standalone-1.3-r3 -attr-2.4.47-r7 -attr-dev-2.4.47-r7 -audit-2.8.4-r0 -audit-libs-2.8.4-r0 -audit-openrc-2.8.4-r0 +attr-2.4.48-r0 +attr-dev-2.4.48-r0 +audit-2.8.5-r0 +audit-libs-2.8.5-r0 +audit-openrc-2.8.5-r0 autoconf-2.69-r2 automake-1.16.1-r0 -bash-4.4.19-r1 -bc-1.07.1-r0 -binutils-2.31.1-r2 -binutils-dev-2.31.1-r2 -bison-3.0.5-r0 -blkid-2.33-r0 +avahi-libs-0.7-r4 +bash-5.0.11-r1 +bc-1.07.1-r1 +binutils-2.33.1-r0 +binutils-dev-2.33.1-r0 +bison-3.4.2-r0 +blkid-2.34-r1 bridge-utils-1.6-r0 -bsd-compat-headers-0.7.1-r0 -btrfs-progs-4.19.1-r0 -btrfs-progs-dev-4.19.1-r0 -btrfs-progs-libs-4.19.1-r0 +bsd-compat-headers-0.7.2-r0 +btrfs-progs-5.4-r0 +btrfs-progs-dev-5.4-r0 +btrfs-progs-libs-5.4-r0 build-base-0.5-r1 -busybox-1.29.3-r10 -busybox-initscripts-3.1-r6 -bzip2-1.0.6-r7 -ca-certificates-20190108-r0 -ca-certificates-cacert-20190108-r0 +busybox-1.31.1-r9 +busybox-initscripts-3.2-r2 +bzip2-1.0.8-r1 +ca-certificates-20191127-r1 +ca-certificates-cacert-20191127-r1 +cairo-1.16.0-r2 +cdparanoia-libs-10.2-r7 cdrkit-1.1.11-r2 -celt051-0.5.1.3-r0 -cifs-utils-6.8-r0 -clang-5.0.2-r0 -clang-dev-5.0.2-r0 -clang-libs-5.0.2-r0 -clang-static-5.0.2-r0 -cmake-3.13.0-r0 -cmake-bash-completion-3.13.0-r0 -coreutils-8.30-r0 -cryptsetup-2.0.6-r0 -cryptsetup-libs-2.0.6-r0 -cryptsetup-openrc-2.0.6-r0 -curl-7.64.0-r3 +cifs-utils-6.9-r1 +clang-9.0.0-r1 +clang-dev-9.0.0-r1 +clang-libs-9.0.0-r1 +clang-static-9.0.0-r1 +cmake-3.15.5-r0 +cmake-bash-completion-3.15.5-r0 +coreutils-8.31-r0 +cryptsetup-2.2.2-r0 +cryptsetup-libs-2.2.2-r0 +cryptsetup-openrc-2.2.2-r0 +cups-libs-2.2.12-r1 +curl-7.67.0-r0 db-5.3.28-r1 -dbus-libs-1.10.28-r0 -device-mapper-libs-2.02.182-r0 -dhcpcd-7.0.8-r0 -dhcpcd-openrc-7.0.8-r0 +dbus-libs-1.12.16-r2 +device-mapper-2.02.186-r0 +device-mapper-event-libs-2.02.186-r0 +device-mapper-libs-2.02.186-r0 +device-mapper-udev-2.02.186-r0 +dhcpcd-8.1.2-r0 +dhcpcd-openrc-8.1.2-r0 diffutils-3.7-r0 dosfstools-4.1-r1 -dtc-1.4.7-r0 -e2fsprogs-1.44.5-r1 -e2fsprogs-dev-1.44.5-r1 -e2fsprogs-extra-1.44.5-r1 -e2fsprogs-libs-1.44.5-r1 -ebtables-2.0.10.4-r2 +dtc-1.5.1-r0 +e2fsprogs-1.45.5-r0 +e2fsprogs-dev-1.45.5-r0 +e2fsprogs-extra-1.45.5-r0 +e2fsprogs-libs-1.45.5-r0 elfutils-dev-0.168-r2 elfutils-libelf-0.168-r2 -ethtool-4.19-r0 -eudev-3.2.7-r0 -eudev-libs-3.2.7-r0 -expat-2.2.8-r0 +ethtool-5.3-r0 +eudev-3.2.9-r1 +eudev-libs-3.2.9-r1 +eudev-openrc-3.2.9-r1 +expat-2.2.9-r1 expect-5.45.4-r0 -fakeroot-1.23-r0 -file-5.36-r1 -findmnt-2.33-r0 -findutils-4.6.0-r1 -flex-2.6.4-r1 -flex-dev-2.6.4-r1 -flex-libs-2.6.4-r1 -fortify-headers-1.0-r0 +fakeroot-1.24-r0 +file-5.37-r1 +findmnt-2.34-r1 +findutils-4.7.0-r0 +flex-2.6.4-r2 +flex-dev-2.6.4-r2 +flex-libs-2.6.4-r2 +fontconfig-2.13.1-r2 +fortify-headers-1.1-r0 +freetype-2.10.1-r0 +fribidi-1.0.8-r0 fts-1.2.7-r1 fts-dev-1.2.7-r1 -g++-8.3.0-r0 -gc-7.6.4-r2 -gcc-8.3.0-r0 +g++-9.2.0-r4 +gc-8.0.4-r0 +gcc-9.2.0-r4 gdbm-1.13-r1 -gettext-0.19.8.1-r4 -gettext-asprintf-0.19.8.1-r4 -gettext-dev-0.19.8.1-r4 -gettext-libs-0.19.8.1-r4 -git-2.20.2-r0 -glib-2.58.1-r3 +gettext-0.20.1-r2 +gettext-asprintf-0.20.1-r2 +gettext-dev-0.20.1-r2 +gettext-libs-0.20.1-r2 +git-2.24.1-r0 +git-perl-2.24.1-r0 +glib-2.62.6-r0 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 gnupg-2.2.19-r0 -gnutls-3.6.7-r0 -go-1.11.5-r0 -grep-3.1-r2 +gnutls-3.6.10-r1 +go-1.13.4-r1 +graphite2-1.3.13-r1 +grep-3.3-r0 +gst-plugins-base-1.16.2-r0 +gstreamer-1.16.2-r0 guile-2.0.14-r0 guile-libs-2.0.14-r0 +harfbuzz-2.6.4-r0 hvtools-4.11.9-r0 installkernel-3.5-r0 -iperf3-3.6-r0 -iperf3-openrc-3.6-r0 -iproute2-4.19.0-r0 -iptables-1.6.2-r1 -ipvsadm-1.29-r0 +iperf3-3.7-r0 +iperf3-openrc-3.7-r0 +iproute2-5.4.0-r1 +iptables-1.8.3-r2 +iptables-openrc-1.8.3-r2 +ipvsadm-1.30-r0 isl-0.18-r0 -jansson-2.11-r0 +jansson-2.12-r0 jq-1.6-r0 json-c-0.13.1-r0 -keyutils-1.6-r0 -keyutils-libs-1.6-r0 -kmod-24-r1 -kmod-openrc-24-r1 +keyutils-1.6.1-r0 +keyutils-libs-1.6.1-r0 +kmod-26-r0 +kmod-openrc-26-r0 krb5-conf-1.0-r1 -krb5-dev-1.15.5-r0 -krb5-libs-1.15.5-r0 -krb5-server-ldap-1.15.5-r0 -libacl-2.2.52-r5 -libaio-0.3.111-r0 -libarchive-3.3.3-r1 -libarchive-tools-3.3.3-r1 -libassuan-2.5.1-r0 -libatomic-8.3.0-r0 -libattr-2.4.47-r7 -libblkid-2.33-r0 -libbsd-0.8.6-r2 -libburn-1.5.0-r0 -libbz2-1.0.6-r7 -libc-dev-0.7.1-r0 -libc-utils-0.7.1-r0 -libc6-compat-1.1.20-r5 -libcap-2.26-r0 -libcap-ng-0.7.9-r1 -libcap-ng-dev-0.7.9-r1 -libcom_err-1.44.5-r1 -libcrypto1.1-1.1.1d-r2 -libcurl-7.64.0-r3 -libdrm-2.4.96-r0 -libedit-20181209.3.1-r0 -libedit-dev-20181209.3.1-r0 -libelf-0.8.13-r3 -libelf-dev-0.8.13-r3 -libepoxy-1.5.3-r0 -libevent-2.1.8-r6 -libfdisk-2.33-r0 +krb5-dev-1.17.1-r0 +krb5-libs-1.17.1-r0 +krb5-server-ldap-1.17.1-r0 +ldb-2.0.8-r0 +libacl-2.2.53-r0 +libaio-0.3.112-r1 +libarchive-3.4.2-r0 +libarchive-tools-3.4.2-r0 +libassuan-2.5.3-r0 +libatomic-9.2.0-r4 +libattr-2.4.48-r0 +libblkid-2.34-r1 +libbsd-0.10.0-r0 +libburn-1.5.2-r0 +libbz2-1.0.8-r1 +libc-dev-0.7.2-r0 +libc-utils-0.7.2-r0 +libc6-compat-1.1.24-r2 +libcap-2.27-r0 +libcap-ng-0.7.10-r0 +libcap-ng-dev-0.7.10-r0 +libcom_err-1.45.5-r0 +libcrypto1.1-1.1.1d-r3 +libcurl-7.67.0-r0 +libdrm-2.4.100-r0 +libedit-20191211.3.1-r0 +libedit-dev-20191211.3.1-r0 +libepoxy-1.5.4-r0 +libevent-2.1.11-r0 +libfdisk-2.34-r1 +libfdt-1.5.1-r0 libffi-3.2.1-r6 -libgcc-8.3.0-r0 +libgcc-9.2.0-r4 libgcrypt-1.8.5-r0 libgmpxx-6.1.2-r1 -libgomp-8.3.0-r0 -libgpg-error-1.33-r0 -libintl-0.19.8.1-r4 -libisoburn-1.4.8-r0 -libisofs-1.4.8-r0 -libjpeg-turbo-1.5.3-r5 +libgomp-9.2.0-r4 +libgpg-error-1.36-r2 +libintl-0.20.1-r2 +libisoburn-1.5.2-r0 +libisofs-1.5.2-r0 +libjpeg-turbo-2.0.4-r0 libksba-1.3.5-r0 -libldap-2.4.48-r0 -libltdl-2.4.6-r5 -libmagic-5.36-r1 +libldap-2.4.48-r1 +libltdl-2.4.6-r7 +libmagic-5.37-r1 libmnl-1.0.4-r0 -libmount-2.33-r0 -libnfsidmap-2.3.2-r1 -libnftnl-libs-1.1.1-r0 -libnl-1.1.4-r0 -libnl3-3.4.0-r0 -libogg-1.3.3-r2 -libpcap-1.9.0-r1 -libpng-1.6.37-r0 -libressl-dev-2.7.5-r0 -libressl2.7-libcrypto-2.7.5-r0 -libressl2.7-libssl-2.7.5-r0 -libressl2.7-libtls-2.7.5-r0 -libsasl-2.1.27-r2 -libseccomp-2.3.3-r1 -libseccomp-dev-2.3.3-r1 -libsmartcols-2.33-r0 -libssh2-1.9.0-r1 -libssl1.1-1.1.1d-r2 -libstdc++-8.3.0-r0 -libtasn1-4.14-r0 -libtirpc-1.0.3-r0 -libtirpc-dev-1.0.3-r0 -libtls-standalone-2.7.4-r6 -libtool-2.4.6-r5 +libmount-2.34-r1 +libnfsidmap-2.4.1-r2 +libnftnl-libs-1.1.5-r0 +libnl3-3.5.0-r0 +libogg-1.3.4-r0 +libpcap-1.9.1-r0 +libpng-1.6.37-r1 +libressl-dev-3.0.2-r0 +libressl3.0-libcrypto-3.0.2-r0 +libressl3.0-libssl-3.0.2-r0 +libressl3.0-libtls-3.0.2-r0 +libsasl-2.1.27-r5 +libseccomp-2.4.2-r2 +libseccomp-dev-2.4.2-r2 +libsecret-0.19.1-r0 +libsmartcols-2.34-r1 +libssl1.1-1.1.1d-r3 +libstdc++-9.2.0-r4 +libtasn1-4.15.0-r0 +libtheora-1.1.1-r14 +libtirpc-1.1.4-r0 +libtirpc-dev-1.1.4-r0 +libtls-standalone-2.9.1-r0 +libtool-2.4.6-r7 libunistring-0.9.10-r0 -libusb-1.0.22-r0 -libuuid-2.33-r0 -libuv-1.23.2-r0 -libverto-0.3.0-r1 -libwbclient-4.8.12-r1 -libx11-1.6.7-r0 -libxau-1.0.8-r3 -libxcb-1.13-r2 -libxdmcp-1.1.2-r5 -libxkbcommon-0.8.2-r0 -libxml2-2.9.9-r2 -linux-headers-4.18.13-r1 -llvm5-5.0.2-r0 -llvm5-dev-5.0.2-r0 -llvm5-libs-5.0.2-r0 -llvm5-static-5.0.2-r0 +libusb-1.0.23-r0 +libuuid-2.34-r1 +libuv-1.34.0-r0 +libverto-0.3.1-r1 +libvorbis-1.3.6-r2 +libwbclient-4.11.5-r0 +libx11-1.6.9-r0 +libxau-1.0.9-r0 +libxcb-1.13.1-r0 +libxdamage-1.1.5-r0 +libxdmcp-1.1.3-r0 +libxext-1.3.4-r0 +libxfixes-5.0.3-r2 +libxft-2.3.3-r0 +libxkbcommon-0.9.1-r0 +libxml2-2.9.10-r2 +libxrender-0.9.10-r3 +libxshmfence-1.3-r0 +libxv-1.0.11-r2 +libxxf86vm-1.1.4-r2 +linux-headers-4.19.36-r0 +linux-pam-1.3.1-r1 +llvm9-9.0.0-r1 +llvm9-dev-9.0.0-r1 +llvm9-libs-9.0.0-r1 +llvm9-static-9.0.0-r1 +lmdb-0.9.24-r1 lsscsi-0.30-r0 lua5.3-libs-5.3.5-r2 -lz4-libs-1.8.3-r2 -lzip-1.20-r0 +lvm2-libs-2.02.186-r0 +lz4-libs-1.9.2-r0 +lzip-1.21-r0 lzo-2.10-r2 m4-1.4.18-r1 make-4.2.1-r2 -mesa-gbm-18.1.7-r2 -mpc1-1.0.3-r1 -mpc1-dev-1.0.3-r1 -mpfr-dev-3.1.5-r1 -mpfr3-3.1.5-r1 +mesa-19.2.7-r0 +mesa-egl-19.2.7-r0 +mesa-gbm-19.2.7-r0 +mesa-gl-19.2.7-r0 +mesa-glapi-19.2.7-r0 +mpc1-1.1.0-r1 +mpc1-dev-1.1.0-r1 +mpfr-dev-4.0.2-r1 +mpfr4-4.0.2-r1 mtools-4.0.23-r0 -multipath-tools-0.7.9-r0 -musl-1.1.20-r5 -musl-dev-1.1.20-r5 -musl-utils-1.1.20-r5 -ncurses-dev-6.1_p20190105-r0 -ncurses-libs-6.1_p20190105-r0 -ncurses-terminfo-6.1_p20190105-r0 -ncurses-terminfo-base-6.1_p20190105-r0 -nettle-3.4.1-r0 -nfs-utils-2.3.2-r1 -nfs-utils-openrc-2.3.2-r1 -nghttp2-libs-1.35.1-r1 +multipath-tools-0.8.3-r4 +multipath-tools-openrc-0.8.3-r4 +musl-1.1.24-r2 +musl-dev-1.1.24-r2 +musl-utils-1.1.24-r2 +ncurses-dev-6.1_p20200118-r3 +ncurses-libs-6.1_p20200118-r3 +ncurses-terminfo-base-6.1_p20200118-r3 +nettle-3.5.1-r0 +nfs-utils-2.4.1-r2 +nfs-utils-openrc-2.4.1-r2 +nghttp2-libs-1.40.0-r0 npth-1.6-r0 oniguruma-6.9.4-r0 -open-iscsi-2.0.874-r2 -open-isns-lib-0.97-r4 -openntpd-6.2_p3-r2 -openrc-0.39.2-r3 -openresolv-3.9.0-r0 -openssh-keygen-7.9_p1-r6 -openssh-server-7.9_p1-r6 -openssh-server-common-7.9_p1-r6 -openssl-1.1.1d-r2 -openssl-dev-1.1.1d-r2 -opus-1.3-r0 -p11-kit-0.23.14-r0 +open-iscsi-2.1.0-r2 +open-iscsi-libs-2.1.0-r2 +open-iscsi-openrc-2.1.0-r2 +open-isns-lib-0.99-r0 +openntpd-6.2_p3-r3 +openrc-0.42.1-r2 +openresolv-3.9.2-r0 +openssh-keygen-8.1_p1-r0 +openssh-server-8.1_p1-r0 +openssh-server-common-8.1_p1-r0 +openssl-1.1.1d-r3 +openssl-dev-1.1.1d-r3 +opus-1.3.1-r0 +orc-0.4.31-r0 +p11-kit-0.23.18.1-r0 +pango-1.44.7-r0 patch-2.7.6-r6 -pax-utils-1.2.3-r0 -pcre-8.42-r1 -pcre2-10.32-r1 -pcsc-lite-libs-1.8.24-r1 -perl-5.26.3-r0 +pax-utils-1.2.4-r0 +pcre-8.43-r0 +pcre2-10.34-r1 +pcsc-lite-libs-1.8.25-r2 +perl-5.30.1-r0 +perl-error-0.17028-r0 +perl-git-2.24.1-r0 pigz-2.4-r0 -pinentry-1.1.0-r0 -pixman-0.34.0-r6 -pkgconf-1.6.0-r0 +pinentry-1.1.0-r2 +pixman-0.38.4-r0 +pkgconf-1.6.3-r0 popt-1.16-r7 -python2-2.7.16-r1 -python3-3.6.9-r2 -qemu-3.1.0-r3 -qemu-aarch64-3.1.0-r3 -qemu-arm-3.1.0-r3 -qemu-guest-agent-3.1.0-r3 -qemu-img-3.1.0-r3 -qemu-ppc64le-3.1.0-r3 -qemu-system-arm-3.1.0-r3 -qemu-system-s390x-3.1.0-r3 -qemu-system-x86_64-3.1.0-r3 -readline-7.0.003-r1 -rhash-libs-1.3.6-r2 -rpcbind-0.2.4-r1 -rsync-3.1.3-r1 -rsync-openrc-3.1.3-r1 -scanelf-1.2.3-r0 -sed-4.5-r0 -sfdisk-2.33-r0 -sg3_utils-1.42-r1 +python2-2.7.16-r3 +python3-3.8.2-r0 +qemu-4.2.0-r0 +qemu-aarch64-4.2.0-r0 +qemu-arm-4.2.0-r0 +qemu-guest-agent-4.2.0-r0 +qemu-img-4.2.0-r0 +qemu-ppc64le-4.2.0-r0 +qemu-system-arm-4.2.0-r0 +qemu-system-s390x-4.2.0-r0 +qemu-system-x86_64-4.2.0-r0 +readline-8.0.1-r0 +rhash-libs-1.3.9-r0 +rpcbind-1.2.5-r0 +rpcbind-openrc-1.2.5-r0 +rsync-3.1.3-r2 +rsync-openrc-3.1.3-r2 +samba-client-libs-4.11.5-r0 +samba-common-libs-4.11.5-r0 +samba-common-server-libs-4.11.5-r0 +samba-heimdal-libs-4.11.5-r0 +samba-libs-4.11.5-r0 +samba-server-libs-4.11.5-r0 +scanelf-1.2.4-r0 +sed-4.7-r0 +sfdisk-2.34-r1 +sg3_utils-1.44-r0 sgdisk-1.0.4-r0 slang-2.3.2-r0 slang-dev-2.3.2-r0 snappy-1.1.7-r1 sntpc-0.9-r6 -socat-1.7.3.2-r5 -spice-server-0.14.1-r6 -sqlite-libs-3.28.0-r2 -squashfs-tools-4.3-r5 -ssl_client-1.29.3-r10 -sudo-1.8.25_p1-r2 +socat-1.7.3.3-r1 +spice-server-0.14.2-r1 +sqlite-libs-3.30.1-r1 +squashfs-tools-4.4-r0 +ssl_client-1.31.1-r9 +sudo-1.8.31-r0 swig-3.0.12-r4 -talloc-2.1.14-r0 -tar-1.32-r0 +talloc-2.3.1-r0 +tar-1.32-r1 tcl-8.6.9-r0 -tcpdump-4.9.2-r4 +tcpdump-4.9.3-r0 +tdb-libs-1.4.3-r0 +tevent-0.10.2-r0 tini-0.18.0-r0 tzdata-2019c-r0 -udev-init-scripts-32-r2 -udev-init-scripts-openrc-32-r2 -usbredir-0.7.1-r0 -userspace-rcu-0.10.1-r0 -util-linux-2.33-r0 -util-linux-dev-2.33-r0 -vde2-libs-2.3.2-r10 -vim-8.1.1365-r0 -virglrenderer-0.7.0-r1 -wayland-libs-server-1.16.0-r0 -wireguard-tools-1.0.20200102-r0 -wireguard-tools-wg-1.0.20200102-r0 -wireguard-tools-wg-quick-1.0.20200102-r0 -wireless-tools-30_pre9-r0 -wpa_supplicant-2.7-r5 -wpa_supplicant-openrc-2.7-r5 -xfsprogs-4.19.0-r1 -xfsprogs-extra-4.19.0-r1 -xorriso-1.4.8-r0 +udev-init-scripts-33-r0 +udev-init-scripts-openrc-33-r0 +usbredir-0.8.0-r0 +userspace-rcu-0.11.1-r0 +util-linux-2.34-r1 +util-linux-dev-2.34-r1 +vde2-libs-2.3.2-r12 +vim-8.2.0-r0 +virglrenderer-0.8.1-r0 +wayland-libs-client-1.17.0-r0 +wayland-libs-egl-1.17.0-r0 +wayland-libs-server-1.17.0-r0 +wireguard-tools-1.0.20200319-r0 +wireguard-tools-wg-1.0.20200319-r0 +wireguard-tools-wg-quick-1.0.20200319-r0 +wireless-tools-30_pre9-r1 +wpa_supplicant-2.9-r5 +wpa_supplicant-openrc-2.9-r5 +xfsprogs-5.3.0-r0 +xfsprogs-extra-5.3.0-r0 +xorriso-1.5.2-r0 +xxd-8.2.0-r0 xz-5.2.4-r0 xz-dev-5.2.4-r0 xz-libs-5.2.4-r0 -zfs-0.7.12-r1 -zfs-libs-0.7.12-r1 -zlib-1.2.11-r1 -zlib-dev-1.2.11-r1 +zfs-0.8.3-r1 +zfs-libs-0.8.3-r1 +zfs-openrc-0.8.3-r1 +zlib-1.2.11-r3 +zlib-dev-1.2.11-r3 +zstd-libs-1.4.4-r1 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 143a0fb27..9767f7df3 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,330 +1,382 @@ -# linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a-amd64 +# linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867-amd64 # automatically generated list of installed packages -abuild-3.3.1-r0 -alpine-baselayout-3.1.0-r3 -alpine-keys-2.1-r1 -apk-tools-2.10.3-r1 -argon2-libs-20171227-r2 +abuild-3.5.0-r0 +alpine-baselayout-3.2.0-r3 +alpine-keys-2.1-r2 +alsa-lib-1.2.1.2-r0 +apk-tools-2.10.5-r0 +argon2-libs-20190702-r1 argp-standalone-1.3-r3 -attr-2.4.47-r7 -attr-dev-2.4.47-r7 -audit-2.8.4-r0 -audit-libs-2.8.4-r0 -audit-openrc-2.8.4-r0 +attr-2.4.48-r0 +attr-dev-2.4.48-r0 +audit-2.8.5-r0 +audit-libs-2.8.5-r0 +audit-openrc-2.8.5-r0 autoconf-2.69-r2 automake-1.16.1-r0 -bash-4.4.19-r1 -bc-1.07.1-r0 -binutils-2.31.1-r2 -binutils-dev-2.31.1-r2 -bison-3.0.5-r0 -blkid-2.33-r0 +avahi-libs-0.7-r4 +bash-5.0.11-r1 +bc-1.07.1-r1 +binutils-2.33.1-r0 +binutils-dev-2.33.1-r0 +bison-3.4.2-r0 +blkid-2.34-r1 bridge-utils-1.6-r0 -bsd-compat-headers-0.7.1-r0 -btrfs-progs-4.19.1-r0 -btrfs-progs-dev-4.19.1-r0 -btrfs-progs-libs-4.19.1-r0 +bsd-compat-headers-0.7.2-r0 +btrfs-progs-5.4-r0 +btrfs-progs-dev-5.4-r0 +btrfs-progs-libs-5.4-r0 build-base-0.5-r1 -busybox-1.29.3-r10 -busybox-initscripts-3.1-r6 -bzip2-1.0.6-r7 -ca-certificates-20190108-r0 -ca-certificates-cacert-20190108-r0 +busybox-1.31.1-r9 +busybox-initscripts-3.2-r2 +bzip2-1.0.8-r1 +ca-certificates-20191127-r1 +ca-certificates-cacert-20191127-r1 +cairo-1.16.0-r2 +cdparanoia-libs-10.2-r7 cdrkit-1.1.11-r2 -celt051-0.5.1.3-r0 -cifs-utils-6.8-r0 -clang-5.0.2-r0 -clang-dev-5.0.2-r0 -clang-libs-5.0.2-r0 -clang-static-5.0.2-r0 -cmake-3.13.0-r0 -cmake-bash-completion-3.13.0-r0 -coreutils-8.30-r0 -cryptsetup-2.0.6-r0 -cryptsetup-libs-2.0.6-r0 -cryptsetup-openrc-2.0.6-r0 -curl-7.64.0-r3 +cifs-utils-6.9-r1 +clang-9.0.0-r1 +clang-dev-9.0.0-r1 +clang-libs-9.0.0-r1 +clang-static-9.0.0-r1 +cmake-3.15.5-r0 +cmake-bash-completion-3.15.5-r0 +coreutils-8.31-r0 +cryptsetup-2.2.2-r0 +cryptsetup-libs-2.2.2-r0 +cryptsetup-openrc-2.2.2-r0 +cups-libs-2.2.12-r1 +curl-7.67.0-r0 db-5.3.28-r1 -dbus-libs-1.10.28-r0 -device-mapper-libs-2.02.182-r0 -dhcpcd-7.0.8-r0 -dhcpcd-openrc-7.0.8-r0 +dbus-libs-1.12.16-r2 +device-mapper-2.02.186-r0 +device-mapper-event-libs-2.02.186-r0 +device-mapper-libs-2.02.186-r0 +device-mapper-udev-2.02.186-r0 +dhcpcd-8.1.2-r0 +dhcpcd-openrc-8.1.2-r0 diffutils-3.7-r0 dosfstools-4.1-r1 -dtc-1.4.7-r0 -e2fsprogs-1.44.5-r1 -e2fsprogs-dev-1.44.5-r1 -e2fsprogs-extra-1.44.5-r1 -e2fsprogs-libs-1.44.5-r1 -ebtables-2.0.10.4-r2 +dtc-1.5.1-r0 +e2fsprogs-1.45.5-r0 +e2fsprogs-dev-1.45.5-r0 +e2fsprogs-extra-1.45.5-r0 +e2fsprogs-libs-1.45.5-r0 elfutils-dev-0.168-r2 elfutils-libelf-0.168-r2 -ethtool-4.19-r0 -eudev-3.2.7-r0 -eudev-libs-3.2.7-r0 -expat-2.2.8-r0 +ethtool-5.3-r0 +eudev-3.2.9-r1 +eudev-libs-3.2.9-r1 +eudev-openrc-3.2.9-r1 +expat-2.2.9-r1 expect-5.45.4-r0 -fakeroot-1.23-r0 -file-5.36-r1 -findmnt-2.33-r0 -findutils-4.6.0-r1 -flex-2.6.4-r1 -flex-dev-2.6.4-r1 -flex-libs-2.6.4-r1 -fortify-headers-1.0-r0 +fakeroot-1.24-r0 +file-5.37-r1 +findmnt-2.34-r1 +findutils-4.7.0-r0 +flex-2.6.4-r2 +flex-dev-2.6.4-r2 +flex-libs-2.6.4-r2 +fontconfig-2.13.1-r2 +fortify-headers-1.1-r0 +freetype-2.10.1-r0 +fribidi-1.0.8-r0 fts-1.2.7-r1 fts-dev-1.2.7-r1 fuse-2.9.8-r2 -fuse-common-3.2.6-r1 -fuse-openrc-3.2.6-r1 -g++-8.3.0-r0 -gc-7.6.4-r2 -gcc-8.3.0-r0 +fuse-common-3.9.0-r0 +fuse-openrc-3.9.0-r0 +g++-9.2.0-r4 +gc-8.0.4-r0 +gcc-9.2.0-r4 gdbm-1.13-r1 -gettext-0.19.8.1-r4 -gettext-asprintf-0.19.8.1-r4 -gettext-dev-0.19.8.1-r4 -gettext-libs-0.19.8.1-r4 -git-2.20.2-r0 -glib-2.58.1-r3 +gettext-0.20.1-r2 +gettext-asprintf-0.20.1-r2 +gettext-dev-0.20.1-r2 +gettext-libs-0.20.1-r2 +git-2.24.1-r0 +git-perl-2.24.1-r0 +glib-2.62.6-r0 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 gnupg-2.2.19-r0 -gnutls-3.6.7-r0 -go-1.11.5-r0 -grep-3.1-r2 +gnutls-3.6.10-r1 +go-1.13.4-r1 +graphite2-1.3.13-r1 +grep-3.3-r0 +gst-plugins-base-1.16.2-r0 +gstreamer-1.16.2-r0 guile-2.0.14-r0 guile-libs-2.0.14-r0 gummiboot-48.1-r0 +harfbuzz-2.6.4-r0 hvtools-4.11.9-r0 -icu-libs-62.1-r0 +icu-libs-64.2-r1 installkernel-3.5-r0 -iperf3-3.6-r0 -iperf3-openrc-3.6-r0 -iproute2-4.19.0-r0 -iptables-1.6.2-r1 -ipvsadm-1.29-r0 +iperf3-3.7-r0 +iperf3-openrc-3.7-r0 +iproute2-5.4.0-r1 +iptables-1.8.3-r2 +iptables-openrc-1.8.3-r2 +ipvsadm-1.30-r0 isl-0.18-r0 -jansson-2.11-r0 +jansson-2.12-r0 jq-1.6-r0 json-c-0.13.1-r0 -keyutils-1.6-r0 -keyutils-libs-1.6-r0 -kmod-24-r1 -kmod-openrc-24-r1 +keyutils-1.6.1-r0 +keyutils-libs-1.6.1-r0 +kmod-26-r0 +kmod-openrc-26-r0 krb5-conf-1.0-r1 -krb5-dev-1.15.5-r0 -krb5-libs-1.15.5-r0 -krb5-server-ldap-1.15.5-r0 -lddtree-1.26-r1 -libacl-2.2.52-r5 -libaio-0.3.111-r0 -libarchive-3.3.3-r1 -libarchive-tools-3.3.3-r1 -libassuan-2.5.1-r0 -libatomic-8.3.0-r0 -libattr-2.4.47-r7 -libblkid-2.33-r0 -libbsd-0.8.6-r2 -libburn-1.5.0-r0 -libbz2-1.0.6-r7 -libc-dev-0.7.1-r0 -libc-utils-0.7.1-r0 -libc6-compat-1.1.20-r5 -libcap-2.26-r0 -libcap-ng-0.7.9-r1 -libcap-ng-dev-0.7.9-r1 -libcom_err-1.44.5-r1 -libcrypto1.1-1.1.1d-r2 -libcurl-7.64.0-r3 -libdrm-2.4.96-r0 -libedit-20181209.3.1-r0 -libedit-dev-20181209.3.1-r0 -libelf-0.8.13-r3 -libelf-dev-0.8.13-r3 -libepoxy-1.5.3-r0 -libevent-2.1.8-r6 -libexecinfo-1.1-r0 -libexecinfo-dev-1.1-r0 -libfdisk-2.33-r0 +krb5-dev-1.17.1-r0 +krb5-libs-1.17.1-r0 +krb5-server-ldap-1.17.1-r0 +ldb-2.0.8-r0 +lddtree-1.26-r2 +libacl-2.2.53-r0 +libaio-0.3.112-r1 +libarchive-3.4.2-r0 +libarchive-tools-3.4.2-r0 +libassuan-2.5.3-r0 +libatomic-9.2.0-r4 +libattr-2.4.48-r0 +libblkid-2.34-r1 +libbsd-0.10.0-r0 +libburn-1.5.2-r0 +libbz2-1.0.8-r1 +libc-dev-0.7.2-r0 +libc-utils-0.7.2-r0 +libc6-compat-1.1.24-r2 +libcap-2.27-r0 +libcap-ng-0.7.10-r0 +libcap-ng-dev-0.7.10-r0 +libcom_err-1.45.5-r0 +libcrypto1.1-1.1.1d-r3 +libcurl-7.67.0-r0 +libdrm-2.4.100-r0 +libedit-20191211.3.1-r0 +libedit-dev-20191211.3.1-r0 +libepoxy-1.5.4-r0 +libevent-2.1.11-r0 +libexecinfo-1.1-r1 +libexecinfo-dev-1.1-r1 +libfdisk-2.34-r1 +libfdt-1.5.1-r0 libffi-3.2.1-r6 -libgcc-8.3.0-r0 +libgcc-9.2.0-r4 libgcrypt-1.8.5-r0 libgmpxx-6.1.2-r1 -libgomp-8.3.0-r0 -libgpg-error-1.33-r0 -libintl-0.19.8.1-r4 -libisoburn-1.4.8-r0 -libisofs-1.4.8-r0 -libjpeg-turbo-1.5.3-r5 +libgomp-9.2.0-r4 +libgpg-error-1.36-r2 +libintl-0.20.1-r2 +libisoburn-1.5.2-r0 +libisofs-1.5.2-r0 +libjpeg-turbo-2.0.4-r0 libksba-1.3.5-r0 -libldap-2.4.48-r0 -libltdl-2.4.6-r5 -libmagic-5.36-r1 +libldap-2.4.48-r1 +libltdl-2.4.6-r7 +libmagic-5.37-r1 libmnl-1.0.4-r0 -libmount-2.33-r0 -libmspack-0.8_alpha-r0 -libnfsidmap-2.3.2-r1 -libnftnl-libs-1.1.1-r0 -libnl-1.1.4-r0 -libnl3-3.4.0-r0 -libogg-1.3.3-r2 -libpcap-1.9.0-r1 -libpciaccess-0.14-r0 -libpng-1.6.37-r0 -libressl-dev-2.7.5-r0 -libressl2.7-libcrypto-2.7.5-r0 -libressl2.7-libssl-2.7.5-r0 -libressl2.7-libtls-2.7.5-r0 -libsasl-2.1.27-r2 -libseccomp-2.3.3-r1 -libseccomp-dev-2.3.3-r1 -libsmartcols-2.33-r0 -libssh2-1.9.0-r1 -libssl1.1-1.1.1d-r2 -libstdc++-8.3.0-r0 -libtasn1-4.14-r0 -libtirpc-1.0.3-r0 -libtirpc-dev-1.0.3-r0 -libtls-standalone-2.7.4-r6 -libtool-2.4.6-r5 +libmount-2.34-r1 +libmspack-0.10.1_alpha-r0 +libnfsidmap-2.4.1-r2 +libnftnl-libs-1.1.5-r0 +libnl3-3.5.0-r0 +libogg-1.3.4-r0 +libpcap-1.9.1-r0 +libpciaccess-0.16-r0 +libpng-1.6.37-r1 +libressl-dev-3.0.2-r0 +libressl3.0-libcrypto-3.0.2-r0 +libressl3.0-libssl-3.0.2-r0 +libressl3.0-libtls-3.0.2-r0 +libsasl-2.1.27-r5 +libseccomp-2.4.2-r2 +libseccomp-dev-2.4.2-r2 +libsecret-0.19.1-r0 +libsmartcols-2.34-r1 +libssl1.1-1.1.1d-r3 +libstdc++-9.2.0-r4 +libtasn1-4.15.0-r0 +libtheora-1.1.1-r14 +libtirpc-1.1.4-r0 +libtirpc-dev-1.1.4-r0 +libtls-standalone-2.9.1-r0 +libtool-2.4.6-r7 libunistring-0.9.10-r0 libunwind-1.2.1-r3 libunwind-dev-1.2.1-r3 -libusb-1.0.22-r0 -libuuid-2.33-r0 -libuv-1.23.2-r0 -libverto-0.3.0-r1 -libwbclient-4.8.12-r1 -libx11-1.6.7-r0 -libxau-1.0.8-r3 -libxcb-1.13-r2 -libxdmcp-1.1.2-r5 -libxkbcommon-0.8.2-r0 -libxml2-2.9.9-r2 -linux-headers-4.18.13-r1 -llvm5-5.0.2-r0 -llvm5-dev-5.0.2-r0 -llvm5-libs-5.0.2-r0 -llvm5-static-5.0.2-r0 +libusb-1.0.23-r0 +libuuid-2.34-r1 +libuv-1.34.0-r0 +libverto-0.3.1-r1 +libvorbis-1.3.6-r2 +libwbclient-4.11.5-r0 +libx11-1.6.9-r0 +libxau-1.0.9-r0 +libxcb-1.13.1-r0 +libxdamage-1.1.5-r0 +libxdmcp-1.1.3-r0 +libxext-1.3.4-r0 +libxfixes-5.0.3-r2 +libxft-2.3.3-r0 +libxkbcommon-0.9.1-r0 +libxml2-2.9.10-r2 +libxrender-0.9.10-r3 +libxshmfence-1.3-r0 +libxv-1.0.11-r2 +libxxf86vm-1.1.4-r2 +linux-headers-4.19.36-r0 +linux-pam-1.3.1-r1 +llvm9-9.0.0-r1 +llvm9-dev-9.0.0-r1 +llvm9-libs-9.0.0-r1 +llvm9-static-9.0.0-r1 +lmdb-0.9.24-r1 lsscsi-0.30-r0 lua5.3-libs-5.3.5-r2 -luajit-2.1.0_beta3-r4 -luajit-dev-2.1.0_beta3-r4 -lz4-libs-1.8.3-r2 -lzip-1.20-r0 +luajit-2.1.0_beta3-r6 +luajit-dev-2.1.0_beta3-r6 +lvm2-libs-2.02.186-r0 +lz4-libs-1.9.2-r0 +lzip-1.21-r0 lzo-2.10-r2 m4-1.4.18-r1 make-4.2.1-r2 -mesa-gbm-18.1.7-r2 -mkinitfs-3.4.1-r1 -mpc1-1.0.3-r1 -mpc1-dev-1.0.3-r1 -mpfr-dev-3.1.5-r1 -mpfr3-3.1.5-r1 +mesa-19.2.7-r0 +mesa-egl-19.2.7-r0 +mesa-gbm-19.2.7-r0 +mesa-gl-19.2.7-r0 +mesa-glapi-19.2.7-r0 +mkinitfs-3.4.5-r0 +mpc1-1.1.0-r1 +mpc1-dev-1.1.0-r1 +mpfr-dev-4.0.2-r1 +mpfr4-4.0.2-r1 mtools-4.0.23-r0 -multipath-tools-0.7.9-r0 -musl-1.1.20-r5 -musl-dev-1.1.20-r5 -musl-utils-1.1.20-r5 -ncurses-dev-6.1_p20190105-r0 -ncurses-libs-6.1_p20190105-r0 -ncurses-terminfo-6.1_p20190105-r0 -ncurses-terminfo-base-6.1_p20190105-r0 -nettle-3.4.1-r0 -nfs-utils-2.3.2-r1 -nfs-utils-openrc-2.3.2-r1 -nghttp2-libs-1.35.1-r1 +multipath-tools-0.8.3-r4 +multipath-tools-openrc-0.8.3-r4 +musl-1.1.24-r2 +musl-dev-1.1.24-r2 +musl-utils-1.1.24-r2 +ncurses-dev-6.1_p20200118-r3 +ncurses-libs-6.1_p20200118-r3 +ncurses-terminfo-base-6.1_p20200118-r3 +nettle-3.5.1-r0 +nfs-utils-2.4.1-r2 +nfs-utils-openrc-2.4.1-r2 +nghttp2-libs-1.40.0-r0 npth-1.6-r0 oniguruma-6.9.4-r0 -open-iscsi-2.0.874-r2 -open-isns-lib-0.97-r4 -open-vm-tools-10.3.5-r1 -open-vm-tools-openrc-10.3.5-r1 -openntpd-6.2_p3-r2 -openrc-0.39.2-r3 -openresolv-3.9.0-r0 -openssh-keygen-7.9_p1-r6 -openssh-server-7.9_p1-r6 -openssh-server-common-7.9_p1-r6 -openssl-1.1.1d-r2 -openssl-dev-1.1.1d-r2 -opus-1.3-r0 -ovmf-0.0.20170624-r0 -p11-kit-0.23.14-r0 +open-iscsi-2.1.0-r2 +open-iscsi-libs-2.1.0-r2 +open-iscsi-openrc-2.1.0-r2 +open-isns-lib-0.99-r0 +open-vm-tools-10.3.10-r2 +open-vm-tools-openrc-10.3.10-r2 +openntpd-6.2_p3-r3 +openrc-0.42.1-r2 +openresolv-3.9.2-r0 +openssh-keygen-8.1_p1-r0 +openssh-server-8.1_p1-r0 +openssh-server-common-8.1_p1-r0 +openssl-1.1.1d-r3 +openssl-dev-1.1.1d-r3 +opus-1.3.1-r0 +orc-0.4.31-r0 +ovmf-0.0.201908-r0 +p11-kit-0.23.18.1-r0 +pango-1.44.7-r0 patch-2.7.6-r6 -pax-utils-1.2.3-r0 -pcre-8.42-r1 -pcre2-10.32-r1 -pcsc-lite-libs-1.8.24-r1 -perl-5.26.3-r0 +pax-utils-1.2.4-r0 +pcre-8.43-r0 +pcre2-10.34-r1 +pcsc-lite-libs-1.8.25-r2 +perl-5.30.1-r0 +perl-error-0.17028-r0 +perl-git-2.24.1-r0 pigz-2.4-r0 -pinentry-1.1.0-r0 -pixman-0.34.0-r6 -pkgconf-1.6.0-r0 +pinentry-1.1.0-r2 +pixman-0.38.4-r0 +pkgconf-1.6.3-r0 popt-1.16-r7 -python2-2.7.16-r1 -python3-3.6.9-r2 -qemu-3.1.0-r3 -qemu-aarch64-3.1.0-r3 -qemu-arm-3.1.0-r3 -qemu-guest-agent-3.1.0-r3 -qemu-img-3.1.0-r3 -qemu-ppc64le-3.1.0-r3 -qemu-system-arm-3.1.0-r3 -qemu-system-x86_64-3.1.0-r3 -readline-7.0.003-r1 -rhash-libs-1.3.6-r2 -rpcbind-0.2.4-r1 -rsync-3.1.3-r1 -rsync-openrc-3.1.3-r1 -scanelf-1.2.3-r0 -sed-4.5-r0 -sfdisk-2.33-r0 -sg3_utils-1.42-r1 +python2-2.7.16-r3 +python3-3.8.2-r0 +qemu-4.2.0-r0 +qemu-aarch64-4.2.0-r0 +qemu-arm-4.2.0-r0 +qemu-guest-agent-4.2.0-r0 +qemu-img-4.2.0-r0 +qemu-ppc64le-4.2.0-r0 +qemu-system-arm-4.2.0-r0 +qemu-system-x86_64-4.2.0-r0 +readline-8.0.1-r0 +rhash-libs-1.3.9-r0 +rpcbind-1.2.5-r0 +rpcbind-openrc-1.2.5-r0 +rsync-3.1.3-r2 +rsync-openrc-3.1.3-r2 +samba-client-libs-4.11.5-r0 +samba-common-libs-4.11.5-r0 +samba-common-server-libs-4.11.5-r0 +samba-heimdal-libs-4.11.5-r0 +samba-libs-4.11.5-r0 +samba-server-libs-4.11.5-r0 +scanelf-1.2.4-r0 +sed-4.7-r0 +sfdisk-2.34-r1 +sg3_utils-1.44-r0 sgdisk-1.0.4-r0 slang-2.3.2-r0 slang-dev-2.3.2-r0 snappy-1.1.7-r1 sntpc-0.9-r6 -socat-1.7.3.2-r5 -spice-server-0.14.1-r6 -sqlite-libs-3.28.0-r2 -squashfs-tools-4.3-r5 -ssl_client-1.29.3-r10 -strace-4.24-r0 -sudo-1.8.25_p1-r2 +socat-1.7.3.3-r1 +spice-server-0.14.2-r1 +sqlite-libs-3.30.1-r1 +squashfs-tools-4.4-r0 +ssl_client-1.31.1-r9 +strace-5.3-r1 +sudo-1.8.31-r0 swig-3.0.12-r4 -syslinux-6.04_pre1-r2 -talloc-2.1.14-r0 -tar-1.32-r0 +syslinux-6.04_pre1-r6 +talloc-2.3.1-r0 +tar-1.32-r1 tcl-8.6.9-r0 -tcpdump-4.9.2-r4 +tcpdump-4.9.3-r0 +tdb-libs-1.4.3-r0 +tevent-0.10.2-r0 tini-0.18.0-r0 tzdata-2019c-r0 -udev-init-scripts-32-r2 -udev-init-scripts-openrc-32-r2 -usbredir-0.7.1-r0 -userspace-rcu-0.10.1-r0 -util-linux-2.33-r0 -util-linux-dev-2.33-r0 -vde2-libs-2.3.2-r10 -vim-8.1.1365-r0 -virglrenderer-0.7.0-r1 -wayland-libs-server-1.16.0-r0 -wireguard-tools-1.0.20200102-r0 -wireguard-tools-wg-1.0.20200102-r0 -wireguard-tools-wg-quick-1.0.20200102-r0 -wireless-tools-30_pre9-r0 -wpa_supplicant-2.7-r5 -wpa_supplicant-openrc-2.7-r5 -xfsprogs-4.19.0-r1 -xfsprogs-extra-4.19.0-r1 -xorriso-1.4.8-r0 +udev-init-scripts-33-r0 +udev-init-scripts-openrc-33-r0 +usbredir-0.8.0-r0 +userspace-rcu-0.11.1-r0 +util-linux-2.34-r1 +util-linux-dev-2.34-r1 +vde2-libs-2.3.2-r12 +vim-8.2.0-r0 +virglrenderer-0.8.1-r0 +wayland-libs-client-1.17.0-r0 +wayland-libs-egl-1.17.0-r0 +wayland-libs-server-1.17.0-r0 +wireguard-tools-1.0.20200319-r0 +wireguard-tools-wg-1.0.20200319-r0 +wireguard-tools-wg-quick-1.0.20200319-r0 +wireless-tools-30_pre9-r1 +wpa_supplicant-2.9-r5 +wpa_supplicant-openrc-2.9-r5 +xfsprogs-5.3.0-r0 +xfsprogs-extra-5.3.0-r0 +xorriso-1.5.2-r0 +xxd-8.2.0-r0 xz-5.2.4-r0 xz-dev-5.2.4-r0 xz-libs-5.2.4-r0 -zfs-0.7.12-r1 -zfs-libs-0.7.12-r1 -zlib-1.2.11-r1 -zlib-dev-1.2.11-r1 +zfs-0.8.3-r1 +zfs-libs-0.8.3-r1 +zfs-openrc-0.8.3-r1 +zlib-1.2.11-r3 +zlib-dev-1.2.11-r3 +zstd-libs-1.4.4-r1 From 45dcbc38af01567056413a00d1fc31413001de8b Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 12:53:59 +0100 Subject: [PATCH 05/33] tools: Update to the latest linuxkit/alpine with the exception of grub. It does not compile with the latest version, see: https://github.com/linuxkit/linuxkit/issues/3494 Signed-off-by: Rolf Neugebauer --- tools/go-compile/Dockerfile | 2 +- tools/mkimage-iso-bios/Dockerfile | 2 +- tools/mkimage-iso-efi/Dockerfile | 2 +- tools/mkimage-iso/Dockerfile | 2 +- tools/mkimage-qcow2-efi/Dockerfile | 2 +- tools/mkimage-raw-bios/Dockerfile | 2 +- tools/mkimage-raw-efi/Dockerfile | 2 +- tools/mkimage-rpi3/Dockerfile | 2 +- tools/mkimage-squashfs/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile index 1cbed0a05..6ec5bb592 100644 --- a/tools/go-compile/Dockerfile +++ b/tools/go-compile/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/tools/mkimage-iso-bios/Dockerfile b/tools/mkimage-iso-bios/Dockerfile index 07fe81340..3cc8cf78f 100644 --- a/tools/mkimage-iso-bios/Dockerfile +++ b/tools/mkimage-iso-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile index 0a72af6bc..5251788d2 100644 --- a/tools/mkimage-iso-efi/Dockerfile +++ b/tools/mkimage-iso-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:a0e2211d39c3c71613f902b3e29746badee3295e AS grub -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-iso/Dockerfile b/tools/mkimage-iso/Dockerfile index 888dcd461..d7d40ee8a 100644 --- a/tools/mkimage-iso/Dockerfile +++ b/tools/mkimage-iso/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-qcow2-efi/Dockerfile b/tools/mkimage-qcow2-efi/Dockerfile index 15886248f..7e68b8eed 100644 --- a/tools/mkimage-qcow2-efi/Dockerfile +++ b/tools/mkimage-qcow2-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:a0e2211d39c3c71613f902b3e29746badee3295e AS grub -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-raw-bios/Dockerfile b/tools/mkimage-raw-bios/Dockerfile index c436d37f1..82a74a3ef 100644 --- a/tools/mkimage-raw-bios/Dockerfile +++ b/tools/mkimage-raw-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-raw-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile index 42e74a391..9bb0dd8d7 100644 --- a/tools/mkimage-raw-efi/Dockerfile +++ b/tools/mkimage-raw-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:a0e2211d39c3c71613f902b3e29746badee3295e AS grub -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/tools/mkimage-rpi3/Dockerfile b/tools/mkimage-rpi3/Dockerfile index fbee6f6e7..6db3db614 100644 --- a/tools/mkimage-rpi3/Dockerfile +++ b/tools/mkimage-rpi3/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as build RUN apk add \ bc \ bison \ diff --git a/tools/mkimage-squashfs/Dockerfile b/tools/mkimage-squashfs/Dockerfile index e780952d0..49b61d492 100644 --- a/tools/mkimage-squashfs/Dockerfile +++ b/tools/mkimage-squashfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ From 5d2f1ccbd019b21a80db4f2d4f67ea71068f33cf Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 13:16:03 +0100 Subject: [PATCH 06/33] Update use of tools to latest Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- docs/vendoring.md | 4 ++-- src/cmd/linuxkit/moby/output.go | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 3ed0b64fd..dd952d117 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION="v0.7+" GIT_COMMIT=$(shell git rev-list -1 HEAD) -GO_COMPILE=linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba +GO_COMPILE=linuxkit/go-compile:d3512774dc455a6dffbd1148a5294944636639a4 ifeq ($(OS),Windows_NT) LINUXKIT?=bin/linuxkit.exe diff --git a/docs/vendoring.md b/docs/vendoring.md index 3c6007bf4..81b69a9bb 100644 --- a/docs/vendoring.md +++ b/docs/vendoring.md @@ -22,7 +22,7 @@ docker run -it --rm \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ --entrypoint /go/bin/vndr \ -linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba +linuxkit/go-compile:d3512774dc455a6dffbd1148a5294944636639a4 ``` To update a single dependency: @@ -32,7 +32,7 @@ docker run -it --rm \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ --entrypoint /go/bin/vndr \ -linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba +linuxkit/go-compile:d3512774dc455a6dffbd1148a5294944636639a4 github.com/docker/docker ``` diff --git a/src/cmd/linuxkit/moby/output.go b/src/cmd/linuxkit/moby/output.go index 3235b2367..402adff5d 100644 --- a/src/cmd/linuxkit/moby/output.go +++ b/src/cmd/linuxkit/moby/output.go @@ -16,18 +16,18 @@ import ( var ( outputImages = map[string]string{ - "iso": "linuxkit/mkimage-iso:3d81e29b28ddf739becf10758eb6077b198d26d8", - "iso-bios": "linuxkit/mkimage-iso-bios:131849cfc4f3ede87c2ca19b6e2a4ef86354d1ce", - "iso-efi": "linuxkit/mkimage-iso-efi:667bd641fd37062eaf9d2173c768ebfcedad3876", - "raw-bios": "linuxkit/mkimage-raw-bios:6a2365f9c90901d7e0c70507e09a0cde23c5f321", - "raw-efi": "linuxkit/mkimage-raw-efi:27de80a2180621d3d772893381a9a1b7c5fb895a", - "squashfs": "linuxkit/mkimage-squashfs:c771872c292081a36333425c12e57393bd79f4e9", - "gcp": "linuxkit/mkimage-gcp:a7416d21d4ef642bb2ba560c8f7651250823546d", - "qcow2-efi": "linuxkit/mkimage-qcow2-efi:aeb084ea016689ed97bce3b52e2695591cb02693", + "iso": "linuxkit/mkimage-iso:4f1a2476ac515983ade72814cf08624c8968f65f", + "iso-bios": "linuxkit/mkimage-iso-bios:ea9a22b705b8201a201609905f7636fba8d061b9", + "iso-efi": "linuxkit/mkimage-iso-efi:c62420c8588a1d1440249c2c58f325700d72280f", + "raw-bios": "linuxkit/mkimage-raw-bios:4f3041edd9de02ef8f15bd92cc2d1afecb90084b", + "raw-efi": "linuxkit/mkimage-raw-efi:9ed69b7ac9e75aef6eebaed787223d9504dd967b", + "squashfs": "linuxkit/mkimage-squashfs:a1e99651662cb5781f8485a588ce4c85a75d7c9c", + "gcp": "linuxkit/mkimage-gcp:a296b67a8974ce2a5ce70f51ab5a65c820bff156", + "qcow2-efi": "linuxkit/mkimage-qcow2-efi:9a623f72befcaadb560290c29b9fb28f3843545b", "vhd": "linuxkit/mkimage-vhd:4cc60c4f46b07e11c64ba618e46b81fa0096c91f", "dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:99b9009ed54a793020d3ce8322a42e0cc06da71a", "vmdk": "linuxkit/mkimage-vmdk:b55ea46297a16d8a4448ce7f5a2df987a9602b27", - "rpi3": "linuxkit/mkimage-rpi3:9dd4f7735e19e495c2b0a856a52af15141816534", + "rpi3": "linuxkit/mkimage-rpi3:19c5354d6f8f68781adbc9bb62095ebb424222dc", } ) From 21852ee16b3df2d566eb0e83f162b54de40fb6c9 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 13:16:44 +0100 Subject: [PATCH 07/33] tests: Update packages to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- test/pkg/containerd/Dockerfile | 2 +- test/pkg/docker-bench/Dockerfile | 2 +- test/pkg/kernel-config/Dockerfile | 2 +- test/pkg/ns/Dockerfile | 4 ++-- test/pkg/poweroff/Dockerfile | 2 +- test/pkg/virtsock/Dockerfile | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 363cc0904..b6cd670fe 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) diff --git a/test/pkg/docker-bench/Dockerfile b/test/pkg/docker-bench/Dockerfile index 5aa6899fc..6fccd070f 100644 --- a/test/pkg/docker-bench/Dockerfile +++ b/test/pkg/docker-bench/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/test/pkg/kernel-config/Dockerfile b/test/pkg/kernel-config/Dockerfile index a129331b8..93858578b 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl bash diff --git a/test/pkg/ns/Dockerfile b/test/pkg/ns/Dockerfile index d2c08da79..bb6d51d1e 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ @@ -8,7 +8,7 @@ RUN apk add --no-cache --initdb -p /out \ musl RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --no-cache \ build-base \ git \ diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile index ac340f20e..b90326456 100644 --- a/test/pkg/poweroff/Dockerfile +++ b/test/pkg/poweroff/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile index 6fcb9f053..4b18def18 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ tini RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin From 336f7b44d390d0c38a0f495c64833609a048b5d3 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 13:40:24 +0100 Subject: [PATCH 08/33] Update use of test packages to latest Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/moby/linuxkit.go | 2 +- .../010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/000_qemu/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- .../010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_hyperkit/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/110_gcp/000_run/test.yml | 2 +- test/cases/020_kernel/002_config_4.14.x/test.yml | 4 ++-- test/cases/020_kernel/005_config_4.19.x/test.yml | 4 ++-- test/cases/020_kernel/011_config_5.4.x/test.yml | 4 ++-- test/cases/020_kernel/012_config_5.6.x/test.yml | 4 ++-- test/cases/020_kernel/102_kmod_4.14.x/test.yml | 2 +- test/cases/020_kernel/105_kmod_4.19.x/test.yml | 2 +- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 2 +- test/cases/020_kernel/112_kmod_5.6.x/test.yml | 2 +- .../010_echo-tcp-ipv4-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml | 4 ++-- .../011_echo-tcp-ipv4-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml | 4 ++-- .../012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml | 4 ++-- .../015_echo-tcp-ipv4-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml | 4 ++-- .../016_echo-tcp-ipv4-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml | 4 ++-- .../017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml | 4 ++-- .../020_echo-tcp-ipv6-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml | 4 ++-- .../021_echo-tcp-ipv6-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml | 4 ++-- .../022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml | 4 ++-- .../025_echo-tcp-ipv6-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml | 4 ++-- .../026_echo-tcp-ipv6-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml | 4 ++-- .../027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml | 4 ++-- .../030_echo-udp-ipv4-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/030_echo-udp-ipv4-short-1con-single/test.yml | 4 ++-- .../031_echo-udp-ipv4-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/031_echo-udp-ipv4-short-10con-single/test.yml | 4 ++-- .../032_echo-udp-ipv4-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml | 4 ++-- .../035_echo-udp-ipv4-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/035_echo-udp-ipv4-long-1con-single/test.yml | 4 ++-- .../036_echo-udp-ipv4-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/036_echo-udp-ipv4-long-10con-single/test.yml | 4 ++-- .../037_echo-udp-ipv4-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml | 4 ++-- .../040_echo-udp-ipv6-short-1con-single-reverse/test.yml | 4 ++-- .../010_veth/040_echo-udp-ipv6-short-1con-single/test.yml | 4 ++-- .../041_echo-udp-ipv6-short-10con-single-reverse/test.yml | 4 ++-- .../010_veth/041_echo-udp-ipv6-short-10con-single/test.yml | 4 ++-- .../042_echo-udp-ipv6-short-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml | 4 ++-- .../045_echo-udp-ipv6-long-1con-single-reverse/test.yml | 4 ++-- .../010_veth/045_echo-udp-ipv6-long-1con-single/test.yml | 4 ++-- .../046_echo-udp-ipv6-long-10con-single-reverse/test.yml | 4 ++-- .../010_veth/046_echo-udp-ipv6-long-10con-single/test.yml | 4 ++-- .../047_echo-udp-ipv6-long-5con-multi-reverse/test.yml | 4 ++-- .../010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml | 4 ++-- .../010_echo-short-1con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/010_echo-short-1con-single/test.yml | 4 ++-- .../011_echo-short-10con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/011_echo-short-10con-single/test.yml | 4 ++-- .../012_echo-short-5con-multi-reverse/test.yml | 4 ++-- .../050_unix-domain/012_echo-short-5con-multi/test.yml | 4 ++-- .../015_echo-long-1con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/015_echo-long-1con-single/test.yml | 4 ++-- .../016_echo-long-10con-single-reverse/test.yml | 4 ++-- .../050_unix-domain/016_echo-long-10con-single/test.yml | 4 ++-- .../050_unix-domain/017_echo-long-5con-multi-reverse/test.yml | 4 ++-- .../050_unix-domain/017_echo-long-5con-multi/test.yml | 4 ++-- .../200_namespace/100_mix/010_veth-unix-domain-echo/test.yml | 4 ++-- .../100_mix/011_veth-unix-domain-echo-reverse/test.yml | 4 ++-- .../200_namespace/100_mix/012_veth-ipv4-echo/test.yml | 4 ++-- .../200_namespace/100_mix/013_veth-ipv6-echo/test.yml | 4 ++-- .../200_namespace/100_mix/014_veth-tcp-echo/test.yml | 4 ++-- .../200_namespace/100_mix/015_veth-udp-echo/test.yml | 4 ++-- .../200_namespace/100_mix/020_unix-domain-echo/test.yml | 4 ++-- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/002_bpftrace/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 4 ++-- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/000_simple/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/001_luks/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/002_key/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- .../cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../006_format_mount/005_by_device_force/test.yml | 2 +- .../cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/012_losetup/test.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- test/cases/040_packages/032_bcc/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 4 ++-- test/pkg/ns/template.yml | 2 +- 118 files changed, 191 insertions(+), 191 deletions(-) diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index 105c512b8..8afcef98a 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -23,7 +23,7 @@ onboot: - name: mkimage image: linuxkit/mkimage:v0.7 - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 trust: org: - linuxkit diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index 7330dddc3..622b7e324 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index 7330dddc3..622b7e324 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index dfccd9793..80696a51b 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index abdfff6f6..5a66516ca 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index abdfff6f6..5a66516ca 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index abdfff6f6..5a66516ca 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index abdfff6f6..5a66516ca 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 6c170d126..3d2e5399a 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index abdfff6f6..5a66516ca 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index abdfff6f6..5a66516ca 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: 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 b07c43b4a..5e3ad5bc9 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/020_kernel/002_config_4.14.x/test.yml b/test/cases/020_kernel/002_config_4.14.x/test.yml index f3936c194..078f29e87 100644 --- a/test/cases/020_kernel/002_config_4.14.x/test.yml +++ b/test/cases/020_kernel/002_config_4.14.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:94fdeb494e09200fc05b6da39822aabfaca234e4 + image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/005_config_4.19.x/test.yml b/test/cases/020_kernel/005_config_4.19.x/test.yml index 3c117cb94..c9e567076 100644 --- a/test/cases/020_kernel/005_config_4.19.x/test.yml +++ b/test/cases/020_kernel/005_config_4.19.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:94fdeb494e09200fc05b6da39822aabfaca234e4 + image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: 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 3077100ee..24319eb75 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 @@ -6,9 +6,9 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:94fdeb494e09200fc05b6da39822aabfaca234e4 + image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: 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 30319c9cc..581317378 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 @@ -6,9 +6,9 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:94fdeb494e09200fc05b6da39822aabfaca234e4 + image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: 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 05ba661ae..8c43762c3 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 @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: 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 02b322326..20547db67 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 @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: 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 292e4b7a8..2aca449fa 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 @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: 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 6b2f7e59c..946de96e1 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 @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index bd9f0f95c..6de4ccbed 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index 99118bffe..212602b06 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 6baab7dad..eed50f0d5 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 6baab7dad..eed50f0d5 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 9af9ac9d6..b55522791 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 9af9ac9d6..b55522791 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index 7ad25060c..b217f48bb 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index 2b96ddde9..f768ee8ea 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index ad0d0db8f..36ad8f236 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index ad0d0db8f..36ad8f236 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index f96bf294b..cfa947ee6 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index f96bf294b..cfa947ee6 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index 5f3617b8b..99a3593d3 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index 71db78959..e193be977 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index d3bb3813f..02978e21e 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index d3bb3813f..02978e21e 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index ecfd18988..7389d6136 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index ecfd18988..7389d6136 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 9e1803dcd..ad170f7b5 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index 316aaf62a..fe7446a98 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index f6f5883d6..869b5157f 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index f6f5883d6..869b5157f 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index c86d345d4..bb644a843 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index c86d345d4..bb644a843 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index b5d56af3d..8ec8ec3fb 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 5bcb21051..cb8f7cd41 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index a48de35e5..ba6e2057b 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index a48de35e5..ba6e2057b 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index fdbc45e0f..0c252e70b 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index fdbc45e0f..0c252e70b 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index 033a94b39..a0efd6a68 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index c27b5048d..64e9ce576 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index 3c946da45..2e7297e1d 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index 3c946da45..2e7297e1d 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index 19f4e2d0e..85df4a7e5 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index 19f4e2d0e..85df4a7e5 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index 78f59d86d..6b1ff3441 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index 205c999c3..be3456a94 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index 42940053a..f8ed392d7 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index 42940053a..f8ed392d7 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index 1516296b6..8885c5708 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index 1516296b6..8885c5708 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index f0a25c239..3368fdf7d 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index ece3da1e9..71bd58672 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index 8d6125504..e83051209 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index 8d6125504..e83051209 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index ff63cb7d6..48fd701a1 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index ff63cb7d6..48fd701a1 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index fba510c4c..e4da14ee1 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml index 9cceb5be8..02352a3b2 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index e786841d3..49659be13 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml index e786841d3..49659be13 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index 46bfb64e3..37bc6a7a7 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml index 46bfb64e3..37bc6a7a7 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index 4991aef1a..288061b46 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1", "-r"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml index 637af6125..b015c3685 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index a320575a9..366530b67 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml index a320575a9..366530b67 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index 918c4c30d..993c9eb08 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml index 918c4c30d..993c9eb08 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml index 450c598d9..2f47ef705 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml index 6c873237c..efa0a8769 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml index efaf1d182..c0f9ed707 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml index 386997177..e937506b3 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml index f7b4f3b3b..0e79d2b5e 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml index 443bece65..f6f9f0821 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml index 4238b5c74..8f0d1c95a 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:ee7ca117a0651b922387d2d8a42b020538738414 + image: linuxkit/test-ns:83f1e8d9da24672da10ea7c089321c397afb91ec command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 9c3fb188b..daa53d4a6 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -34,7 +34,7 @@ services: - /run:/var/run command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] - name: test-docker-bench - image: linuxkit/test-docker-bench:f1076f4c5addc6bc3026edeed5cf6d6da6b5c165 + image: linuxkit/test-docker-bench:51388c7c187cd8a39d4afcbdf18482ad2833299c ipc: host pid: host net: host diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index de179a439..a1b3e0194 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -12,7 +12,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 95932d249..0975c144a 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -14,7 +14,7 @@ onboot: - /proc/sys/fs/binfmt_misc:/binfmt_misc command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 8561e43c5..779c543c7 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -17,7 +17,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index b7fc5a4f8..a9a2d546e 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -13,7 +13,7 @@ onboot: - /etc:/host-etc command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 284567db3..a99dd9caf 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -18,9 +18,9 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:f70b41d120e4593a5e09bed1072268489f120535 + image: linuxkit/test-containerd:fa781a2ec490a63140a2e90f9c8d13c735dd4c5f - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 trust: org: - linuxkit diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 50cba310c..dfc5257c6 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -15,7 +15,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index 49cb33516..9b1d9d5be 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -16,7 +16,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index d83d5a468..61c5866f1 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -16,7 +16,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index f0cdaabbf..7095c5e25 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -19,7 +19,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 2fdb7e8cd..7acad8f0e 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -16,7 +16,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index fe3d4fd54..2e3c9e668 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -17,7 +17,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index c7dfd94f5..a87b24fef 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -20,7 +20,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 9b25fab95..34d9f1ea2 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -21,7 +21,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 8f79ac1f9..8b2a24a71 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -17,7 +17,7 @@ onboot: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 20b79c6eb..07a34d6c5 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index 981b035b3..b2964316a 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 3e23dd468..08c22271a 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 3cae3097c..4753d50cb 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index e06010075..8a7a4c8de 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -21,7 +21,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 72e7dfe89..a168f654b 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -18,7 +18,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index 80f3cb676..8280ec199 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -26,7 +26,7 @@ onboot: - CAP_SYS_ADMIN - CAP_MKNOD - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 40e850f4e..a54a227db 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -25,7 +25,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 46327c5ad..d3985113f 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -16,7 +16,7 @@ onboot: - /dev:/dev command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index b58014f7a..cb75aba28 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -8,7 +8,7 @@ onboot: - name: mkimage image: linuxkit/mkimage:v0.7 - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 trust: org: - linuxkit diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index d5a739d70..9d1fa6afc 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 trust: org: - linuxkit diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 49b835408..c236b0f7b 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -16,7 +16,7 @@ onboot: - /check.sh:/check.sh command: ["sh", "./check.sh"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index 3ade12ba0..a8df3ca6e 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -17,7 +17,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "10"] files: - path: check.sh diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 4fbb0337d..8d8c10983 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -11,7 +11,7 @@ onboot: binds: - /etc/ltp/baseline:/etc/ltp/baseline - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 files: - path: /etc/ltp/baseline contents: "100" diff --git a/test/hack/test.yml b/test/hack/test.yml index 9af6058d9..a4bc2b002 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -12,9 +12,9 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: linuxkit/test-kernel-config:94fdeb494e09200fc05b6da39822aabfaca234e4 + image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "120"] trust: org: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index c5e18ee74..d431a3cb3 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -14,7 +14,7 @@ onboot: - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:b498d30dd9660090565537fceb9e757618737a85 + image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: From 678e904ae3ee44c17c1240d5464b6c8f6d4e0bcd Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 13:41:06 +0100 Subject: [PATCH 09/33] Update all uses of alpine:3.9 to alpine:3.11 Signed-off-by: Rolf Neugebauer --- examples/docker-for-mac.yml | 4 ++-- examples/logging.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- test/cases/020_kernel/102_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/105_kmod_4.19.x/Dockerfile | 2 +- test/cases/020_kernel/111_kmod_5.4.x/Dockerfile | 2 +- test/cases/020_kernel/112_kmod_5.6.x/Dockerfile | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 4 ++-- test/cases/040_packages/002_bpftrace/test.yml | 4 ++-- test/cases/040_packages/003_ca-certificates/test.yml | 4 ++-- test/cases/040_packages/004_dhcpcd/test.yml | 4 ++-- test/cases/040_packages/004_dm-crypt/000_simple/test.yml | 4 ++-- test/cases/040_packages/004_dm-crypt/001_luks/test.yml | 4 ++-- test/cases/040_packages/004_dm-crypt/002_key/test.yml | 4 ++-- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- .../cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/012_losetup/test.yml | 4 ++-- test/cases/040_packages/019_sysctl/test.yml | 4 ++-- test/cases/040_packages/023_wireguard/test.yml | 4 ++-- test/cases/040_packages/030_logwrite/test.yml | 4 ++-- test/cases/040_packages/031_kmsg/test.yml | 4 ++-- test/cases/040_packages/032_bcc/test.yml | 4 ++-- 33 files changed, 47 insertions(+), 47 deletions(-) diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index ac2004f40..20d1f9431 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -30,7 +30,7 @@ onboot: 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 - image: alpine:3.9 + image: alpine:3.11 binds: - /var/:/host_var:rbind,rshared capabilities: @@ -39,7 +39,7 @@ onboot: command: ["sh", "-c", "mkdir -p /host_var/vpnkit/port && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] # move logs to the mounted disk (this is a temporary fix until we can limit the log sizes) - name: move-logs - image: alpine:3.9 + image: alpine:3.11 binds: - /var:/host_var command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] diff --git a/examples/logging.yml b/examples/logging.yml index eb54cb29a..78469f273 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -22,7 +22,7 @@ services: - INSECURE=true # A service which generates log messages for testing - name: write-to-the-logs - image: alpine:3.9 + 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:v0.7 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index b41a43678..ddb4b6a72 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -10,7 +10,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit - image: alpine:3.9 + image: alpine:3.11 binds: - /var/:/host_var:rbind,rshared capabilities: diff --git a/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile index 99fe12b0e..824b0e1cb 100644 --- a/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.9 +FROM alpine:3.11 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile b/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile index db9fd3fb7..478941990 100644 --- a/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile +++ b/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.9 +FROM alpine:3.11 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile index 2edba79ce..efa05da14 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile +++ b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.9 +FROM alpine:3.11 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile b/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile index 483762da6..6ecb4f797 100644 --- a/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile +++ b/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.9 +FROM alpine:3.11 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index a1b3e0194..a58f97b2c 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 onboot: - name: test - image: alpine:3.9 + image: alpine:3.11 readonly: true binds: - /check.sh:/check.sh diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 0975c144a..68423858d 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -8,7 +8,7 @@ onboot: - name: binfmt image: linuxkit/binfmt:v0.7 - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /check.sh:/check.sh - /proc/sys/fs/binfmt_misc:/binfmt_misc @@ -23,4 +23,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - alpine:3.11 diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 779c543c7..ca19251ec 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -7,7 +7,7 @@ init: - linuxkit/bpftrace:v0.7 onboot: - name: bpftrace-test - image: alpine:3.9 + image: alpine:3.11 binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] @@ -26,4 +26,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - 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 a9a2d546e..9521984cd 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -7,7 +7,7 @@ init: - linuxkit/ca-certificates:v0.7 onboot: - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /check.sh:/check.sh - /etc:/host-etc @@ -22,4 +22,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - alpine:3.11 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index dfc5257c6..df2f174b8 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test - image: alpine:3.9 + image: alpine:3.11 net: host binds: - /check.sh:/check.sh @@ -24,4 +24,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - 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 9b1d9d5be..6505a6225 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 @@ -9,7 +9,7 @@ onboot: image: linuxkit/dm-crypt:v0.7 command: ["/usr/bin/crypto", "it_is_encrypted", "/dev/sda"] - name: test - image: alpine:3.9 + image: alpine:3.11 net: host binds: - /check.sh:/check.sh @@ -27,4 +27,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - 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 61c5866f1..6feee8640 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 @@ -9,7 +9,7 @@ onboot: image: linuxkit/dm-crypt:v0.7 command: ["/usr/bin/crypto", "-l", "it_is_encrypted", "/dev/sda"] - name: test - image: alpine:3.9 + image: alpine:3.11 net: host binds: - /check.sh:/check.sh @@ -27,4 +27,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - 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 7095c5e25..ca724d076 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 @@ -12,7 +12,7 @@ onboot: - /dev/:/dev - /some/other/enc_key:/some/other/enc_key - name: test - image: alpine:3.9 + image: alpine:3.11 net: host binds: - /check.sh:/check.sh @@ -30,4 +30,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - alpine:3.11 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 7acad8f0e..138d6178d 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 @@ -11,7 +11,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] 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 2e3c9e668..b5c810095 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index a87b24fef..ab38553b4 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 @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] 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 34d9f1ea2..2ce192a30 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 8b2a24a71..c195a4c9d 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] 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 07a34d6c5..829efc9b5 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index b2964316a..ebe2c0feb 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 08c22271a..5c91c6593 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 4753d50cb..ecb29511b 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 8a7a4c8de..2a534b58c 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 @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index a168f654b..6f3923d61 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index a54a227db..f9e5c04db 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 @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test - image: alpine:3.9 + image: alpine:3.11 binds: - /var/lib/docker:/var/lib/docker - /var/foo:/var/foo diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index d3985113f..03ebe7d14 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/losetup:v0.7 command: ["/usr/bin/loopy", "-c", "/var/test.img"] - name: test - image: alpine:3.9 + image: alpine:3.11 net: host binds: - /check.sh:/check.sh @@ -25,4 +25,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - alpine:3.11 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index c236b0f7b..e87cbc540 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -8,7 +8,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:v0.7 - name: test - image: alpine:3.9 + image: alpine:3.11 net: host pid: host ipc: host @@ -25,4 +25,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - alpine:3.11 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index e6089b55c..37402ad24 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -38,7 +38,7 @@ onboot: net: /run/netns/wg1 onshutdown: - name: test2 - image: alpine:3.9 + image: alpine:3.11 binds: - /tmp:/tmp - /check.sh:/check.sh @@ -55,7 +55,7 @@ services: - CAP_SETGID - CAP_DAC_OVERRIDE - name: test - image: alpine:3.9 + image: alpine:3.11 net: /run/netns/wg1 pid: host capabilities: diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index c858b1b76..7331012bc 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -16,7 +16,7 @@ services: image: linuxkit/logwrite:v0.7 command: ["/usr/bin/logwrite", "-max-log-size", "1024"] - name: check-the-logs - image: alpine:3.9 + image: alpine:3.11 binds: - /check.sh:/check.sh - /dev/console:/dev/console @@ -32,4 +32,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - alpine:3.11 diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index abca9f84a..e6e84aa49 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -13,7 +13,7 @@ services: - name: write-and-rotate-logs image: linuxkit/logwrite:v0.7 - name: check-the-logs - image: alpine:3.9 + image: alpine:3.11 binds: - /check.sh:/check.sh - /dev/console:/dev/console @@ -29,4 +29,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - alpine:3.11 diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index a8df3ca6e..10d2f0c73 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -7,7 +7,7 @@ init: - linuxkit/kernel-bcc:5.4.30 onboot: - name: check-bcc - image: alpine:3.9 + image: alpine:3.11 binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] @@ -26,4 +26,4 @@ trust: org: - linuxkit image: - - alpine:3.9 + - alpine:3.11 From 6ae22d1754bda98f027683e5777a9567715a761c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 13:41:46 +0100 Subject: [PATCH 10/33] tests: Update tests cases to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/102_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/105_kmod_4.19.x/Dockerfile | 2 +- test/cases/020_kernel/111_kmod_5.4.x/Dockerfile | 2 +- test/cases/020_kernel/112_kmod_5.6.x/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile index 824b0e1cb..6d34efa7e 100644 --- a/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.14.175 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile b/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile index 478941990..e3159ca80 100644 --- a/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile +++ b/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.19.114 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile index efa05da14..dd6f0ed7a 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile +++ b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:5.4.30 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile b/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile index 6ecb4f797..73f17880d 100644 --- a/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile +++ b/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:5.6.2 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / From 2f4034d36cc12743e56a6ae502000e406eefe0e6 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 13:42:11 +0100 Subject: [PATCH 11/33] 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/containerd/Dockerfile | 2 +- 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/init/Dockerfile | 4 ++-- 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 +- 40 files changed, 46 insertions(+), 46 deletions(-) diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile index edd97e881..50627242f 100644 --- a/pkg/acpid/Dockerfile +++ b/pkg/acpid/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror2 +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 a1bcc3998..88772dbc3 100644 --- a/pkg/auditd/Dockerfile +++ b/pkg/auditd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 c361ddfa6..005094076 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y qemu-user-static && \ mv /usr/bin/qemu-ppc64le-static /usr/bin/qemu-ppc64le && \ mv /usr/bin/qemu-s390x-static /usr/bin/qemu-s390x -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 faa638f2d..e2e25bf88 100644 --- a/pkg/bpftrace/Dockerfile +++ b/pkg/bpftrace/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --update \ bison \ build-base \ diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile index 91b7d5ca9..9a0af4406 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as alpine +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as alpine RUN apk add ca-certificates diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index 453ebfe0e..4a7ece8fd 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as build RUN apk add --no-cache bash go git musl-dev linux-headers make @@ -16,7 +16,7 @@ RUN go get -d ${GITREPO} \ && mv cadvisor /usr/bin/ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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/containerd/Dockerfile b/pkg/containerd/Dockerfile index acc05c765..590540a4f 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a as alpine +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index d1121a510..8bbd897a9 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 2518e2505..60a12fdf1 100644 --- a/pkg/dm-crypt/Dockerfile +++ b/pkg/dm-crypt/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 bc97ff163..4f5e7c6b6 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 ad1531caf..48f8d1741 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 5ec850768..2ef53f488 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -1,7 +1,7 @@ # Make modules from a recentish kernel available FROM linuxkit/kernel:4.14.126 AS kernel -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --no-cache git kmod # Clone the firmware repository diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 3108d4c4f..76bd4290c 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 483ac677f..6a3f7773e 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 80649a7f9..e7c05ce49 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN apk add --no-cache go musl-dev git ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 24e1efc43..da935326b 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service -FROM linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile index 284aaf430..072265618 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:129009483d68d7d396b8014cddcd22c0f1601e02 AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 44869edd0..46d08aa50 100644 --- a/pkg/kmsg/Dockerfile +++ b/pkg/kmsg/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 56b58f904..d2093ad3b 100644 --- a/pkg/logwrite/Dockerfile +++ b/pkg/logwrite/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 3dd5131e1..3af6de8e0 100644 --- a/pkg/losetup/Dockerfile +++ b/pkg/losetup/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 724c51623..fe5429cf0 100644 --- a/pkg/memlogd/Dockerfile +++ b/pkg/memlogd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 7f797f739..ff219ee1c 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 05c5c3336..d893a9963 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 c94fa3df3..e95692dc6 100644 --- a/pkg/modprobe/Dockerfile +++ b/pkg/modprobe/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 1ea8e95fb..53b047675 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 d95cb0030..2d8de2d5c 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as build RUN apk add --no-cache go git musl-dev make diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index 2fdd6442b..72426b31b 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 c90cd2648..60c0baac6 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 b07d19081..4415780a0 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 125e6a6c7..f8e585a81 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 cfffd8c92..22342f56c 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as alpine +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index 6c9c08711..33e745d7d 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 6a056bb51..e76f7e381 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 de2a038f5..083a9f604 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 3d08ab4e8..6fe0c0472 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 7fcd4a8d5..7b55cc026 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:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 49ecc4073..eb3fe8081 100644 --- a/pkg/tss/Dockerfile +++ b/pkg/tss/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 21b17cbb9..4af40f59c 100644 --- a/pkg/vpnkit-expose-port/Dockerfile +++ b/pkg/vpnkit-expose-port/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 78590e2b5..30ebdae87 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 32b1c6b1a..1e5bddfd3 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin From 5c190c96e157931b863f8e99c5754a31f0488041 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 13:47:51 +0100 Subject: [PATCH 12/33] pkg/cadvisor: Bump to v0.36.0 Signed-off-by: Rolf Neugebauer --- pkg/cadvisor/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index 4a7ece8fd..e22caab86 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --no-cache bash go git musl-dev linux-headers make ENV GOPATH=/go PATH=$PATH:/go/bin ENV GITREPO=github.com/google/cadvisor -ENV COMMIT=v0.33.0 +ENV COMMIT=v0.36.0 ADD /static.patch /tmp/ From facc612603694771515498313a98f54422fe5dc4 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 13:48:37 +0100 Subject: [PATCH 13/33] pkg/node_exporter: Bump to v0.18.1 Signed-off-by: Rolf Neugebauer --- pkg/node_exporter/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/node_exporter/Dockerfile b/pkg/node_exporter/Dockerfile index 2d8de2d5c..144be7543 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --no-cache go git musl-dev make ENV GOPATH=/go PATH=$PATH:/go/bin ENV GITREPO=github.com/prometheus/node_exporter -ENV COMMIT=v0.16.0 +ENV COMMIT=v0.18.1 RUN go get -d ${GITREPO} \ && cd /go/src/${GITREPO} \ From 0b750af7cd0a2c5f3fcfbcef6bf5deff4bd01718 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 14:40:16 +0100 Subject: [PATCH 14/33] pkg/node_exporter: Fix build Add curla and gcc Signed-off-by: Rolf Neugebauer --- pkg/node_exporter/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/node_exporter/Dockerfile b/pkg/node_exporter/Dockerfile index 144be7543..b070fadf9 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as build -RUN apk add --no-cache go git musl-dev make +RUN apk add --no-cache go git musl-dev make curl gcc ENV GOPATH=/go PATH=$PATH:/go/bin ENV GITREPO=github.com/prometheus/node_exporter From bd5fb29ba1bb821955d393a44cb72283f9a4fdff Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 13:49:54 +0100 Subject: [PATCH 15/33] pkg/firmware: update to latest Signed-off-by: Rolf Neugebauer --- pkg/firmware-all/Dockerfile | 2 +- pkg/firmware/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/firmware-all/Dockerfile b/pkg/firmware-all/Dockerfile index 48f8d1741..8c27ac6af 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -3,7 +3,7 @@ RUN apk add --no-cache git # Make sure you also update the FW_COMMIT in ../firmware/Dockerfile ENV FW_URL=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git -ENV FW_COMMIT=dff98c6c57383fe343407bcb7b6e775e0b87274f +ENV FW_COMMIT=edf390c23a4e185ff36daded36575f669f5059f7 RUN mkdir -p /out/lib && \ cd /out/lib && \ diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index 2ef53f488..bb179a082 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache git kmod # Clone the firmware repository # Make sure you also update the FW_COMMIT in ../firmware-all/Dockerfile ENV FW_URL=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git -ENV FW_COMMIT=dff98c6c57383fe343407bcb7b6e775e0b87274f +ENV FW_COMMIT=edf390c23a4e185ff36daded36575f669f5059f7 WORKDIR / RUN git clone ${FW_URL} && \ cd /linux-firmware && \ From 384b439d05132a20b2c1c387002cac744481e38a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 14:08:39 +0100 Subject: [PATCH 16/33] pkg/firmware: Use kernel v5.4.x as the base this determines which firmware packages are included. Signed-off-by: Rolf Neugebauer --- pkg/firmware/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index bb179a082..34fdc0d0e 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -1,5 +1,5 @@ # Make modules from a recentish kernel available -FROM linuxkit/kernel:4.14.126 AS kernel +FROM linuxkit/kernel:5.4.28 AS kernel FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --no-cache git kmod From cd92ad3f16db59367be516d6f9ab8882848e7537 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 15:22:03 +0100 Subject: [PATCH 17/33] pkg/firmware: Fix firmware extraction Some drivers offer mutliple firmwares with the WHENCE file defining the default. Use the cope-firmware.sh script to create a copy of the firmware repository with the defaults copied in to the right place. Signed-off-by: Rolf Neugebauer --- pkg/firmware-all/Dockerfile | 13 +++++++------ pkg/firmware/Dockerfile | 6 +++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkg/firmware-all/Dockerfile b/pkg/firmware-all/Dockerfile index 8c27ac6af..dd60092a7 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -5,12 +5,13 @@ RUN apk add --no-cache git ENV FW_URL=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git ENV FW_COMMIT=edf390c23a4e185ff36daded36575f669f5059f7 -RUN mkdir -p /out/lib && \ - cd /out/lib && \ - git clone ${FW_URL} firmware && \ - cd firmware && \ - git checkout ${FW_COMMIT} && \ - rm -rf .git +RUN git clone ${FW_URL} && \ + cd /linux-firmware && \ + git checkout ${FW_COMMIT} + +RUN mkdir -p /out/lib/firmware && \ + cd /linux-firmware && \ + ./copy-firmware.sh /out/lib/firmware FROM scratch WORKDIR / diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index 34fdc0d0e..c22732ad6 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -25,6 +25,10 @@ RUN set -e && \ ;; \ esac +# Create copy of files with symlinks based on WHENCE +RUN cd /linux-firmware && \ + ./copy-firmware.sh /linux-firmware-whence + # Extract kernel modules for WORKDIR / COPY --from=kernel /kernel.tar /kernel.tar @@ -34,7 +38,7 @@ RUN tar xf /kernel.tar RUN set -e && \ for fw in $(find /lib/modules -name \*.ko -exec modinfo --field=firmware {} \;); do \ mkdir -p "/out/lib/firmware/$(dirname $fw)" && \ - cp "/linux-firmware/$fw" "/out/lib/firmware/$fw"; \ + cp "/linux-firmware-whence/$fw" "/out/lib/firmware/$fw"; \ done FROM scratch From 5301dbf352142fa7059ed9e7f9b181b28444cabf Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 15:37:28 +0100 Subject: [PATCH 18/33] pkg/firmware: Disable firmware packages for s390x Reduce the number of packages to build for s390x. Firmware is only used for physical devices, so disable it for s390x where we mostly run in virtual machines. Signed-off-by: Rolf Neugebauer --- pkg/firmware-all/build.yml | 3 +++ pkg/firmware/build.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkg/firmware-all/build.yml b/pkg/firmware-all/build.yml index 8a6e84585..626cf0e44 100644 --- a/pkg/firmware-all/build.yml +++ b/pkg/firmware-all/build.yml @@ -1,2 +1,5 @@ image: firmware-all network: true +arches: + - amd64 + - arm64 diff --git a/pkg/firmware/build.yml b/pkg/firmware/build.yml index 1a926eabc..ed5e77618 100644 --- a/pkg/firmware/build.yml +++ b/pkg/firmware/build.yml @@ -1,2 +1,5 @@ image: firmware network: true +arches: + - amd64 + - arm64 From 8a03a0445436bf2b5e995a96eee1d3dae9c45a0c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 14:10:00 +0100 Subject: [PATCH 19/33] Bump dind to 19.03.8-dind Signed-off-by: Rolf Neugebauer --- examples/cadvisor.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 2e62746c8..73950534f 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -31,7 +31,7 @@ services: image: linuxkit/openntpd:v0.7 - name: docker - image: docker:18.06.0-ce-dind + image: docker:19.03.8-dind capabilities: - all net: host diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 20d1f9431..3f8ffbbca 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -83,7 +83,7 @@ services: # 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. - name: docker-dfm - image: docker:18.06.0-ce-dind + image: docker:19.03.8-dind capabilities: - all net: host diff --git a/examples/docker.yml b/examples/docker.yml index cdbf699de..c93d95386 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -28,7 +28,7 @@ services: - name: ntpd image: linuxkit/openntpd:v0.7 - name: docker - image: docker:18.06.0-ce-dind + image: docker:19.03.8-dind capabilities: - all net: host diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 50debdde8..020152e8c 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -29,7 +29,7 @@ services: - name: ntpd image: linuxkit/openntpd:v0.7 - name: docker - image: docker:18.06.0-ce-dind + image: docker:19.03.8-dind capabilities: - all net: host diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 675a6e655..28d49f7e2 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -29,7 +29,7 @@ services: - name: ntpd image: linuxkit/openntpd:v0.7 - name: docker - image: docker:18.06.0-ce-dind + image: docker:19.03.8-dind capabilities: - all net: host diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index daa53d4a6..caadf1f4d 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -22,7 +22,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:v0.7 - name: docker - image: docker:18.06.0-ce-dind + image: docker:19.03.8-dind capabilities: - all mounts: From 3eb9a75f9e68497c1f4fb1c716dd2bbf18f4c59e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 19:20:18 +0100 Subject: [PATCH 20/33] tools/go-compile: Workaround for go requiring gcc on arm64 See: https://github.com/linuxkit/linuxkit/issues/3496 Signed-off-by: Rolf Neugebauer --- tools/go-compile/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile index 6ec5bb592..661da2f35 100644 --- a/tools/go-compile/Dockerfile +++ b/tools/go-compile/Dockerfile @@ -7,6 +7,8 @@ RUN apk add --no-cache --initdb -p /out \ git \ go \ musl-dev +# Hack to work around an issue wirh go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache --initdb -p /out gcc || true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache FROM scratch From 25d5ba8ef8541e0675bdc717615190aaf57edb72 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 20:39:26 +0100 Subject: [PATCH 21/33] Update linuxkit/go-compile to the latest Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- docs/vendoring.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dd952d117..ef9448b83 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION="v0.7+" GIT_COMMIT=$(shell git rev-list -1 HEAD) -GO_COMPILE=linuxkit/go-compile:d3512774dc455a6dffbd1148a5294944636639a4 +GO_COMPILE=linuxkit/go-compile:b1446b2ba407225011f97ae1dba0f512ae7f9b84 ifeq ($(OS),Windows_NT) LINUXKIT?=bin/linuxkit.exe diff --git a/docs/vendoring.md b/docs/vendoring.md index 81b69a9bb..e9b45d9b7 100644 --- a/docs/vendoring.md +++ b/docs/vendoring.md @@ -22,7 +22,7 @@ docker run -it --rm \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ --entrypoint /go/bin/vndr \ -linuxkit/go-compile:d3512774dc455a6dffbd1148a5294944636639a4 +linuxkit/go-compile:b1446b2ba407225011f97ae1dba0f512ae7f9b84 ``` To update a single dependency: @@ -32,7 +32,7 @@ docker run -it --rm \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ --entrypoint /go/bin/vndr \ -linuxkit/go-compile:d3512774dc455a6dffbd1148a5294944636639a4 +linuxkit/go-compile:b1446b2ba407225011f97ae1dba0f512ae7f9b84 github.com/docker/docker ``` From 463216acda6b6ddc675ead2305cd83a870e3f614 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 22:50:27 +0100 Subject: [PATCH 22/33] pkg: Add gcc for all packages build for arm64 This is a workaround for https://github.com/linuxkit/linuxkit/issues/3496 Signed-off-by: Rolf Neugebauer --- pkg/cadvisor/Dockerfile | 2 ++ pkg/extend/Dockerfile | 2 ++ pkg/format/Dockerfile | 2 ++ pkg/init/Dockerfile | 2 ++ pkg/kmsg/Dockerfile | 2 ++ pkg/logwrite/Dockerfile | 2 ++ pkg/memlogd/Dockerfile | 2 ++ pkg/metadata/Dockerfile | 2 ++ pkg/mount/Dockerfile | 2 ++ pkg/rngd/Dockerfile | 2 ++ pkg/sysctl/Dockerfile | 2 ++ pkg/sysfs/Dockerfile | 2 ++ pkg/trim-after-delete/Dockerfile | 2 ++ 13 files changed, 26 insertions(+) diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index e22caab86..805e0b505 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -1,6 +1,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true ENV GOPATH=/go PATH=$PATH:/go/bin ENV GITREPO=github.com/google/cadvisor diff --git a/pkg/extend/Dockerfile b/pkg/extend/Dockerfile index 4f5e7c6b6..6c33cdfe6 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -19,6 +19,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY vendor /go/src/extend/vendor COPY extend.go /go/src/extend/ diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 76bd4290c..002f8d2d5 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -19,6 +19,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY format.go /go/src/format/ RUN go-compile.sh /go/src/format diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index da935326b..4d8bb583c 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -6,6 +6,8 @@ RUN LDFLAGS=-static CFLAGS=-Werror make usermode-helper RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY cmd /go/src/cmd RUN go-compile.sh /go/src/cmd/init diff --git a/pkg/kmsg/Dockerfile b/pkg/kmsg/Dockerfile index 46d08aa50..cf3363c41 100644 --- a/pkg/kmsg/Dockerfile +++ b/pkg/kmsg/Dockerfile @@ -2,6 +2,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN apk add --no-cache go musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY . /go/src/kmsg/ RUN go-compile.sh /go/src/kmsg diff --git a/pkg/logwrite/Dockerfile b/pkg/logwrite/Dockerfile index d2093ad3b..60c0444f4 100644 --- a/pkg/logwrite/Dockerfile +++ b/pkg/logwrite/Dockerfile @@ -2,6 +2,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY logwrite.go /go/src/logwrite/ RUN go-compile.sh /go/src/logwrite diff --git a/pkg/memlogd/Dockerfile b/pkg/memlogd/Dockerfile index fe5429cf0..5d89937c6 100644 --- a/pkg/memlogd/Dockerfile +++ b/pkg/memlogd/Dockerfile @@ -2,6 +2,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY cmd/ /go/src/ RUN go-compile.sh /go/src/memlogd diff --git a/pkg/metadata/Dockerfile b/pkg/metadata/Dockerfile index ff219ee1c..88c2f0f6f 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -2,6 +2,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN apk add --no-cache go musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY . /go/src/metadata/ RUN go-compile.sh /go/src/metadata diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile index 53b047675..1c0c8dec6 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -13,6 +13,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY *.go /go/src/mountie/ RUN go-compile.sh /go/src/mountie diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index f8e585a81..16d9b6487 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -2,6 +2,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN apk add --no-cache go gcc musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true # see https://github.com/golang/go/issues/23672 ENV CGO_CFLAGS_ALLOW=(-mrdrnd|-mrdseed) diff --git a/pkg/sysctl/Dockerfile b/pkg/sysctl/Dockerfile index 083a9f604..fbab2fd21 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -2,6 +2,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY main.go /go/src/sysctl/ RUN go-compile.sh /go/src/sysctl diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile index 6fe0c0472..302488030 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -2,6 +2,8 @@ FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY main.go /go/src/sysfs/ RUN go-compile.sh /go/src/sysfs diff --git a/pkg/trim-after-delete/Dockerfile b/pkg/trim-after-delete/Dockerfile index 7b55cc026..2f00e25b9 100644 --- a/pkg/trim-after-delete/Dockerfile +++ b/pkg/trim-after-delete/Dockerfile @@ -12,6 +12,8 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache # We also need the Go binary which calls it: RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin +# Hack to work around an issue with go on arm64 requiring gcc +RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true COPY . /go/src/trim-after-delete RUN go-compile.sh /go/src/trim-after-delete From ce89479b2dd64bd8582f1d9d68099ec88d529ff4 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 23:25:51 +0100 Subject: [PATCH 23/33] Update use of packages to the latest 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 ++-- .../006_format_mount/000_auto/test.yml | 8 ++-- .../006_format_mount/001_by_label/test.yml | 8 ++-- .../006_format_mount/002_by_name/test.yml.in | 8 ++-- .../006_format_mount/003_btrfs/test.yml | 10 ++--- .../006_format_mount/004_xfs/test.yml | 8 ++-- .../005_by_device_force/test.yml | 14 +++---- .../006_format_mount/010_multiple/test.yml | 12 +++--- .../007_getty-containerd/test.yml | 12 +++--- test/cases/040_packages/012_losetup/test.yml | 6 +-- .../040_packages/013_mkimage/mkimage.yml | 6 +-- test/cases/040_packages/013_mkimage/run.yml | 4 +- test/cases/040_packages/019_sysctl/test.yml | 6 +-- .../cases/040_packages/023_wireguard/test.yml | 14 +++---- test/cases/040_packages/030_logwrite/test.yml | 12 +++--- test/cases/040_packages/031_kmsg/test.yml | 14 +++---- test/cases/040_packages/032_bcc/test.yml | 4 +- test/hack/test-ltp.yml | 6 +-- test/hack/test.yml | 8 ++-- test/pkg/ns/template.yml | 4 +- 101 files changed, 552 insertions(+), 552 deletions(-) diff --git a/contrib/open-vm-tools/open-vm-tools-ds.yaml b/contrib/open-vm-tools/open-vm-tools-ds.yaml index 84b734899..22b5709c1 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:v0.7 + - image: linuxkit/open-vm-tools:3a312fca405bb749f6bd2bda96110fb2154da564 name: open-vm-tools resources: requests: diff --git a/examples/aws.yml b/examples/aws.yml index ad6e28674..4c5bc9413 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf + image: linuxkit/metadata:12794dd50fd1563dee6c960710fd8b923dba6231 services: - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: sshd - image: linuxkit/sshd:v0.7 + image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index 6cb6ce0e1..e02d81475 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa services: - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee - name: sshd - image: linuxkit/sshd:v0.7 + image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 73950534f..5e70f915b 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysfs - image: linuxkit/sysfs:v0.7 + image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: ntpd - image: linuxkit/openntpd:v0.7 + image: linuxkit/openntpd:9b33f59f6d66c0f5027754a75e52f972e11882c1 - 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:v0.7 + image: linuxkit/cadvisor:07bf2e8e6ec05dc0644f1a974df1ce465d028b59 files: - path: var/lib/docker directory: true diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index f44cc3e69..674c08dfa 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,30 +2,30 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "/dev/sda"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 command: ["/usr/bin/mountie", "/dev/sda1", "/var/external"] - name: loop - image: linuxkit/losetup:v0.7 + image: linuxkit/losetup:0730b61ac5c8803ba73318c2dd5121dc15cfbf34 command: ["/usr/bin/loopy", "--create", "/var/external/storage_file"] - name: dm-crypt - image: linuxkit/dm-crypt:v0.7 + image: linuxkit/dm-crypt:0ea63bfd97b719d185b69994b4856d97fbc8a2dd command: ["/usr/bin/crypto", "crypt_loop_dev", "/dev/loop0"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb 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 b660ec3cf..58e8b70fc 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "/dev/sda"] - name: dm-crypt - image: linuxkit/dm-crypt:v0.7 + image: linuxkit/dm-crypt:0ea63bfd97b719d185b69994b4856d97fbc8a2dd command: ["/usr/bin/crypto", "crypt_dev", "/dev/sda1"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb 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 3f8ffbbca..0c3b6cc7b 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -3,30 +3,30 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/vpnkit-expose-port:v0.7 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/vpnkit-expose-port:3fd88b7025065843792484b1ad83ddd5c4b28684 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf + image: linuxkit/metadata:12794dd50fd1563dee6c960710fd8b923dba6231 - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: sysfs - image: linuxkit/sysfs:v0.7 + image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a - name: binfmt - image: linuxkit/binfmt:v0.7 + image: linuxkit/binfmt:94d59bc179c7a9155d8593a974d499352b70bfd5 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:7f17cd1dfca99f643f91c895e19ab61df09aa870 + image: linuxkit/swap:2cf5c3f08c4b238bb5fe231fd59ce19faee0fbc6 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:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:v0.7 + image: linuxkit/acpid:d5692a8c9d7cfceb7922acb8e356928c920bc280 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:v0.7 + image: linuxkit/openntpd:9b33f59f6d66c0f5027754a75e52f972e11882c1 # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:v0.7 + image: linuxkit/vsudd:0366cd7fb47398de85b176f3b0420355cda235fa 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:v0.7 + image: linuxkit/vpnkit-forwarder:e0964f3c34f92f7e7ff7b13e360d57559c64581c 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:v0.7 + image: linuxkit/trim-after-delete:f5a83f55b1bc24d61bca4891d997bca33474945d # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:v0.7 + image: linuxkit/host-timesync-daemon:8625ccdbda099c94b9635acd167e8f0e2f9c6318 # 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 c93d95386..e57394700 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,31 +2,31 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: sysfs - image: linuxkit/sysfs:v0.7 + image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee - name: ntpd - image: linuxkit/openntpd:v0.7 + image: linuxkit/openntpd:9b33f59f6d66c0f5027754a75e52f972e11882c1 - name: docker image: docker:19.03.8-dind capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index c3fa6eb15..8235604bf 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf + image: linuxkit/metadata:12794dd50fd1563dee6c960710fd8b923dba6231 services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: sshd - image: linuxkit/sshd:v0.7 + image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index a38dd49a1..2abfaea92 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb 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 be9f26f5b..114e0836c 100644 --- a/examples/hetzner.yml +++ b/examples/hetzner.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 - - linuxkit/firmware:e246ab4c77bc4e70b53db091371a699fced5e01d + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/firmware:2b5688289ec6708e41a20a10aa4b5a05d4b331f6 onboot: - name: rngd1 - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf + image: linuxkit/metadata:12794dd50fd1563dee6c960710fd8b923dba6231 command: ["/usr/bin/metadata", "hetzner"] services: - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:v0.7 + image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 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 562228601..0c7e0cb28 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee 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:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 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:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 145889e72..db27c4203 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: influxdb diff --git a/examples/logging.yml b/examples/logging.yml index 78469f273..f583da52d 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,21 +3,21 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 - - linuxkit/memlogd:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/memlogd:ddfd99754f0cfc63a675f49aa32a8f2c92785551 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee 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:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 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:v0.7 + image: linuxkit/logwrite:0031a6ee2be4c842ce40246f93e5059048b367aa - name: kmsg - image: linuxkit/kmsg:v0.7 + image: linuxkit/kmsg:ea49dddf9275b10188ba45f57cb7c9c561db4758 trust: org: - linuxkit diff --git a/examples/minimal.yml b/examples/minimal.yml index 8c688c41e..9db9db165 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index d7200f4d3..2c048e37c 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee - name: node_exporter - image: linuxkit/node_exporter:v0.7 + image: linuxkit/node_exporter:1d5694bb1b148368d53945d22944289a2127d69c trust: org: - linuxkit diff --git a/examples/openstack.yml b/examples/openstack.yml index 2fbe83429..a8a1c0938 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf + image: linuxkit/metadata:12794dd50fd1563dee6c960710fd8b923dba6231 command: ["/usr/bin/metadata", "openstack"] services: - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: sshd - image: linuxkit/sshd:v0.7 + image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 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 79ae196fa..005e359b6 100644 --- a/examples/packet.arm64.yml +++ b/examples/packet.arm64.yml @@ -10,5 +10,5 @@ kernel: ucode: "" onboot: - name: modprobe - image: linuxkit/modprobe:v0.7 + image: linuxkit/modprobe:944769462b9d10b1b1506498d3eb03dcc5416f7f command: ["modprobe", "nicvf"] diff --git a/examples/packet.yml b/examples/packet.yml index 11d0a8cdd..56dc7f667 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 - - linuxkit/firmware:e246ab4c77bc4e70b53db091371a699fced5e01d + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/firmware:2b5688289ec6708e41a20a10aa4b5a05d4b331f6 onboot: - name: rngd1 - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf + image: linuxkit/metadata:12794dd50fd1563dee6c960710fd8b923dba6231 command: ["/usr/bin/metadata", "packet"] services: - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:v0.7 + image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 3e11e2805..74539292a 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 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 a76ecf418..1dd43d2ea 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:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee - name: open-vm-tools - image: linuxkit/open-vm-tools:v0.7 + image: linuxkit/open-vm-tools:3a312fca405bb749f6bd2bda96110fb2154da564 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/scaleway.yml b/examples/scaleway.yml index ee3fb8eaa..e937c1cca 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: rngd1 - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb command: ["/sbin/rngd", "-1"] - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf + image: linuxkit/metadata:12794dd50fd1563dee6c960710fd8b923dba6231 services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb trust: org: - linuxkit diff --git a/examples/sshd.yml b/examples/sshd.yml index d3c54c696..46cdc7dbd 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: rngd1 - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee - name: sshd - image: linuxkit/sshd:v0.7 + image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/static-ip.yml b/examples/static-ip.yml index f642e58c5..ced95b200 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 onboot: - name: ip - image: linuxkit/ip:7b1cf3150bf5d9a0df7ef07572e2d81fe3c0c3d3 + image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 binds: - /etc/ip:/etc/ip command: ["ip", "-b", "/etc/ip/eth0.conf"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true files: diff --git a/examples/swap.yml b/examples/swap.yml index 915403cbb..aaf3f60eb 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:7f17cd1dfca99f643f91c895e19ab61df09aa870 + image: linuxkit/swap:2cf5c3f08c4b238bb5fe231fd59ce19faee0fbc6 # 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:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb trust: org: - linuxkit diff --git a/examples/tpm.yml b/examples/tpm.yml index 099379f56..aa722abca 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: tss - image: linuxkit/tss:v0.7 + image: linuxkit/tss:734902b23bc9a7a5e36cce4bd9742a66d37f0a9a - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb 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 02c324077..0d0896870 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,22 +2,22 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index ddb4b6a72..7fd00e178 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee 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:v0.7 + image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:v0.7 + image: linuxkit/vpnkit-forwarder:e0964f3c34f92f7e7ff7b13e360d57559c64581c binds: - /var/vpnkit:/port net: host diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index ac9de7ab7..6e3384ad2 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:v0.7 + image: linuxkit/vsudd:0366cd7fb47398de85b176f3b0420355cda235fa binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/examples/vultr.yml b/examples/vultr.yml index 7170415bf..076b77ded 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf + image: linuxkit/metadata:12794dd50fd1563dee6c960710fd8b923dba6231 command: ["/usr/bin/metadata", "vultr"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: sshd - image: linuxkit/sshd:v0.7 + image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 23e32d380..58d273ec6 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:7b1cf3150bf5d9a0df7ef07572e2d81fe3c0c3d3 + image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:7b1cf3150bf5d9a0df7ef07572e2d81fe3c0c3d3 + image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,12 +40,12 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true net: /run/netns/wg1 - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: nginx image: nginx:1.13.8-alpine net: /run/netns/wg0 diff --git a/linuxkit.yml b/linuxkit.yml index ab7ef3264..92129001a 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee 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:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - 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 ab60b4984..729d2bfc6 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:a0246dd478a24abbee0a4cede99662ffc4931691 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 020152e8c..318ad1374 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,32 +2,32 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: sysfs - image: linuxkit/sysfs:v0.7 + image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: ntpd - image: linuxkit/openntpd:v0.7 + image: linuxkit/openntpd:9b33f59f6d66c0f5027754a75e52f972e11882c1 - name: docker image: docker:19.03.8-dind capabilities: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 28d49f7e2..4600df8ce 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,32 +2,32 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: sysfs - image: linuxkit/sysfs:v0.7 + image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: ntpd - image: linuxkit/openntpd:v0.7 + image: linuxkit/openntpd:9b33f59f6d66c0f5027754a75e52f972e11882c1 - 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 c0c6a0909..262d5ef87 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:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 3c3a18395..e1b79cbdc 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:a0246dd478a24abbee0a4cede99662ffc4931691 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index a17ff482d..2723bf996 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:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 081fa164c..4e33190b0 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:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 - samoht/fdd onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee 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 478c394c6..be4538865 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.30 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - 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:v0.7 + image: linuxkit/sshd:d5860b5fd032ca3e755e0e3ab39c918c344d8c91 - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 69676cc73..b043f2b82 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:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa services: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 4ed933193..413b1007f 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:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - 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 8afcef98a..7d2457db5 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:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: mkimage - image: linuxkit/mkimage:v0.7 + image: linuxkit/mkimage:cad5659e03d5e6d81c26bb0a9724cc626dee57b4 - 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 af81c2f64..e759ab56a 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee 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 e5c137185..b1f0a8125 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee 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:7b1cf3150bf5d9a0df7ef07572e2d81fe3c0c3d3 + image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 # 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 622b7e324..f24b19856 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 622b7e324..f24b19856 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 80696a51b..52ffd01c5 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 5a66516ca..890e75787 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 5a66516ca..890e75787 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 5a66516ca..890e75787 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 5a66516ca..890e75787 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 3d2e5399a..05ca626d3 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 5a66516ca..890e75787 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 5a66516ca..890e75787 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 9587280a7..622bb40a0 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 services: - name: acpid - image: linuxkit/acpid:v0.7 + image: linuxkit/acpid:d5692a8c9d7cfceb7922acb8e356928c920bc280 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 5e3ad5bc9..890e75787 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 078f29e87..664a6ae3a 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.175 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 c9e567076..3c5722f1b 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.114 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 24319eb75..a454c15c0 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 581317378..c65e9ad08 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.2 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 8c43762c3..8ec2030bc 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.175 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 20547db67..e53577aec 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.114 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 2aca449fa..adaa04503 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 946de96e1..ea19b00ae 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.2 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 e5e1f93f9..e3f420d2b 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 caadf1f4d..8a48d3ee7 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.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: sysfs - image: linuxkit/sysfs:v0.7 + image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 + image: linuxkit/rngd:7fab61cca793113280397dcee8159f35dc37adcb - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee - 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 a58f97b2c..3931c3d70 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.30 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 68423858d..16f3477f2 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: binfmt - image: linuxkit/binfmt:v0.7 + image: linuxkit/binfmt:94d59bc179c7a9155d8593a974d499352b70bfd5 - 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 ca19251ec..41eb3ce9a 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/bpftrace:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/bpftrace:65c4dc9f6dcb3bbb52f7f13acf067d01f7e6e538 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 9521984cd..9487265da 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 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 a99dd9caf..1db4393fa 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 command: ["/usr/bin/mountie", "/var/lib"] - name: test image: linuxkit/test-containerd:fa781a2ec490a63140a2e90f9c8d13c735dd4c5f diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index df2f174b8..849e7c6ec 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee 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 6505a6225..6052c18b5 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:v0.7 + image: linuxkit/dm-crypt:0ea63bfd97b719d185b69994b4856d97fbc8a2dd 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 6feee8640..a45acf4c2 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:v0.7 + image: linuxkit/dm-crypt:0ea63bfd97b719d185b69994b4856d97fbc8a2dd 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 ca724d076..a7cc05bce 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:v0.7 + image: linuxkit/dm-crypt:0ea63bfd97b719d185b69994b4856d97fbc8a2dd 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 138d6178d..439f39f30 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 b5c810095..f99645c8a 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: extend - image: linuxkit/extend:79475e430851110b39d93dfb4a7e8ea041b57dc0 + image: linuxkit/extend:1ea3b8f198bf564e8ae6c71481715aadadd4e242 - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 ab38553b4..ddc90adf4 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: modprobe - image: linuxkit/modprobe:v0.7 + image: linuxkit/modprobe:944769462b9d10b1b1506498d3eb03dcc5416f7f command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 2ce192a30..aefc34dc9 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: modprobe - image: linuxkit/modprobe:v0.7 + image: linuxkit/modprobe:944769462b9d10b1b1506498d3eb03dcc5416f7f command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:79475e430851110b39d93dfb4a7e8ea041b57dc0 + image: linuxkit/extend:1ea3b8f198bf564e8ae6c71481715aadadd4e242 command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 c195a4c9d..f56f9ecc9 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 829efc9b5..4a6b274ed 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: extend - image: linuxkit/extend:79475e430851110b39d93dfb4a7e8ea041b57dc0 + image: linuxkit/extend:1ea3b8f198bf564e8ae6c71481715aadadd4e242 command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 ebe2c0feb..d3bf33bc8 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 5c91c6593..6c3a89fee 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 ecb29511b..c2839ce9d 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 2a534b58c..8a5619148 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: modprobe - image: linuxkit/modprobe:v0.7 + image: linuxkit/modprobe:944769462b9d10b1b1506498d3eb03dcc5416f7f command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 6f3923d61..454feb5d3 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 8280ec199..a4d280967 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index f9e5c04db..29079a23a 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56 + image: linuxkit/format:80bd847a90842d3f19460a560d7d95d6fe13bd71 command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:v0.7 + image: linuxkit/mount:8363f4f1744e1df2557ec260a4cc94227178fd69 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 984ed56aa..f3ae8733e 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.7 + image: linuxkit/getty:48f66df198981e692084bf70ab72b9fe2be0f880 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 03ebe7d14..2defac01b 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: losetup - image: linuxkit/losetup:v0.7 + image: linuxkit/losetup:0730b61ac5c8803ba73318c2dd5121dc15cfbf34 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 cb75aba28..e705b6361 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: mkimage - image: linuxkit/mkimage:v0.7 + image: linuxkit/mkimage:cad5659e03d5e6d81c26bb0a9724cc626dee57b4 - 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 9d1fa6afc..3d1c83aea 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 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 e87cbc540..82d6d8b97 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: sysctl - image: linuxkit/sysctl:v0.7 + image: linuxkit/sysctl:541f60fe3676611328e89e8bac251fc636b1a6aa - 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 37402ad24..c1e371833 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:7b1cf3150bf5d9a0df7ef07572e2d81fe3c0c3d3 + image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:7b1cf3150bf5d9a0df7ef07572e2d81fe3c0c3d3 + image: linuxkit/ip:22f0b3be72f25adb8a38aa67c075d59da49d20f2 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 7331012bc..ea661652c 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 - - linuxkit/memlogd:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/memlogd:ddfd99754f0cfc63a675f49aa32a8f2c92785551 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:v0.7 + image: linuxkit/logwrite:0031a6ee2be4c842ce40246f93e5059048b367aa 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 e6e84aa49..3be7b41bb 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 - - linuxkit/ca-certificates:v0.7 - - linuxkit/memlogd:v0.7 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 + - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5 + - linuxkit/memlogd:ddfd99754f0cfc63a675f49aa32a8f2c92785551 services: - name: kmsg - image: linuxkit/kmsg:v0.7 + image: linuxkit/kmsg:ea49dddf9275b10188ba45f57cb7c9c561db4758 - name: write-and-rotate-logs - image: linuxkit/logwrite:v0.7 + image: linuxkit/logwrite:0031a6ee2be4c842ce40246f93e5059048b367aa - 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 10d2f0c73..3046cc8f1 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.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 - linuxkit/kernel-bcc:5.4.30 onboot: - name: check-bcc diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 8d8c10983..bc1195280 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index a4bc2b002..2dc2aa458 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,12 +4,12 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 - - linuxkit/containerd:09553963ed9da626c25cf8acdf6d62ec37645412 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 + - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.7 + image: linuxkit/dhcpcd:2f8a9b670aa6e96a09db56ec45c9f07ef2a811ee 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 d431a3cb3..9ea516652 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0" init: - - linuxkit/init:a0246dd478a24abbee0a4cede99662ffc4931691 - - linuxkit/runc:69b4a35eaa22eba4990ee52cccc8f48f6c08ed03 + - linuxkit/init:f670045ecb6ec31ea37dd10114366e9a1e915013 + - linuxkit/runc:1eef77f5963e44e491abfe392206769037d47ae2 onboot: - name: test-ns image: linuxkit/test-ns: From dbb76cf4d477cc54b8729fe25fff04421d5d37c2 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 23:27:44 +0100 Subject: [PATCH 24/33] kernel: Update kernel builds to latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 2 +- kernel/Dockerfile.bcc | 4 ++-- kernel/Dockerfile.kconfig | 2 +- kernel/Dockerfile.perf | 2 +- kernel/Dockerfile.zfs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 3dd697ac5..272271600 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS kernel-build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS kernel-build RUN apk add \ argp-standalone \ automake \ diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc index fbab562e6..c71097b35 100644 --- a/kernel/Dockerfile.bcc +++ b/kernel/Dockerfile.bcc @@ -1,7 +1,7 @@ ARG IMAGE FROM ${IMAGE} as ksrc -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk update && apk upgrade -a && \ apk add --no-cache \ argp-standalone \ @@ -102,7 +102,7 @@ RUN mkdir -p /out/usr/bin && \ RUN mkdir -p /out/usr/local/share/ && \ cp -a /usr/local/share/lua /out/usr/local/share/ -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 as mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk update && apk upgrade -a && \ apk add --no-cache --initdb -p /out \ diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig index cc3f1b005..8e47f82f9 100644 --- a/kernel/Dockerfile.kconfig +++ b/kernel/Dockerfile.kconfig @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS kernel-build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS kernel-build RUN apk add \ argp-standalone \ bison \ diff --git a/kernel/Dockerfile.perf b/kernel/Dockerfile.perf index f10a27c9e..b87df4d74 100644 --- a/kernel/Dockerfile.perf +++ b/kernel/Dockerfile.perf @@ -3,7 +3,7 @@ ARG IMAGE FROM ${IMAGE} AS ksrc -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add \ argp-standalone \ bash \ diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs index 270ffb9e6..be818d587 100644 --- a/kernel/Dockerfile.zfs +++ b/kernel/Dockerfile.zfs @@ -1,6 +1,6 @@ ARG IMAGE FROM ${IMAGE} AS ksrc -FROM linuxkit/alpine:3fdc49366257e53276c6f363956a4353f95d9a81 AS build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build RUN apk add \ attr-dev \ autoconf \ From db36750deb45f1975d44f40fea216289057daf13 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 23:37:12 +0100 Subject: [PATCH 25/33] kernel: Adjust configs to new compiler Signed-off-by: Rolf Neugebauer --- kernel/config-4.19.x-x86_64 | 4 ++-- kernel/config-5.4.x-aarch64 | 6 ++++-- kernel/config-5.4.x-s390x | 4 ++-- kernel/config-5.4.x-x86_64 | 4 ++-- kernel/config-5.6.x-aarch64 | 6 ++++-- kernel/config-5.6.x-s390x | 4 ++-- kernel/config-5.6.x-x86_64 | 4 ++-- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/kernel/config-4.19.x-x86_64 b/kernel/config-4.19.x-x86_64 index 4aa5fcba6..d14490b46 100644 --- a/kernel/config-4.19.x-x86_64 +++ b/kernel/config-4.19.x-x86_64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.3.0) 8.3.0 +# Compiler: gcc (Alpine 9.2.0) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80300 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y diff --git a/kernel/config-5.4.x-aarch64 b/kernel/config-5.4.x-aarch64 index 0db8d3c6b..d9f23db83 100644 --- a/kernel/config-5.4.x-aarch64 +++ b/kernel/config-5.4.x-aarch64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.3.0) 8.3.0 +# Compiler: gcc (Alpine 9.2.0) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80300 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y @@ -408,6 +408,8 @@ CONFIG_ARM64_MODULE_PLTS=y CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y +CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y +CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features # diff --git a/kernel/config-5.4.x-s390x b/kernel/config-5.4.x-s390x index 98ee71637..f2e525871 100644 --- a/kernel/config-5.4.x-s390x +++ b/kernel/config-5.4.x-s390x @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.3.0) 8.3.0 +# Compiler: gcc (Alpine 9.2.0) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80300 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y diff --git a/kernel/config-5.4.x-x86_64 b/kernel/config-5.4.x-x86_64 index b466047ad..0955837ef 100644 --- a/kernel/config-5.4.x-x86_64 +++ b/kernel/config-5.4.x-x86_64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.3.0) 8.3.0 +# Compiler: gcc (Alpine 9.2.0) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80300 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y diff --git a/kernel/config-5.6.x-aarch64 b/kernel/config-5.6.x-aarch64 index 09738e068..7af62ecb9 100644 --- a/kernel/config-5.6.x-aarch64 +++ b/kernel/config-5.6.x-aarch64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.3.0) 8.3.0 +# Compiler: gcc (Alpine 9.2.0) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80300 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y @@ -429,6 +429,8 @@ CONFIG_ARM64_MODULE_PLTS=y CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y +CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y +CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features # diff --git a/kernel/config-5.6.x-s390x b/kernel/config-5.6.x-s390x index d6c45ee90..9a18ab481 100644 --- a/kernel/config-5.6.x-s390x +++ b/kernel/config-5.6.x-s390x @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.3.0) 8.3.0 +# Compiler: gcc (Alpine 9.2.0) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80300 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y diff --git a/kernel/config-5.6.x-x86_64 b/kernel/config-5.6.x-x86_64 index d1e426ddd..77c2c45ad 100644 --- a/kernel/config-5.6.x-x86_64 +++ b/kernel/config-5.6.x-x86_64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 8.3.0) 8.3.0 +# Compiler: gcc (Alpine 9.2.0) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80300 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y From 72fe47557fa3590c3e15b116f29e15aa45871434 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 14 Apr 2020 09:19:23 +0100 Subject: [PATCH 26/33] kernel: Switch -dbg kernel to default 5.4.x kernel Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/Makefile b/kernel/Makefile index 65cf59a00..2659d10a8 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -254,9 +254,9 @@ endef ifeq ($(ARCH),x86_64) $(eval $(call kernel,5.6.2,5.6.x,$(EXTRA),$(DEBUG))) $(eval $(call kernel,5.4.30,5.4.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,5.4.30,5.4.x,,-dbg)) $(eval $(call kernel,5.4.28,5.4.x,-rt,)) $(eval $(call kernel,4.19.114,4.19.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,4.19.114,4.19.x,,-dbg)) $(eval $(call kernel,4.14.175,4.14.x,$(EXTRA),$(DEBUG))) else ifeq ($(ARCH),aarch64) From 0dd1283dec46b1214d5866ad9474e3fcafdc98d2 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 14 Apr 2020 23:49:33 +0100 Subject: [PATCH 27/33] kernel: add findutils to perf build and make it more verbose Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile.perf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/Dockerfile.perf b/kernel/Dockerfile.perf index b87df4d74..0bfe22645 100644 --- a/kernel/Dockerfile.perf +++ b/kernel/Dockerfile.perf @@ -17,6 +17,7 @@ RUN apk add \ installkernel \ kmod \ elfutils-dev \ + findutils \ mpc1-dev \ mpfr-dev \ sed \ @@ -32,7 +33,7 @@ RUN tar xf linux.tar.xz && \ WORKDIR /linux RUN mkdir -p /out && \ - make -C tools/perf LDFLAGS=-static && \ + make -C tools/perf LDFLAGS=-static V=1 && \ strip tools/perf/perf && \ cp tools/perf/perf /out From ea750c8b7bc07bdf7f95e83fda5297be2b79d723 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 14 Apr 2020 23:58:00 +0100 Subject: [PATCH 28/33] kernel: Only build bcc/perf on x86 and latest stable and LTS This was previously build for 5.4 and 4.19. Latest LTS is 5.4 and latest stable is 5.6. Also skip s390x build for perf Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 2659d10a8..85bc9b7ac 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -149,9 +149,9 @@ show-tags: show-tag_$(2)$(3)$(4) # with DCT as part of the dependency on build_$(2)$(3)$(4) and then build # with DOCKER_CONTENT_TRUST explicitly set to 0 -# Only build perf on latest LTS and stable kernels. Skip arm64. -ifeq ($(2), $(filter $(2),5.4.x 4.19.x)) -ifneq ($(ARCH),aarch64) +# Only build perf on x86 and latest LTS and stable kernels +ifeq ($(ARCH),x86_64) +ifeq ($(2), $(filter $(2),5.6.x 5.4.x)) build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4) docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \ @@ -189,7 +189,7 @@ endif # Only build BCC on x86 and only on latest LTS and latest stable kernels. ifeq ($(ARCH),x86_64) -ifeq ($(2), $(filter $(2),5.4.x 4.19.x)) +ifeq ($(2), $(filter $(2),5.6.x 5.4.x)) build_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4) docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.bcc \ From 169f031ce9b4476af8ca1b34f9f6fefc8557400d Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 16 Apr 2020 13:16:13 +0100 Subject: [PATCH 29/33] kernel: Disable perf build for now. See: https://github.com/linuxkit/linuxkit/issues/3498 Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/Makefile b/kernel/Makefile index 85bc9b7ac..65445e1c5 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -150,7 +150,8 @@ show-tags: show-tag_$(2)$(3)$(4) # with DOCKER_CONTENT_TRUST explicitly set to 0 # Only build perf on x86 and latest LTS and stable kernels -ifeq ($(ARCH),x86_64) +# Temporarily disable perf build: https://github.com/linuxkit/linuxkit/issues/3498 +ifeq ($(ARCH),disabled) ifeq ($(2), $(filter $(2),5.6.x 5.4.x)) build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4) docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ From 8f480cc57837972870cfe11584193f6d4802ff9a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 16 Apr 2020 23:28:35 +0100 Subject: [PATCH 30/33] kernel/bcc: Disbale -Werror for elfutils buils with the new C tool chain elfutils fails with with warnings: Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile.bcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc index c71097b35..0ff845ca5 100644 --- a/kernel/Dockerfile.bcc +++ b/kernel/Dockerfile.bcc @@ -70,7 +70,7 @@ RUN tar xf /build/kernel-headers.tar && \ RUN cd elfutils-$ELFUTILS_VERSION && \ aclocal && \ automake && \ - ./configure --prefix=/usr CFLAGS=-Wno-strict-aliasing && \ + ./configure --prefix=/usr CFLAGS="-Wno-strict-aliasing -Wno-error" && \ make -C libelf && make -C libelf install RUN mkdir -p bcc/build && cd bcc/build && \ From 0f844541cb32cde545841079808ca755406b15d7 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 17 Apr 2020 22:39:59 +0100 Subject: [PATCH 31/33] Revert "Removed size arg from GCP make-fs command." This reverts commit 1653e9dffba71cc0e7dcdf481fe05a7b575788a4. Signed-off-by: Rolf Neugebauer --- tools/mkimage-gcp/make-gcp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mkimage-gcp/make-gcp b/tools/mkimage-gcp/make-gcp index ab408686a..6e8cfe0b3 100755 --- a/tools/mkimage-gcp/make-gcp +++ b/tools/mkimage-gcp/make-gcp @@ -43,7 +43,7 @@ cd .. tar cf files.tar -C files . -virt-make-fs --type=ext4 --partition files.tar disk.raw +virt-make-fs --size=1G --type=ext4 --partition files.tar disk.raw guestfish -a disk.raw -m /dev/sda1 < Date: Fri, 17 Apr 2020 22:45:30 +0100 Subject: [PATCH 32/33] tool: Revert linuxkit/mkimage-gcp Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/moby/output.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/moby/output.go b/src/cmd/linuxkit/moby/output.go index 402adff5d..3edb09b7f 100644 --- a/src/cmd/linuxkit/moby/output.go +++ b/src/cmd/linuxkit/moby/output.go @@ -22,7 +22,7 @@ var ( "raw-bios": "linuxkit/mkimage-raw-bios:4f3041edd9de02ef8f15bd92cc2d1afecb90084b", "raw-efi": "linuxkit/mkimage-raw-efi:9ed69b7ac9e75aef6eebaed787223d9504dd967b", "squashfs": "linuxkit/mkimage-squashfs:a1e99651662cb5781f8485a588ce4c85a75d7c9c", - "gcp": "linuxkit/mkimage-gcp:a296b67a8974ce2a5ce70f51ab5a65c820bff156", + "gcp": "linuxkit/mkimage-gcp:a7416d21d4ef642bb2ba560c8f7651250823546d", "qcow2-efi": "linuxkit/mkimage-qcow2-efi:9a623f72befcaadb560290c29b9fb28f3843545b", "vhd": "linuxkit/mkimage-vhd:4cc60c4f46b07e11c64ba618e46b81fa0096c91f", "dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:99b9009ed54a793020d3ce8322a42e0cc06da71a", From 4c0d156042ccb9fddc8c83dbd5584182d1dde81c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 18 Apr 2020 10:54:47 +0100 Subject: [PATCH 33/33] test: Increase disk size for dm-crypt LUKS test Otherwise it fails with: + cryptsetup --key-file /etc/dm-crypt/key --cipher aes-cbc-essiv:sha256 luksFormat /dev/sda + cryptsetup --key-file /etc/dm-crypt/key luksOpen /dev/sda it_is_encrypted Requested offset is beyond real size of device /dev/sda. dm-crypt test suite FAILED Signed-off-by: Rolf Neugebauer --- test/cases/040_packages/004_dm-crypt/001_luks/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.sh b/test/cases/040_packages/004_dm-crypt/001_luks/test.sh index 89cdafe7e..e63fdd1dd 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.sh +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT # Test code goes here linuxkit build -format kernel+initrd -name ${NAME} test.yml -RESULT="$(linuxkit run -disk file=${DISK},size=8M ${NAME})" +RESULT="$(linuxkit run -disk file=${DISK},size=20M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED"