From ec5e383de49a17bd162268680407b4f79edf0834 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 10:39:31 +0000 Subject: [PATCH 01/31] tools/alpine: Update to Alpine Linux 3.9 Signed-off-by: Rolf Neugebauer --- tools/alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index fd38259e4..62e30e3a1 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 AS mirror +FROM alpine:3.9 AS mirror # update base image RUN apk update && apk upgrade -a @@ -84,7 +84,7 @@ RUN set -e && \ cp iucode_tool /iucode_tool; \ fi -FROM alpine:3.8 +FROM alpine:3.9 COPY --from=mirror /etc/apk/repositories /etc/apk/repositories COPY --from=mirror /etc/apk/repositories.upstream /etc/apk/repositories.upstream From c217a7c7d16fd1dd0e1a2ee2dad8a8b77541eb1d Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 17:57:02 +0000 Subject: [PATCH 02/31] tools/alpine: Move strace to x86 and arm64 only It does not seem to be avail on s390x Signed-off-by: Rolf Neugebauer --- tools/alpine/packages | 1 - tools/alpine/packages.aarch64 | 1 + tools/alpine/packages.x86_64 | 1 + tools/alpine/versions.x86_64 | 417 +++++++++++++++++----------------- 4 files changed, 214 insertions(+), 206 deletions(-) diff --git a/tools/alpine/packages b/tools/alpine/packages index 9e036a1b2..7baf5c501 100644 --- a/tools/alpine/packages +++ b/tools/alpine/packages @@ -110,7 +110,6 @@ slang-dev sntpc socat squashfs-tools -strace swig tar tcpdump diff --git a/tools/alpine/packages.aarch64 b/tools/alpine/packages.aarch64 index f2f3d0391..9c0a5377b 100644 --- a/tools/alpine/packages.aarch64 +++ b/tools/alpine/packages.aarch64 @@ -1,3 +1,4 @@ libunwind-dev luajit-dev qemu-system-aarch64 +strace \ No newline at end of file diff --git a/tools/alpine/packages.x86_64 b/tools/alpine/packages.x86_64 index a91bda9ad..04cd96932 100644 --- a/tools/alpine/packages.x86_64 +++ b/tools/alpine/packages.x86_64 @@ -3,4 +3,5 @@ libunwind-dev luajit-dev open-vm-tools ovmf +strace syslinux diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 0c8b310f5..229d71c1c 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,320 +1,327 @@ -# linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac-amd64 +# linuxkit/alpine:3948f7bfe317fd4ced93dd815bd39cf367a5ee2e-amd64 # automatically generated list of installed packages -abuild-3.2.0-r0 -alpine-baselayout-3.1.0-r0 +abuild-3.3.0-r1 +alpine-baselayout-3.1.0-r3 alpine-keys-2.1-r1 -apk-tools-2.10.1-r0 +apk-tools-2.10.3-r1 argon2-libs-20171227-r1 argp-standalone-1.3-r3 attr-2.4.47-r7 attr-dev-2.4.47-r7 -audit-2.8.3-r1 -audit-libs-2.8.3-r1 +audit-2.8.4-r0 +audit-libs-2.8.4-r0 +audit-openrc-2.8.4-r0 autoconf-2.69-r2 automake-1.16.1-r0 bash-4.4.19-r1 bc-1.07.1-r0 -binutils-2.30-r5 -binutils-dev-2.30-r5 -bison-3.0.4-r1 -blkid-2.32-r0 +binutils-2.31.1-r2 +binutils-dev-2.31.1-r2 +bison-3.0.5-r0 +blkid-2.33-r0 bridge-utils-1.6-r0 bsd-compat-headers-0.7.1-r0 -btrfs-progs-4.17-r1 -btrfs-progs-dev-4.17-r1 -btrfs-progs-libs-4.17-r1 +btrfs-progs-4.19.1-r0 +btrfs-progs-dev-4.19.1-r0 +btrfs-progs-libs-4.19.1-r0 build-base-0.5-r1 -busybox-1.28.4-r3 -busybox-initscripts-3.1-r4 +busybox-1.29.3-r10 +busybox-initscripts-3.1-r6 bzip2-1.0.6-r6 -ca-certificates-20171114-r3 +ca-certificates-20190108-r0 +ca-certificates-cacert-20190108-r0 cdrkit-1.1.11-r2 celt051-0.5.1.3-r0 cifs-utils-6.8-r0 -clang-5.0.1-r1 -clang-dev-5.0.1-r1 -clang-libs-5.0.1-r1 -clang-static-5.0.1-r1 -cmake-3.11.1-r2 -cmake-bash-completion-3.11.1-r2 -coreutils-8.29-r2 -cryptsetup-2.0.2-r3 -cryptsetup-libs-2.0.2-r3 -curl-7.61.1-r1 -db-5.3.28-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-r1 +db-5.3.28-r1 dbus-libs-1.10.24-r1 -device-mapper-libs-2.02.178-r0 -dhcpcd-7.0.7-r0 -dhcpcd-openrc-7.0.7-r0 -diffutils-3.6-r1 +device-mapper-libs-2.02.182-r0 +dhcpcd-7.0.8-r0 +dhcpcd-openrc-7.0.8-r0 +diffutils-3.7-r0 dosfstools-4.1-r1 -dtc-1.4.4-r0 -e2fsprogs-1.44.2-r0 -e2fsprogs-dev-1.44.2-r0 -e2fsprogs-extra-1.44.2-r0 -e2fsprogs-libs-1.44.2-r0 +dtc-1.4.7-r0 +e2fsprogs-1.44.5-r0 +e2fsprogs-dev-1.44.5-r0 +e2fsprogs-extra-1.44.5-r0 +e2fsprogs-libs-1.44.5-r0 ebtables-2.0.10.4-r2 -elfutils-dev-0.168-r1 -elfutils-libelf-0.168-r1 -ethtool-4.16-r0 -eudev-3.2.5-r2 -eudev-libs-3.2.5-r2 -expat-2.2.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.6-r0 expect-5.45.4-r0 -fakeroot-1.22-r0 -file-5.32-r0 -findmnt-2.32-r0 +fakeroot-1.23-r0 +file-5.35-r0 +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-0.9-r0 +fortify-headers-1.0-r0 fts-1.2.7-r1 fts-dev-1.2.7-r1 -fuse-2.9.8-r0 -g++-6.4.0-r9 +fuse-2.9.8-r2 +fuse-common-3.2.6-r1 +fuse-openrc-3.2.6-r1 +g++-8.2.0-r2 gc-7.6.4-r2 -gcc-6.4.0-r9 +gcc-8.2.0-r2 gdbm-1.13-r1 -gettext-0.19.8.1-r2 -gettext-asprintf-0.19.8.1-r2 -gettext-dev-0.19.8.1-r2 -gettext-libs-0.19.8.1-r2 -git-2.18.1-r0 -glib-2.56.1-r0 +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.1-r0 +glib-2.58.1-r2 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 -gnupg-2.2.8-r0 -gnutls-3.6.2-r0 -go-1.10.8-r0 +gnupg-2.2.12-r0 +gnutls-3.6.4-r0 +go-1.11.5-r0 grep-3.1-r2 guile-2.0.14-r0 guile-libs-2.0.14-r0 gummiboot-48.1-r0 hvtools-4.11.9-r0 -icu-libs-60.2-r2 +icu-libs-62.1-r0 installkernel-3.5-r0 -iperf3-3.5-r1 -iperf3-openrc-3.5-r1 -iproute2-4.13.0-r0 -iptables-1.6.2-r0 +iperf3-3.6-r0 +iperf3-openrc-3.6-r0 +iproute2-4.19.0-r0 +iptables-1.6.2-r1 ipvsadm-1.29-r0 isl-0.18-r0 jansson-2.11-r0 -jq-1.6_rc1-r1 +jq-1.6-r0 json-c-0.13.1-r0 -keyutils-1.5.10-r0 -keyutils-libs-1.5.10-r0 +keyutils-1.6-r0 +keyutils-libs-1.6-r0 kmod-24-r1 kmod-openrc-24-r1 krb5-conf-1.0-r1 -krb5-dev-1.15.4-r0 -krb5-libs-1.15.4-r0 -krb5-server-ldap-1.15.4-r0 +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.2-r3 -libarchive-tools-3.3.2-r3 +libarchive-3.3.2-r4 +libarchive-tools-3.3.2-r4 libassuan-2.5.1-r0 -libatomic-6.4.0-r9 -libatomic_ops-7.6.4-r0 +libatomic-8.2.0-r2 libattr-2.4.47-r7 -libblkid-2.32-r0 +libblkid-2.33-r0 libbsd-0.8.6-r2 -libburn-1.4.8-r0 +libburn-1.5.0-r0 libbz2-1.0.6-r6 libc-dev-0.7.1-r0 libc-utils-0.7.1-r0 -libc6-compat-1.1.19-r10 -libcap-2.25-r1 -libcap-ng-0.7.9-r0 -libcap-ng-dev-0.7.9-r0 -libcom_err-1.44.2-r0 -libcrypto1.0-1.0.2q-r0 -libcurl-7.61.1-r1 -libdrm-2.4.92-r0 -libedit-20170329.3.1-r3 -libedit-dev-20170329.3.1-r3 +libc6-compat-1.1.20-r3 +libcap-2.26-r0 +libcap-ng-0.7.9-r1 +libcap-ng-dev-0.7.9-r1 +libcom_err-1.44.5-r0 +libcrypto1.1-1.1.1a-r1 +libcurl-7.64.0-r1 +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.4.3-r1 -libevent-2.1.8-r5 +libepoxy-1.5.3-r0 +libevent-2.1.8-r6 libexecinfo-1.1-r0 libexecinfo-dev-1.1-r0 -libfdisk-2.32-r0 -libffi-3.2.1-r4 -libgcc-6.4.0-r9 -libgcrypt-1.8.3-r0 +libfdisk-2.33-r0 +libffi-3.2.1-r6 +libgcc-8.2.0-r2 +libgcrypt-1.8.4-r0 libgmpxx-6.1.2-r1 -libgomp-6.4.0-r9 -libgpg-error-1.30-r0 -libintl-0.19.8.1-r2 +libgomp-8.2.0-r2 +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-r4 libksba-1.3.5-r0 -libldap-2.4.46-r0 +libldap-2.4.47-r2 libltdl-2.4.6-r5 -libmagic-5.32-r0 +libmagic-5.35-r0 libmnl-1.0.4-r0 -libmount-2.32-r0 +libmount-2.33-r0 libmspack-0.8_alpha-r0 -libnfsidmap-2.3.1-r4 +libnfsidmap-2.3.2-r1 libnftnl-libs-1.1.1-r0 libnl-1.1.4-r0 -libnl3-3.2.28-r1 +libnl3-3.4.0-r0 libogg-1.3.3-r2 -libpcap-1.8.1-r1 -libpciaccess-0.13.5-r1 -libpng-1.6.34-r1 -libressl-2.7.4-r0 -libressl-dev-2.7.4-r0 -libressl2.7-libcrypto-2.7.4-r0 -libressl2.7-libssl-2.7.4-r0 -libressl2.7-libtls-2.7.4-r0 -libsasl-2.1.26-r14 +libpcap-1.9.0-r1 +libpciaccess-0.14-r0 +libpng-1.6.35-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-r1 libseccomp-2.3.3-r1 libseccomp-dev-2.3.3-r1 -libsmartcols-2.32-r0 -libssh2-1.8.0-r3 -libssl1.0-1.0.2q-r0 -libstdc++-6.4.0-r9 +libsmartcols-2.33-r0 +libssh2-1.8.0-r4 +libssl1.1-1.1.1a-r1 +libstdc++-8.2.0-r2 libtasn1-4.13-r0 libtirpc-1.0.3-r0 libtirpc-dev-1.0.3-r0 +libtls-standalone-2.7.4-r6 libtool-2.4.6-r5 -libunistring-0.9.7-r0 -libunwind-1.2.1-r1 -libunwind-dev-1.2.1-r1 +libunistring-0.9.10-r0 +libunwind-1.2.1-r3 +libunwind-dev-1.2.1-r3 libusb-1.0.22-r0 -libuuid-2.32-r0 -libuv-1.20.2-r0 +libuuid-2.33-r0 +libuv-1.23.2-r0 libverto-0.3.0-r1 libwbclient-4.8.8-r0 -libxau-1.0.8-r2 +libx11-1.6.7-r0 +libxau-1.0.8-r3 libxcb-1.13-r2 -libxdmcp-1.1.2-r4 -libxkbcommon-0.7.1-r1 -libxml2-2.9.8-r1 -linux-headers-4.4.6-r2 -llvm5-5.0.1-r4 -llvm5-dev-5.0.1-r4 -llvm5-libs-5.0.1-r4 -llvm5-static-5.0.1-r4 -lsscsi-0.28-r0 +libxdmcp-1.1.2-r5 +libxkbcommon-0.8.2-r0 +libxml2-2.9.9-r1 +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 +lsscsi-0.30-r0 lua5.3-libs-5.3.5-r1 luajit-2.1.0_beta3-r4 luajit-dev-2.1.0_beta3-r4 -lz4-libs-1.8.2-r0 +lz4-libs-1.8.3-r2 lzip-1.20-r0 lzo-2.10-r2 m4-1.4.18-r1 make-4.2.1-r2 -mesa-gbm-18.0.5-r0 -mkinitfs-3.3.0-r1 +mesa-gbm-18.1.7-r1 +mkinitfs-3.4.1-r0 mpc1-1.0.3-r1 mpc1-dev-1.0.3-r1 mpfr-dev-3.1.5-r1 mpfr3-3.1.5-r1 -mtools-4.0.18-r2 -multipath-tools-0.7.7-r0 -musl-1.1.19-r10 -musl-dev-1.1.19-r10 -musl-utils-1.1.19-r10 -ncurses-dev-6.1_p20180818-r1 -ncurses-libs-6.1_p20180818-r1 -ncurses-terminfo-6.1_p20180818-r1 -ncurses-terminfo-base-6.1_p20180818-r1 -nettle-3.4-r1 -nfs-utils-2.3.1-r4 -nfs-utils-openrc-2.3.1-r4 -nghttp2-libs-1.32.0-r0 -npth-1.5-r1 -oniguruma-6.8.2-r0 -open-iscsi-2.0.874-r0 -open-isns-lib-0.97-r3 -open-vm-tools-10.1.15-r3 -openntpd-6.2_p3-r1 -openrc-0.35.5-r5 -openssh-keygen-7.7_p1-r3 -openssh-server-7.7_p1-r3 -openssh-server-common-7.7_p1-r3 -openssl-1.0.2q-r0 -openssl-dev-1.0.2q-r0 -opus-1.2.1-r1 +mtools-4.0.23-r0 +multipath-tools-0.7.9-r0 +musl-1.1.20-r3 +musl-dev-1.1.20-r3 +musl-utils-1.1.20-r3 +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-r0 +npth-1.6-r0 +oniguruma-6.9.1-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 +openssh-keygen-7.9_p1-r2 +openssh-server-7.9_p1-r2 +openssh-server-common-7.9_p1-r2 +openssl-1.1.1a-r1 +openssl-dev-1.1.1a-r1 +opus-1.3-r0 ovmf-0.0.20170624-r0 -p11-kit-0.23.10-r0 -patch-2.7.6-r2 +p11-kit-0.23.14-r0 +patch-2.7.6-r4 pax-utils-1.2.3-r0 -pcre-8.42-r0 -pcre2-10.31-r0 -pcsc-lite-libs-1.8.23-r1 +pcre-8.42-r1 +pcre2-10.32-r1 +pcsc-lite-libs-1.8.24-r1 perl-5.26.3-r0 pigz-2.4-r0 pinentry-1.1.0-r0 -pixman-0.34.0-r5 -pkgconf-1.5.3-r0 +pixman-0.34.0-r6 +pkgconf-1.6.0-r0 popt-1.16-r7 -python2-2.7.15-r1 -python3-3.6.6-r0 -qemu-2.12.0-r3 -qemu-aarch64-2.12.0-r3 -qemu-arm-2.12.0-r3 -qemu-guest-agent-2.12.0-r3 -qemu-img-2.12.0-r3 -qemu-ppc64le-2.12.0-r3 -qemu-system-arm-2.12.0-r3 -qemu-system-x86_64-2.12.0-r3 -readline-7.0.003-r0 -rhash-libs-1.3.6-r1 +python2-2.7.15-r3 +python3-3.6.8-r1 +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.4-r2 -sfdisk-2.32-r0 +sed-4.5-r0 +sfdisk-2.33-r0 sg3_utils-1.42-r1 -sgdisk-1.0.3-r0 +sgdisk-1.0.4-r0 slang-2.3.2-r0 slang-dev-2.3.2-r0 -snappy-1.1.4-r4 +snappy-1.1.7-r1 sntpc-0.9-r6 -socat-1.7.3.2-r4 -spice-server-0.14.1-r1 -sqlite-libs-3.25.3-r0 -squashfs-tools-4.3-r4 -ssl_client-1.28.4-r3 -strace-4.22-r0 -sudo-1.8.23-r2 -swig-3.0.12-r3 -syslinux-6.04_pre1-r1 -talloc-2.1.12-r0 -tar-1.31-r0 -tcl-8.6.7-r0 -tcpdump-4.9.2-r3 +socat-1.7.3.2-r5 +spice-server-0.14.1-r6 +sqlite-libs-3.26.0-r3 +squashfs-tools-4.3-r5 +ssl_client-1.29.3-r10 +strace-4.24-r0 +sudo-1.8.25_p1-r2 +swig-3.0.12-r4 +syslinux-6.04_pre1-r2 +talloc-2.1.14-r0 +tar-1.32-r0 +tcl-8.6.9-r0 +tcpdump-4.9.2-r4 tini-0.18.0-r0 -tzdata-2018f-r0 +tzdata-2018i-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.32-r0 -util-linux-dev-2.32-r0 -vde2-libs-2.3.2-r9 -vim-8.1.0115-r0 -wayland-libs-server-1.15.0-r0 -wireguard-tools-0.0.20190123-r2 +util-linux-2.33-r0 +util-linux-dev-2.33-r0 +vde2-libs-2.3.2-r10 +vim-8.1.0630-r0 +virglrenderer-0.7.0-r1 +wayland-libs-server-1.16.0-r0 +wireguard-tools-0.0.20190227-r0 wireless-tools-30_pre9-r0 -wpa_supplicant-2.6-r14 -wpa_supplicant-openrc-2.6-r14 -xfsprogs-4.16.1-r1 -xfsprogs-extra-4.16.1-r1 +wpa_supplicant-2.7-r0 +wpa_supplicant-openrc-2.7-r0 +xfsprogs-4.19.0-r1 +xfsprogs-extra-4.19.0-r1 xorriso-1.4.8-r0 xz-5.2.4-r0 xz-dev-5.2.4-r0 xz-libs-5.2.4-r0 -zfs-0.7.8-r0 -zfs-libs-0.7.8-r0 +zfs-0.7.12-r0 +zfs-libs-0.7.12-r0 zlib-1.2.11-r1 zlib-dev-1.2.11-r1 From f6f13d6c4b2c98ea78e9469d5c8dcf99a5dc1515 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 18:01:54 +0000 Subject: [PATCH 03/31] tools/alpine: Update to latest Signed-off-by: Rolf Neugebauer --- tools/alpine/versions.aarch64 | 404 +++++++++++++++++----------------- tools/alpine/versions.s390x | 398 ++++++++++++++++----------------- tools/alpine/versions.x86_64 | 2 +- 3 files changed, 406 insertions(+), 398 deletions(-) diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 230d5e48b..98ca46e6c 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,311 +1,315 @@ -# linuxkit/alpine:915a4c2f6bef52a89ec1e573d05431bbef4a546d-arm64 +# linuxkit/alpine:0a88e4620f01d271f46c99478b6a091c22b60361-arm64 # automatically generated list of installed packages -abuild-3.2.0-r0 -alpine-baselayout-3.1.0-r0 +abuild-3.3.0-r1 +alpine-baselayout-3.1.0-r3 alpine-keys-2.1-r1 -apk-tools-2.10.1-r0 +apk-tools-2.10.3-r1 argon2-libs-20171227-r1 argp-standalone-1.3-r3 attr-2.4.47-r7 attr-dev-2.4.47-r7 -audit-2.8.3-r1 -audit-libs-2.8.3-r1 +audit-2.8.4-r0 +audit-libs-2.8.4-r0 +audit-openrc-2.8.4-r0 autoconf-2.69-r2 automake-1.16.1-r0 bash-4.4.19-r1 bc-1.07.1-r0 -binutils-2.30-r5 -binutils-dev-2.30-r5 -bison-3.0.4-r1 -blkid-2.32-r0 +binutils-2.31.1-r2 +binutils-dev-2.31.1-r2 +bison-3.0.5-r0 +blkid-2.33-r0 bridge-utils-1.6-r0 bsd-compat-headers-0.7.1-r0 -btrfs-progs-4.17-r1 -btrfs-progs-dev-4.17-r1 -btrfs-progs-libs-4.17-r1 +btrfs-progs-4.19.1-r0 +btrfs-progs-dev-4.19.1-r0 +btrfs-progs-libs-4.19.1-r0 build-base-0.5-r1 -busybox-1.28.4-r3 -busybox-initscripts-3.1-r4 +busybox-1.29.3-r10 +busybox-initscripts-3.1-r6 bzip2-1.0.6-r6 -ca-certificates-20171114-r3 +ca-certificates-20190108-r0 +ca-certificates-cacert-20190108-r0 cdrkit-1.1.11-r2 celt051-0.5.1.3-r0 cifs-utils-6.8-r0 -clang-5.0.1-r1 -clang-dev-5.0.1-r1 -clang-libs-5.0.1-r1 -clang-static-5.0.1-r1 -cmake-3.11.1-r2 -cmake-bash-completion-3.11.1-r2 -coreutils-8.29-r2 -cryptsetup-2.0.2-r3 -cryptsetup-libs-2.0.2-r3 -curl-7.61.1-r1 -db-5.3.28-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-r1 +db-5.3.28-r1 dbus-libs-1.10.24-r1 -device-mapper-libs-2.02.178-r0 -dhcpcd-7.0.7-r0 -dhcpcd-openrc-7.0.7-r0 -diffutils-3.6-r1 +device-mapper-libs-2.02.182-r0 +dhcpcd-7.0.8-r0 +dhcpcd-openrc-7.0.8-r0 +diffutils-3.7-r0 dosfstools-4.1-r1 -dtc-1.4.4-r0 -e2fsprogs-1.44.2-r0 -e2fsprogs-dev-1.44.2-r0 -e2fsprogs-extra-1.44.2-r0 -e2fsprogs-libs-1.44.2-r0 +dtc-1.4.7-r0 +e2fsprogs-1.44.5-r0 +e2fsprogs-dev-1.44.5-r0 +e2fsprogs-extra-1.44.5-r0 +e2fsprogs-libs-1.44.5-r0 ebtables-2.0.10.4-r2 -elfutils-dev-0.168-r1 -elfutils-libelf-0.168-r1 -ethtool-4.16-r0 -eudev-3.2.5-r2 -eudev-libs-3.2.5-r2 -expat-2.2.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.6-r0 expect-5.45.4-r0 -fakeroot-1.22-r0 -file-5.32-r0 -findmnt-2.32-r0 +fakeroot-1.23-r0 +file-5.35-r0 +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-0.9-r0 +fortify-headers-1.0-r0 fts-1.2.7-r1 fts-dev-1.2.7-r1 -g++-6.4.0-r9 +g++-8.2.0-r2 gc-7.6.4-r2 -gcc-6.4.0-r9 +gcc-8.2.0-r2 gdbm-1.13-r1 -gettext-0.19.8.1-r2 -gettext-asprintf-0.19.8.1-r2 -gettext-dev-0.19.8.1-r2 -gettext-libs-0.19.8.1-r2 -git-2.18.1-r0 -glib-2.56.1-r0 +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.1-r0 +glib-2.58.1-r2 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 -gnupg-2.2.8-r0 -gnutls-3.6.2-r0 -go-1.10.8-r0 +gnupg-2.2.12-r0 +gnutls-3.6.4-r0 +go-1.11.5-r0 grep-3.1-r2 guile-2.0.14-r0 guile-libs-2.0.14-r0 hvtools-4.11.9-r0 installkernel-3.5-r0 -iperf3-3.5-r1 -iperf3-openrc-3.5-r1 -iproute2-4.13.0-r0 -iptables-1.6.2-r0 +iperf3-3.6-r0 +iperf3-openrc-3.6-r0 +iproute2-4.19.0-r0 +iptables-1.6.2-r1 ipvsadm-1.29-r0 isl-0.18-r0 jansson-2.11-r0 -jq-1.6_rc1-r1 +jq-1.6-r0 json-c-0.13.1-r0 -keyutils-1.5.10-r0 -keyutils-libs-1.5.10-r0 +keyutils-1.6-r0 +keyutils-libs-1.6-r0 kmod-24-r1 kmod-openrc-24-r1 krb5-conf-1.0-r1 -krb5-dev-1.15.4-r0 -krb5-libs-1.15.4-r0 -krb5-server-ldap-1.15.4-r0 +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.2-r3 -libarchive-tools-3.3.2-r3 +libarchive-3.3.2-r4 +libarchive-tools-3.3.2-r4 libassuan-2.5.1-r0 -libatomic-6.4.0-r9 -libatomic_ops-7.6.4-r0 +libatomic-8.2.0-r2 libattr-2.4.47-r7 -libblkid-2.32-r0 +libblkid-2.33-r0 libbsd-0.8.6-r2 -libburn-1.4.8-r0 +libburn-1.5.0-r0 libbz2-1.0.6-r6 libc-dev-0.7.1-r0 libc-utils-0.7.1-r0 -libc6-compat-1.1.19-r10 -libcap-2.25-r1 -libcap-ng-0.7.9-r0 -libcap-ng-dev-0.7.9-r0 -libcom_err-1.44.2-r0 -libcrypto1.0-1.0.2q-r0 -libcurl-7.61.1-r1 -libdrm-2.4.92-r0 -libedit-20170329.3.1-r3 -libedit-dev-20170329.3.1-r3 +libc6-compat-1.1.20-r3 +libcap-2.26-r0 +libcap-ng-0.7.9-r1 +libcap-ng-dev-0.7.9-r1 +libcom_err-1.44.5-r0 +libcrypto1.1-1.1.1a-r1 +libcurl-7.64.0-r1 +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.4.3-r1 -libevent-2.1.8-r5 +libepoxy-1.5.3-r0 +libevent-2.1.8-r6 libexecinfo-1.1-r0 libexecinfo-dev-1.1-r0 -libfdisk-2.32-r0 -libffi-3.2.1-r4 -libgcc-6.4.0-r9 -libgcrypt-1.8.3-r0 +libfdisk-2.33-r0 +libffi-3.2.1-r6 +libgcc-8.2.0-r2 +libgcrypt-1.8.4-r0 libgmpxx-6.1.2-r1 -libgomp-6.4.0-r9 -libgpg-error-1.30-r0 -libintl-0.19.8.1-r2 +libgomp-8.2.0-r2 +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-r4 libksba-1.3.5-r0 -libldap-2.4.46-r0 +libldap-2.4.47-r2 libltdl-2.4.6-r5 -libmagic-5.32-r0 +libmagic-5.35-r0 libmnl-1.0.4-r0 -libmount-2.32-r0 -libnfsidmap-2.3.1-r4 +libmount-2.33-r0 +libnfsidmap-2.3.2-r1 libnftnl-libs-1.1.1-r0 libnl-1.1.4-r0 -libnl3-3.2.28-r1 +libnl3-3.4.0-r0 libogg-1.3.3-r2 -libpcap-1.8.1-r1 -libpng-1.6.34-r1 -libressl-2.7.4-r0 -libressl-dev-2.7.4-r0 -libressl2.7-libcrypto-2.7.4-r0 -libressl2.7-libssl-2.7.4-r0 -libressl2.7-libtls-2.7.4-r0 -libsasl-2.1.26-r14 +libpcap-1.9.0-r1 +libpng-1.6.35-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-r1 libseccomp-2.3.3-r1 libseccomp-dev-2.3.3-r1 -libsmartcols-2.32-r0 -libssh2-1.8.0-r3 -libssl1.0-1.0.2q-r0 -libstdc++-6.4.0-r9 +libsmartcols-2.33-r0 +libssh2-1.8.0-r4 +libssl1.1-1.1.1a-r1 +libstdc++-8.2.0-r2 libtasn1-4.13-r0 libtirpc-1.0.3-r0 libtirpc-dev-1.0.3-r0 +libtls-standalone-2.7.4-r6 libtool-2.4.6-r5 -libunistring-0.9.7-r0 -libunwind-1.2.1-r1 -libunwind-dev-1.2.1-r1 +libunistring-0.9.10-r0 +libunwind-1.2.1-r3 +libunwind-dev-1.2.1-r3 libusb-1.0.22-r0 -libuuid-2.32-r0 -libuv-1.20.2-r0 +libuuid-2.33-r0 +libuv-1.23.2-r0 libverto-0.3.0-r1 libwbclient-4.8.8-r0 -libxau-1.0.8-r2 +libx11-1.6.7-r0 +libxau-1.0.8-r3 libxcb-1.13-r2 -libxdmcp-1.1.2-r4 -libxkbcommon-0.7.1-r1 -libxml2-2.9.8-r1 -linux-headers-4.4.6-r2 -llvm5-5.0.1-r4 -llvm5-dev-5.0.1-r4 -llvm5-libs-5.0.1-r4 -llvm5-static-5.0.1-r4 -lsscsi-0.28-r0 +libxdmcp-1.1.2-r5 +libxkbcommon-0.8.2-r0 +libxml2-2.9.9-r1 +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 +lsscsi-0.30-r0 lua5.3-libs-5.3.5-r1 luajit-2.1.0_beta3-r4 luajit-dev-2.1.0_beta3-r4 -lz4-libs-1.8.2-r0 +lz4-libs-1.8.3-r2 lzip-1.20-r0 lzo-2.10-r2 m4-1.4.18-r1 make-4.2.1-r2 -mesa-gbm-18.0.5-r0 +mesa-gbm-18.1.7-r1 mpc1-1.0.3-r1 mpc1-dev-1.0.3-r1 mpfr-dev-3.1.5-r1 mpfr3-3.1.5-r1 -mtools-4.0.18-r2 -multipath-tools-0.7.7-r0 -musl-1.1.19-r10 -musl-dev-1.1.19-r10 -musl-utils-1.1.19-r10 -ncurses-dev-6.1_p20180818-r1 -ncurses-libs-6.1_p20180818-r1 -ncurses-terminfo-6.1_p20180818-r1 -ncurses-terminfo-base-6.1_p20180818-r1 -nettle-3.4-r1 -nfs-utils-2.3.1-r4 -nfs-utils-openrc-2.3.1-r4 -nghttp2-libs-1.32.0-r0 -npth-1.5-r1 -oniguruma-6.8.2-r0 -open-iscsi-2.0.874-r0 -open-isns-lib-0.97-r3 -openntpd-6.2_p3-r1 -openrc-0.35.5-r5 -openssh-keygen-7.7_p1-r3 -openssh-server-7.7_p1-r3 -openssh-server-common-7.7_p1-r3 -openssl-1.0.2q-r0 -openssl-dev-1.0.2q-r0 -opus-1.2.1-r1 -p11-kit-0.23.10-r0 -patch-2.7.6-r2 +mtools-4.0.23-r0 +multipath-tools-0.7.9-r0 +musl-1.1.20-r3 +musl-dev-1.1.20-r3 +musl-utils-1.1.20-r3 +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-r0 +npth-1.6-r0 +oniguruma-6.9.1-r0 +open-iscsi-2.0.874-r2 +open-isns-lib-0.97-r4 +openntpd-6.2_p3-r2 +openrc-0.39.2-r3 +openssh-keygen-7.9_p1-r2 +openssh-server-7.9_p1-r2 +openssh-server-common-7.9_p1-r2 +openssl-1.1.1a-r1 +openssl-dev-1.1.1a-r1 +opus-1.3-r0 +p11-kit-0.23.14-r0 +patch-2.7.6-r4 pax-utils-1.2.3-r0 -pcre-8.42-r0 -pcre2-10.31-r0 -pcsc-lite-libs-1.8.23-r1 +pcre-8.42-r1 +pcre2-10.32-r1 +pcsc-lite-libs-1.8.24-r1 perl-5.26.3-r0 pigz-2.4-r0 pinentry-1.1.0-r0 -pixman-0.34.0-r5 -pkgconf-1.5.3-r0 +pixman-0.34.0-r6 +pkgconf-1.6.0-r0 popt-1.16-r7 -python2-2.7.15-r1 -python3-3.6.6-r0 -qemu-2.12.0-r3 -qemu-aarch64-2.12.0-r3 -qemu-arm-2.12.0-r3 -qemu-guest-agent-2.12.0-r3 -qemu-img-2.12.0-r3 -qemu-ppc64le-2.12.0-r3 -qemu-system-aarch64-2.12.0-r3 -qemu-system-arm-2.12.0-r3 -qemu-system-x86_64-2.12.0-r3 -readline-7.0.003-r0 -rhash-libs-1.3.6-r1 +python2-2.7.15-r3 +python3-3.6.8-r1 +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.4-r2 -sfdisk-2.32-r0 +sed-4.5-r0 +sfdisk-2.33-r0 sg3_utils-1.42-r1 -sgdisk-1.0.3-r0 +sgdisk-1.0.4-r0 slang-2.3.2-r0 slang-dev-2.3.2-r0 -snappy-1.1.4-r4 +snappy-1.1.7-r1 sntpc-0.9-r6 -socat-1.7.3.2-r4 -spice-server-0.14.1-r1 -sqlite-libs-3.25.3-r0 -squashfs-tools-4.3-r4 -ssl_client-1.28.4-r3 -strace-4.22-r0 -sudo-1.8.23-r2 -swig-3.0.12-r3 -talloc-2.1.12-r0 -tar-1.31-r0 -tcl-8.6.7-r0 -tcpdump-4.9.2-r3 +socat-1.7.3.2-r5 +spice-server-0.14.1-r6 +sqlite-libs-3.26.0-r3 +squashfs-tools-4.3-r5 +ssl_client-1.29.3-r10 +strace-4.24-r0 +sudo-1.8.25_p1-r2 +swig-3.0.12-r4 +talloc-2.1.14-r0 +tar-1.32-r0 +tcl-8.6.9-r0 +tcpdump-4.9.2-r4 tini-0.18.0-r0 -tzdata-2018f-r0 +tzdata-2018i-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.32-r0 -util-linux-dev-2.32-r0 -vde2-libs-2.3.2-r9 -vim-8.1.0115-r0 -wayland-libs-server-1.15.0-r0 -wireguard-tools-0.0.20190123-r2 +util-linux-2.33-r0 +util-linux-dev-2.33-r0 +vde2-libs-2.3.2-r10 +vim-8.1.0630-r0 +virglrenderer-0.7.0-r1 +wayland-libs-server-1.16.0-r0 +wireguard-tools-0.0.20190227-r0 wireless-tools-30_pre9-r0 -wpa_supplicant-2.6-r14 -wpa_supplicant-openrc-2.6-r14 -xfsprogs-4.16.1-r1 -xfsprogs-extra-4.16.1-r1 +wpa_supplicant-2.7-r0 +wpa_supplicant-openrc-2.7-r0 +xfsprogs-4.19.0-r1 +xfsprogs-extra-4.19.0-r1 xorriso-1.4.8-r0 xz-5.2.4-r0 xz-dev-5.2.4-r0 xz-libs-5.2.4-r0 -zfs-0.7.8-r0 -zfs-libs-0.7.8-r0 +zfs-0.7.12-r0 +zfs-libs-0.7.12-r0 zlib-1.2.11-r1 zlib-dev-1.2.11-r1 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index f93a3467c..84805ad6d 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,304 +1,308 @@ -# linuxkit/alpine:61cdbbff3e159a0c082036f0c4bda4b5c03b7802-s390x +# linuxkit/alpine:0b76f8f8e9e86f15d962f80f7b4dc7621e261e7d-s390x # automatically generated list of installed packages -abuild-3.2.0-r0 -alpine-baselayout-3.1.0-r0 +abuild-3.3.0-r1 +alpine-baselayout-3.1.0-r3 alpine-keys-2.1-r1 -apk-tools-2.10.1-r0 +apk-tools-2.10.3-r1 argon2-libs-20171227-r1 argp-standalone-1.3-r3 attr-2.4.47-r7 attr-dev-2.4.47-r7 -audit-2.8.3-r1 -audit-libs-2.8.3-r1 +audit-2.8.4-r0 +audit-libs-2.8.4-r0 +audit-openrc-2.8.4-r0 autoconf-2.69-r2 automake-1.16.1-r0 bash-4.4.19-r1 bc-1.07.1-r0 -binutils-2.30-r5 -binutils-dev-2.30-r5 -bison-3.0.4-r1 -blkid-2.32-r0 +binutils-2.31.1-r2 +binutils-dev-2.31.1-r2 +bison-3.0.5-r0 +blkid-2.33-r0 bridge-utils-1.6-r0 bsd-compat-headers-0.7.1-r0 -btrfs-progs-4.17-r1 -btrfs-progs-dev-4.17-r1 -btrfs-progs-libs-4.17-r1 +btrfs-progs-4.19.1-r0 +btrfs-progs-dev-4.19.1-r0 +btrfs-progs-libs-4.19.1-r0 build-base-0.5-r1 -busybox-1.28.4-r3 -busybox-initscripts-3.1-r4 +busybox-1.29.3-r10 +busybox-initscripts-3.1-r6 bzip2-1.0.6-r6 -ca-certificates-20171114-r3 +ca-certificates-20190108-r0 +ca-certificates-cacert-20190108-r0 cdrkit-1.1.11-r2 celt051-0.5.1.3-r0 cifs-utils-6.8-r0 -clang-5.0.1-r1 -clang-dev-5.0.1-r1 -clang-libs-5.0.1-r1 -clang-static-5.0.1-r1 -cmake-3.11.1-r2 -cmake-bash-completion-3.11.1-r2 -coreutils-8.29-r2 -cryptsetup-2.0.2-r3 -cryptsetup-libs-2.0.2-r3 -curl-7.61.1-r1 -db-5.3.28-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-r1 +db-5.3.28-r1 dbus-libs-1.10.24-r1 -device-mapper-libs-2.02.178-r0 -dhcpcd-7.0.7-r0 -dhcpcd-openrc-7.0.7-r0 -diffutils-3.6-r1 +device-mapper-libs-2.02.182-r0 +dhcpcd-7.0.8-r0 +dhcpcd-openrc-7.0.8-r0 +diffutils-3.7-r0 dosfstools-4.1-r1 -dtc-1.4.4-r0 -e2fsprogs-1.44.2-r0 -e2fsprogs-dev-1.44.2-r0 -e2fsprogs-extra-1.44.2-r0 -e2fsprogs-libs-1.44.2-r0 +dtc-1.4.7-r0 +e2fsprogs-1.44.5-r0 +e2fsprogs-dev-1.44.5-r0 +e2fsprogs-extra-1.44.5-r0 +e2fsprogs-libs-1.44.5-r0 ebtables-2.0.10.4-r2 -elfutils-dev-0.168-r1 -elfutils-libelf-0.168-r1 -ethtool-4.16-r0 -eudev-3.2.5-r2 -eudev-libs-3.2.5-r2 -expat-2.2.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.6-r0 expect-5.45.4-r0 -fakeroot-1.22-r0 -file-5.32-r0 -findmnt-2.32-r0 +fakeroot-1.23-r0 +file-5.35-r0 +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-0.9-r0 +fortify-headers-1.0-r0 fts-1.2.7-r1 fts-dev-1.2.7-r1 -g++-6.4.0-r9 +g++-8.2.0-r2 gc-7.6.4-r2 -gcc-6.4.0-r9 +gcc-8.2.0-r2 gdbm-1.13-r1 -gettext-0.19.8.1-r2 -gettext-asprintf-0.19.8.1-r2 -gettext-dev-0.19.8.1-r2 -gettext-libs-0.19.8.1-r2 -git-2.18.1-r0 -glib-2.56.1-r0 +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.1-r0 +glib-2.58.1-r2 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 -gnupg-2.2.8-r0 -gnutls-3.6.2-r0 -go-1.10.8-r0 +gnupg-2.2.12-r0 +gnutls-3.6.4-r0 +go-1.11.5-r0 grep-3.1-r2 guile-2.0.14-r0 guile-libs-2.0.14-r0 hvtools-4.11.9-r0 installkernel-3.5-r0 -iperf3-3.5-r1 -iperf3-openrc-3.5-r1 -iproute2-4.13.0-r0 -iptables-1.6.2-r0 +iperf3-3.6-r0 +iperf3-openrc-3.6-r0 +iproute2-4.19.0-r0 +iptables-1.6.2-r1 ipvsadm-1.29-r0 isl-0.18-r0 jansson-2.11-r0 -jq-1.6_rc1-r1 +jq-1.6-r0 json-c-0.13.1-r0 -keyutils-1.5.10-r0 -keyutils-libs-1.5.10-r0 +keyutils-1.6-r0 +keyutils-libs-1.6-r0 kmod-24-r1 kmod-openrc-24-r1 krb5-conf-1.0-r1 -krb5-dev-1.15.4-r0 -krb5-libs-1.15.4-r0 -krb5-server-ldap-1.15.4-r0 +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.2-r3 -libarchive-tools-3.3.2-r3 +libarchive-3.3.2-r4 +libarchive-tools-3.3.2-r4 libassuan-2.5.1-r0 -libatomic-6.4.0-r9 +libatomic-8.2.0-r2 libattr-2.4.47-r7 -libblkid-2.32-r0 +libblkid-2.33-r0 libbsd-0.8.6-r2 -libburn-1.4.8-r0 +libburn-1.5.0-r0 libbz2-1.0.6-r6 libc-dev-0.7.1-r0 libc-utils-0.7.1-r0 -libc6-compat-1.1.19-r10 -libcap-2.25-r1 -libcap-ng-0.7.9-r0 -libcap-ng-dev-0.7.9-r0 -libcom_err-1.44.2-r0 -libcrypto1.0-1.0.2q-r0 -libcurl-7.61.1-r1 -libdrm-2.4.92-r0 -libedit-20170329.3.1-r3 -libedit-dev-20170329.3.1-r3 +libc6-compat-1.1.20-r3 +libcap-2.26-r0 +libcap-ng-0.7.9-r1 +libcap-ng-dev-0.7.9-r1 +libcom_err-1.44.5-r0 +libcrypto1.1-1.1.1a-r1 +libcurl-7.64.0-r1 +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.4.3-r1 -libevent-2.1.8-r5 -libfdisk-2.32-r0 -libffi-3.2.1-r4 -libgcc-6.4.0-r9 -libgcrypt-1.8.3-r0 +libepoxy-1.5.3-r0 +libevent-2.1.8-r6 +libfdisk-2.33-r0 +libffi-3.2.1-r6 +libgcc-8.2.0-r2 +libgcrypt-1.8.4-r0 libgmpxx-6.1.2-r1 -libgomp-6.4.0-r9 -libgpg-error-1.30-r0 -libintl-0.19.8.1-r2 +libgomp-8.2.0-r2 +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-r4 libksba-1.3.5-r0 -libldap-2.4.46-r0 +libldap-2.4.47-r2 libltdl-2.4.6-r5 -libmagic-5.32-r0 +libmagic-5.35-r0 libmnl-1.0.4-r0 -libmount-2.32-r0 -libnfsidmap-2.3.1-r4 +libmount-2.33-r0 +libnfsidmap-2.3.2-r1 libnftnl-libs-1.1.1-r0 libnl-1.1.4-r0 -libnl3-3.2.28-r1 +libnl3-3.4.0-r0 libogg-1.3.3-r2 -libpcap-1.8.1-r1 -libpng-1.6.34-r1 -libressl-2.7.4-r0 -libressl-dev-2.7.4-r0 -libressl2.7-libcrypto-2.7.4-r0 -libressl2.7-libssl-2.7.4-r0 -libressl2.7-libtls-2.7.4-r0 -libsasl-2.1.26-r14 +libpcap-1.9.0-r1 +libpng-1.6.35-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-r1 libseccomp-2.3.3-r1 libseccomp-dev-2.3.3-r1 -libsmartcols-2.32-r0 -libssh2-1.8.0-r3 -libssl1.0-1.0.2q-r0 -libstdc++-6.4.0-r9 +libsmartcols-2.33-r0 +libssh2-1.8.0-r4 +libssl1.1-1.1.1a-r1 +libstdc++-8.2.0-r2 libtasn1-4.13-r0 libtirpc-1.0.3-r0 libtirpc-dev-1.0.3-r0 +libtls-standalone-2.7.4-r6 libtool-2.4.6-r5 -libunistring-0.9.7-r0 +libunistring-0.9.10-r0 libusb-1.0.22-r0 -libuuid-2.32-r0 -libuv-1.20.2-r0 +libuuid-2.33-r0 +libuv-1.23.2-r0 libverto-0.3.0-r1 libwbclient-4.8.8-r0 -libxau-1.0.8-r2 +libx11-1.6.7-r0 +libxau-1.0.8-r3 libxcb-1.13-r2 -libxdmcp-1.1.2-r4 -libxkbcommon-0.7.1-r1 -libxml2-2.9.8-r1 -linux-headers-4.4.6-r2 -llvm5-5.0.1-r4 -llvm5-dev-5.0.1-r4 -llvm5-libs-5.0.1-r4 -llvm5-static-5.0.1-r4 -lsscsi-0.28-r0 +libxdmcp-1.1.2-r5 +libxkbcommon-0.8.2-r0 +libxml2-2.9.9-r1 +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 +lsscsi-0.30-r0 lua5.3-libs-5.3.5-r1 -lz4-libs-1.8.2-r0 +lz4-libs-1.8.3-r2 lzip-1.20-r0 lzo-2.10-r2 m4-1.4.18-r1 make-4.2.1-r2 -mesa-gbm-18.0.5-r0 +mesa-gbm-18.1.7-r1 mpc1-1.0.3-r1 mpc1-dev-1.0.3-r1 mpfr-dev-3.1.5-r1 mpfr3-3.1.5-r1 -mtools-4.0.18-r2 -multipath-tools-0.7.7-r0 -musl-1.1.19-r10 -musl-dev-1.1.19-r10 -musl-utils-1.1.19-r10 -ncurses-dev-6.1_p20180818-r1 -ncurses-libs-6.1_p20180818-r1 -ncurses-terminfo-6.1_p20180818-r1 -ncurses-terminfo-base-6.1_p20180818-r1 -nettle-3.4-r1 -nfs-utils-2.3.1-r4 -nfs-utils-openrc-2.3.1-r4 -nghttp2-libs-1.32.0-r0 -npth-1.5-r1 -oniguruma-6.8.2-r0 -open-iscsi-2.0.874-r0 -open-isns-lib-0.97-r3 -openntpd-6.2_p3-r1 -openrc-0.35.5-r5 -openssh-keygen-7.7_p1-r3 -openssh-server-7.7_p1-r3 -openssh-server-common-7.7_p1-r3 -openssl-1.0.2q-r0 -openssl-dev-1.0.2q-r0 -opus-1.2.1-r1 -p11-kit-0.23.10-r0 -patch-2.7.6-r2 +mtools-4.0.23-r0 +multipath-tools-0.7.9-r0 +musl-1.1.20-r3 +musl-dev-1.1.20-r3 +musl-utils-1.1.20-r3 +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-r0 +npth-1.6-r0 +oniguruma-6.9.1-r0 +open-iscsi-2.0.874-r2 +open-isns-lib-0.97-r4 +openntpd-6.2_p3-r2 +openrc-0.39.2-r3 +openssh-keygen-7.9_p1-r2 +openssh-server-7.9_p1-r2 +openssh-server-common-7.9_p1-r2 +openssl-1.1.1a-r1 +openssl-dev-1.1.1a-r1 +opus-1.3-r0 +p11-kit-0.23.14-r0 +patch-2.7.6-r4 pax-utils-1.2.3-r0 -pcre-8.42-r0 -pcre2-10.31-r0 -pcsc-lite-libs-1.8.23-r1 +pcre-8.42-r1 +pcre2-10.32-r1 +pcsc-lite-libs-1.8.24-r1 perl-5.26.3-r0 pigz-2.4-r0 pinentry-1.1.0-r0 -pixman-0.34.0-r5 -pkgconf-1.5.3-r0 +pixman-0.34.0-r6 +pkgconf-1.6.0-r0 popt-1.16-r7 -python2-2.7.15-r1 -python3-3.6.6-r0 -qemu-2.12.0-r3 -qemu-aarch64-2.12.0-r3 -qemu-arm-2.12.0-r3 -qemu-guest-agent-2.12.0-r3 -qemu-img-2.12.0-r3 -qemu-ppc64le-2.12.0-r3 -qemu-system-arm-2.12.0-r3 -qemu-system-s390x-2.12.0-r3 -qemu-system-x86_64-2.12.0-r3 -readline-7.0.003-r0 -rhash-libs-1.3.6-r1 +python2-2.7.15-r3 +python3-3.6.8-r1 +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.4-r2 -sfdisk-2.32-r0 +sed-4.5-r0 +sfdisk-2.33-r0 sg3_utils-1.42-r1 -sgdisk-1.0.3-r0 +sgdisk-1.0.4-r0 slang-2.3.2-r0 slang-dev-2.3.2-r0 -snappy-1.1.4-r4 +snappy-1.1.7-r1 sntpc-0.9-r6 -socat-1.7.3.2-r4 -spice-server-0.14.1-r1 -sqlite-libs-3.25.3-r0 -squashfs-tools-4.3-r4 -ssl_client-1.28.4-r3 -strace-4.22-r0 -sudo-1.8.23-r2 -swig-3.0.12-r3 -talloc-2.1.12-r0 -tar-1.31-r0 -tcl-8.6.7-r0 -tcpdump-4.9.2-r3 +socat-1.7.3.2-r5 +spice-server-0.14.1-r6 +sqlite-libs-3.26.0-r3 +squashfs-tools-4.3-r5 +ssl_client-1.29.3-r10 +sudo-1.8.25_p1-r2 +swig-3.0.12-r4 +talloc-2.1.14-r0 +tar-1.32-r0 +tcl-8.6.9-r0 +tcpdump-4.9.2-r4 tini-0.18.0-r0 -tzdata-2018f-r0 +tzdata-2018i-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.32-r0 -util-linux-dev-2.32-r0 -vde2-libs-2.3.2-r9 -vim-8.1.0115-r0 -wayland-libs-server-1.15.0-r0 -wireguard-tools-0.0.20190123-r2 +util-linux-2.33-r0 +util-linux-dev-2.33-r0 +vde2-libs-2.3.2-r10 +vim-8.1.0630-r0 +virglrenderer-0.7.0-r1 +wayland-libs-server-1.16.0-r0 +wireguard-tools-0.0.20190227-r0 wireless-tools-30_pre9-r0 -wpa_supplicant-2.6-r14 -wpa_supplicant-openrc-2.6-r14 -xfsprogs-4.16.1-r1 -xfsprogs-extra-4.16.1-r1 +wpa_supplicant-2.7-r0 +wpa_supplicant-openrc-2.7-r0 +xfsprogs-4.19.0-r1 +xfsprogs-extra-4.19.0-r1 xorriso-1.4.8-r0 xz-5.2.4-r0 xz-dev-5.2.4-r0 xz-libs-5.2.4-r0 -zfs-0.7.8-r0 -zfs-libs-0.7.8-r0 +zfs-0.7.12-r0 +zfs-libs-0.7.12-r0 zlib-1.2.11-r1 zlib-dev-1.2.11-r1 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 229d71c1c..4acee3eff 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:3948f7bfe317fd4ced93dd815bd39cf367a5ee2e-amd64 +# linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0-amd64 # automatically generated list of installed packages abuild-3.3.0-r1 alpine-baselayout-3.1.0-r3 From 4f715f5f2af822d60f41726c35317f1fe4d931c4 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 19:06:59 +0000 Subject: [PATCH 04/31] tools: Update to the latest linuxkit/alpine Skip the packages which use grub to boot EFI images. The grub build fails, see: https://github.com/linuxkit/linuxkit/issues/3295 Signed-off-by: Rolf Neugebauer --- tools/go-compile/Dockerfile | 2 +- tools/mkimage-iso-bios/Dockerfile | 2 +- tools/mkimage-iso/Dockerfile | 2 +- tools/mkimage-raw-bios/Dockerfile | 2 +- tools/mkimage-rpi3/Dockerfile | 2 +- tools/mkimage-squashfs/Dockerfile | 2 +- tools/qemu/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile index 4a0cf82ff..dc33a6a4e 100644 --- a/tools/go-compile/Dockerfile +++ b/tools/go-compile/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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 84aa838d6..dbc7d0c64 100644 --- a/tools/mkimage-iso-bios/Dockerfile +++ b/tools/mkimage-iso-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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 110bccf65..c924695cf 100644 --- a/tools/mkimage-iso/Dockerfile +++ b/tools/mkimage-iso/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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 9fc6f6e69..864b139c7 100644 --- a/tools/mkimage-raw-bios/Dockerfile +++ b/tools/mkimage-raw-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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 a653de6b4..7928a9215 100644 --- a/tools/mkimage-rpi3/Dockerfile +++ b/tools/mkimage-rpi3/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as build +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 as build RUN apk add \ bc \ dtc \ diff --git a/tools/mkimage-squashfs/Dockerfile b/tools/mkimage-squashfs/Dockerfile index a5cbfcbf0..4e9accd92 100644 --- a/tools/mkimage-squashfs/Dockerfile +++ b/tools/mkimage-squashfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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/qemu/Dockerfile b/tools/qemu/Dockerfile index b33ac618c..9f2d4eeae 100644 --- a/tools/qemu/Dockerfile +++ b/tools/qemu/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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 5910713baea6012a85fd3cde7371dd174931abdd Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 19:18:46 +0000 Subject: [PATCH 05/31] Update use of tools to latest Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- docs/vendoring.md | 4 ++-- src/cmd/linuxkit/moby/output.go | 10 +++++----- src/cmd/linuxkit/run_qemu.go | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 5a00dd22f..619cfa8e8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION="v0.6+" GIT_COMMIT=$(shell git rev-list -1 HEAD) -GO_COMPILE=linuxkit/go-compile:e1204ce9921c1d45362a374e06be7234d3bf1184 +GO_COMPILE=linuxkit/go-compile:0a927ab41060951b15645f0f9cc257ec810c0a0f ifeq ($(OS),Windows_NT) LINUXKIT?=bin/linuxkit.exe diff --git a/docs/vendoring.md b/docs/vendoring.md index 0c9ac57da..8e69e80fa 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:e1204ce9921c1d45362a374e06be7234d3bf1184 +linuxkit/go-compile:0a927ab41060951b15645f0f9cc257ec810c0a0f ``` 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:e1204ce9921c1d45362a374e06be7234d3bf1184 +linuxkit/go-compile:0a927ab41060951b15645f0f9cc257ec810c0a0f github.com/docker/docker ``` diff --git a/src/cmd/linuxkit/moby/output.go b/src/cmd/linuxkit/moby/output.go index dc8f90e01..a9fd551e6 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:b5403fcaedec7fad46d69bf0d4a8704a24ac82ca", - "iso-bios": "linuxkit/mkimage-iso-bios:f80dec8fd20b00b3f0689daebb4eb4f72bb8ccba", + "iso": "linuxkit/mkimage-iso:17c68596851349c9d8917459116f7d3409f12fdd", + "iso-bios": "linuxkit/mkimage-iso-bios:50aedc359bc13ee2d472a73d6e6740740b809c95", "iso-efi": "linuxkit/mkimage-iso-efi:248673cd3784eb3664d0f80b5bd31829465ca784", - "raw-bios": "linuxkit/mkimage-raw-bios:6b4890aacfae5b010c9adb72d32c5f0edc366523", + "raw-bios": "linuxkit/mkimage-raw-bios:71a966249ffbb23a499cfca280bbabb8afbbd530", "raw-efi": "linuxkit/mkimage-raw-efi:a01ff1621b9945a63675e2a73d3fda064fad3c3f", - "squashfs": "linuxkit/mkimage-squashfs:60d9d141c49796f9a30bd2467884ea5c1813621f", + "squashfs": "linuxkit/mkimage-squashfs:c409c0f2045a0b9bffec38b981994a3e02852443", "gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1", "qcow2-efi": "linuxkit/mkimage-qcow2-efi:74cc5c7c4064c7d25d3caf08ab51cddd9b840ebe", "vhd": "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242", "dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6", "vmdk": "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5", - "rpi3": "linuxkit/mkimage-rpi3:8b36b2cd7f19a71319a38c5c5059e655f3114cb0", + "rpi3": "linuxkit/mkimage-rpi3:b787b1210a0e13456a8f128722f1134e3933907b", } ) diff --git a/src/cmd/linuxkit/run_qemu.go b/src/cmd/linuxkit/run_qemu.go index 6836f7724..0b3d446a9 100644 --- a/src/cmd/linuxkit/run_qemu.go +++ b/src/cmd/linuxkit/run_qemu.go @@ -20,7 +20,7 @@ import ( // QemuImg is the version of qemu container const ( - QemuImg = "linuxkit/qemu:18e9e252d670ed829ae13a358f4efcf5d7da6a24" + QemuImg = "linuxkit/qemu:54a48513e11041731039ebf3b6a8ac02da197764" defaultFWPath = "/usr/share/ovmf/bios.bin" ) From 75422a7ca80ba5b9ef28510d9ef5d8f193f90298 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 19:19:13 +0000 Subject: [PATCH 06/31] 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 cc7e3eedc..38731a494 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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 138449ab5..ff0ceee13 100644 --- a/test/pkg/docker-bench/Dockerfile +++ b/test/pkg/docker-bench/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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 4232d7a11..c8f8a7582 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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 cdc38491c..1163e393d 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build RUN apk add --no-cache \ build-base \ git \ diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile index e1026c934..cefdc5fc8 100644 --- a/test/pkg/poweroff/Dockerfile +++ b/test/pkg/poweroff/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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 31cfcd45f..0005818f8 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin From 903ff4ef64c024e0039ae51c87f1f29130a0a2a9 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 19:57:53 +0000 Subject: [PATCH 07/31] 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/020_kernel/001_config_4.9.x/test.yml | 4 ++-- test/cases/020_kernel/002_config_4.14.x/test.yml | 4 ++-- test/cases/020_kernel/005_config_4.19.x/test.yml | 4 ++-- test/cases/020_kernel/006_config_4.20.x/test.yml | 4 ++-- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 2 +- test/cases/020_kernel/012_kmod_4.14.x/test.yml | 2 +- test/cases/020_kernel/015_kmod_4.19.x/test.yml | 2 +- test/cases/020_kernel/016_kmod_4.20.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 ++-- .../110_namespace/100_mix/010_veth-unix-domain-echo/test.yml | 4 ++-- .../100_mix/011_veth-unix-domain-echo-reverse/test.yml | 4 ++-- .../110_namespace/100_mix/012_veth-ipv4-echo/test.yml | 4 ++-- .../110_namespace/100_mix/013_veth-ipv6-echo/test.yml | 4 ++-- .../110_namespace/100_mix/014_veth-tcp-echo/test.yml | 4 ++-- .../110_namespace/100_mix/015_veth-udp-echo/test.yml | 4 ++-- .../110_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 +- 117 files changed, 190 insertions(+), 190 deletions(-) diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index fd9dd38f1..6afef2f3c 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.6 - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 6f51120af..1ebd57a72 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 6f51120af..1ebd57a72 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 33ed09f33..be1a98809 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 3550d565a..ab4d78106 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 3550d565a..ab4d78106 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 3550d565a..ab4d78106 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 3550d565a..ab4d78106 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 365a650f1..343a557cb 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 3550d565a..ab4d78106 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 3550d565a..ab4d78106 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "10"] trust: org: diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index e5525ef30..8f8f921d6 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 + image: linuxkit/test-kernel-config:85727fa0ad52861758230cd264059c79f657b953 - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] 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 800a38b74..aacc6d36b 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 + image: linuxkit/test-kernel-config:85727fa0ad52861758230cd264059c79f657b953 - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 0e679e965..0f6baf6f3 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 + image: linuxkit/test-kernel-config:85727fa0ad52861758230cd264059c79f657b953 - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/006_config_4.20.x/test.yml b/test/cases/020_kernel/006_config_4.20.x/test.yml index 580c4ea1a..f9f743deb 100644 --- a/test/cases/020_kernel/006_config_4.20.x/test.yml +++ b/test/cases/020_kernel/006_config_4.20.x/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 + image: linuxkit/test-kernel-config:85727fa0ad52861758230cd264059c79f657b953 - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index b33c4c48d..e6180bd94 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/012_kmod_4.14.x/test.yml b/test/cases/020_kernel/012_kmod_4.14.x/test.yml index 6701b9a39..f334914f0 100644 --- a/test/cases/020_kernel/012_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/012_kmod_4.14.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/015_kmod_4.19.x/test.yml b/test/cases/020_kernel/015_kmod_4.19.x/test.yml index 81c6a67fa..0c8573534 100644 --- a/test/cases/020_kernel/015_kmod_4.19.x/test.yml +++ b/test/cases/020_kernel/015_kmod_4.19.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/016_kmod_4.20.x/test.yml b/test/cases/020_kernel/016_kmod_4.20.x/test.yml index 8baf60419..b5ef8271a 100644 --- a/test/cases/020_kernel/016_kmod_4.20.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.20.x/test.yml @@ -13,7 +13,7 @@ onboot: capabilities: - all - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: diff --git a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index 35a764397..a3f249825 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index 1b11046da..bf8d157bc 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 8e61a211a..fdc72e0f3 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 8e61a211a..fdc72e0f3 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 31990a9c3..08c73dd1b 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 31990a9c3..08c73dd1b 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index 8e7e52018..6a18e95d4 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index 6de70a0d8..d760a53e1 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index cf1edaa6f..abbc3ba5e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index cf1edaa6f..abbc3ba5e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index c7e2b281e..3a4b262c9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index c7e2b281e..3a4b262c9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index 27a1714e1..c180623c9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index 3ab109118..e666dfba2 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index fa43ed944..7181dbcc5 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index fa43ed944..7181dbcc5 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index 4a5942427..f9c4701fb 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index 4a5942427..f9c4701fb 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 71be1c4e3..1097c5a93 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index fba8a23d9..ac6114279 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index 069dd64f3..69585835b 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index 069dd64f3..69585835b 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index a2e43a004..6c9da9357 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index a2e43a004..6c9da9357 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index fff8a51d5..1a1865ea3 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 340f028d7..65eac1565 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index 7a4531f34..7666760fd 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index 7a4531f34..7666760fd 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index fa66c51f2..b0f3d04d7 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index fa66c51f2..b0f3d04d7 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index 53df3d8c2..f508ab0c7 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index 2c82cb165..ed1712150 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index 15081aaa9..987fc7c22 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index 15081aaa9..987fc7c22 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index f405f1685..36458ec71 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index f405f1685..36458ec71 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index 13e272c85..e86d48846 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index a2340d8a5..91eb288f7 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index ddd262d00..da7280380 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index ddd262d00..da7280380 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index c86462c1e..47d31a01d 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index c86462c1e..47d31a01d 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index e49c6928b..87dc771ff 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index cecc1ac2d..c344bdc3f 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index 38d71b838..d3d5d1f8e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index 38d71b838..d3d5d1f8e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index 759a71368..19d5f6f6d 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_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:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index 759a71368..19d5f6f6d 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index dfaf093ff..a6ac9157a 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml index 73d88c5c7..8a75b4b54 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index 96c715999..9947498d5 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml index 96c715999..9947498d5 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index 0bf0cd4bf..4c209fd69 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml index 0bf0cd4bf..4c209fd69 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index 61b1f8b7e..1b35b6ba7 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml index 249f11ed0..e6110d62e 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index c83f68999..64478e919 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml index c83f68999..64478e919 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index c29544b26..a15d859a2 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml index c29544b26..a15d859a2 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml index 9275b3bfe..12eb3927c 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml index a3f97691c..78938b088 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml index f7d06c5cc..8c4ff564e 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml index 54fa7408b..81f083ab0 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml index 6e7462191..118e53c2b 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml index 98c23d11d..c51fb9664 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml index 820e78f42..ff4649b46 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml @@ -1,10 +1,10 @@ onboot: - name: test-ns - image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 + image: linuxkit/test-ns:e64d5db65bf4e2523d4884f294e5458ac41bd04f command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup options: ["rw"] - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 ceaf43ebe..6592cf507 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:a76248a8eeb333ff00cc360e2a97e4d37938c631 + image: linuxkit/test-docker-bench:80593c1e8fcb5bd28788cbe8fba2df15e7aa2c3e 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 1bcd91e4f..8f92e3f42 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 9a0e5723c..794329ee6 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 b00238a3d..edb3f3c17 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:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 835a26df7..6a613d376 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 9807a1ad6..447f23811 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.6 command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:c519056cae689157ab6805a309ff1ca0f1de11dc + image: linuxkit/test-containerd:998fdcb9ee8116ba77b24ca7ce7c5d0ad7be2dbe - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 trust: org: - linuxkit diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index a0bd71ff2..39012aeb7 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 2ce7db685..0d4c96101 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 841556cd9..d0c695ad0 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 a0ef005ae..1db83866e 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 35ac8b712..b4cd4cf88 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 19d37c372..635bce1d6 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 24c6d2855..e79410865 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 bac56b438..577c71803 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 0f5fdd64b..4bf9aecee 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 94804e5f7..01ead5796 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 34dd4df4c..5262de226 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 7b98cce40..1f64bd01b 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 94999639f..96c74f881 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 6f5070d1d..ae48cf73d 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 143f40d3f..65efbd241 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 5d510b803..d21eaeca3 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 8de13708d..6dca90ff5 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 803f59466..8bd8ed03d 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 749a1d817..2611f3de2 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.6 - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 trust: org: - linuxkit diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index e2b2ea8cd..f09a144ca 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 trust: org: - linuxkit diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 54a9158ce..52896f8ac 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 d493bf353..d561769a9 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:2687ed712690766b8156a77ac600005b532d2c7d + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 4beef1e8e..5afb3859e 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 files: - path: /etc/ltp/baseline contents: "100" diff --git a/test/hack/test.yml b/test/hack/test.yml index 3b6d81a71..ef2e11930 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -12,9 +12,9 @@ onboot: image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 + image: linuxkit/test-kernel-config:85727fa0ad52861758230cd264059c79f657b953 - name: poweroff - image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "120"] trust: org: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 098001bf7..57e945da0 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:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 + image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 command: ["/bin/sh", "/poweroff.sh", "3"] trust: org: From f0ee28cd6eb1956390265dd7f16a519159ba621a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 19:58:22 +0000 Subject: [PATCH 08/31] tests: Update packages to the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/011_kmod_4.9.x/Dockerfile | 2 +- test/cases/020_kernel/012_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/015_kmod_4.19.x/Dockerfile | 2 +- test/cases/020_kernel/016_kmod_4.20.x/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index 2367077fc..e7a0bec56 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.9.161 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile index 322f4da95..506c83fc9 100644 --- a/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.14.104 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile b/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile index 6da91b67c..1713bc549 100644 --- a/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile +++ b/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.19.26 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/016_kmod_4.20.x/Dockerfile b/test/cases/020_kernel/016_kmod_4.20.x/Dockerfile index 33604ba25..efa27c66f 100644 --- a/test/cases/020_kernel/016_kmod_4.20.x/Dockerfile +++ b/test/cases/020_kernel/016_kmod_4.20.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.20.13 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / From c52e831dcabf1cdb6fbcc8501d2be7051b90bec4 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 19:59:02 +0000 Subject: [PATCH 09/31] tests: Update alpine 3.8 to 3.9 Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/011_kmod_4.9.x/Dockerfile | 2 +- test/cases/020_kernel/012_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/015_kmod_4.19.x/Dockerfile | 2 +- test/cases/020_kernel/016_kmod_4.20.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 ++-- 30 files changed, 43 insertions(+), 43 deletions(-) diff --git a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index e7a0bec56..bfd840464 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.8 +FROM alpine:3.9 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile index 506c83fc9..f5c1806ff 100644 --- a/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/012_kmod_4.14.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.8 +FROM alpine:3.9 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile b/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile index 1713bc549..020852d95 100644 --- a/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile +++ b/test/cases/020_kernel/015_kmod_4.19.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.8 +FROM alpine:3.9 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/016_kmod_4.20.x/Dockerfile b/test/cases/020_kernel/016_kmod_4.20.x/Dockerfile index efa27c66f..f104cbe2e 100644 --- a/test/cases/020_kernel/016_kmod_4.20.x/Dockerfile +++ b/test/cases/020_kernel/016_kmod_4.20.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.8 +FROM alpine:3.9 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 8f92e3f42..27881d62f 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:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 onboot: - name: test - image: alpine:3.8 + image: alpine:3.9 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 794329ee6..001353422 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:e2d222038867ebd13b0b723c8351be559267050b - name: test - image: alpine:3.8 + image: alpine:3.9 binds: - /check.sh:/check.sh - /proc/sys/fs/binfmt_misc:/binfmt_misc @@ -23,4 +23,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index edb3f3c17..8a7dba8a4 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:67b5c3b4f13a4acf22eab8f422091e1efc06852d onboot: - name: bpftrace-test - image: alpine:3.8 + image: alpine:3.9 binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] @@ -26,4 +26,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 6a613d376..d2a496cb5 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.6 onboot: - name: test - image: alpine:3.8 + image: alpine:3.9 binds: - /check.sh:/check.sh - /etc:/host-etc @@ -22,4 +22,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 39012aeb7..2ad4ae76b 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.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test - image: alpine:3.8 + image: alpine:3.9 net: host binds: - /check.sh:/check.sh @@ -24,4 +24,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 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 0d4c96101..47ed9d6c3 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:9e41a164358b0235f0c242219b1a424c6552d46c command: ["/usr/bin/crypto", "it_is_encrypted", "/dev/sda"] - name: test - image: alpine:3.8 + image: alpine:3.9 net: host binds: - /check.sh:/check.sh @@ -27,4 +27,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 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 d0c695ad0..a2b5adab4 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:9e41a164358b0235f0c242219b1a424c6552d46c command: ["/usr/bin/crypto", "-l", "it_is_encrypted", "/dev/sda"] - name: test - image: alpine:3.8 + image: alpine:3.9 net: host binds: - /check.sh:/check.sh @@ -27,4 +27,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 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 1db83866e..74ad61a03 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.8 + image: alpine:3.9 net: host binds: - /check.sh:/check.sh @@ -30,4 +30,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 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 b4cd4cf88..62eea18c5 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.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 635bce1d6..a2f4407e9 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.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 e79410865..36a13a0dd 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.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 577c71803..9e9463dd1 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.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 4bf9aecee..372fdb42c 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.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 01ead5796..2f5f3a0b7 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.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 5262de226..6b55d4e7a 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.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 1f64bd01b..48e97aa78 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.6 command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 96c74f881..0a7777ae3 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.6 command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 ae48cf73d..ef4bdf7ab 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.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 65efbd241..bbb2e4913 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.6 command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 6dca90ff5..01e87faf5 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.6 command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test - image: alpine:3.8 + image: alpine:3.9 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 8bd8ed03d..6863c55b5 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:b05ffc8641cc955abe45f6730cbe6d723b63bd3f command: ["/usr/bin/loopy", "-c", "/var/test.img"] - name: test - image: alpine:3.8 + image: alpine:3.9 net: host binds: - /check.sh:/check.sh @@ -25,4 +25,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 52896f8ac..1cd5cd1f5 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.6 - name: test - image: alpine:3.8 + image: alpine:3.9 net: host pid: host ipc: host @@ -25,4 +25,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 50455946a..3a25f2a6a 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.8 + image: alpine:3.9 binds: - /tmp:/tmp - /check.sh:/check.sh @@ -55,7 +55,7 @@ services: - CAP_SETGID - CAP_DAC_OVERRIDE - name: test - image: alpine:3.8 + image: alpine:3.9 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 4c5bba466..114c1ed8f 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.6 command: ["/usr/bin/logwrite", "-max-log-size", "1024"] - name: check-the-logs - image: alpine:3.8 + image: alpine:3.9 binds: - /check.sh:/check.sh - /dev/console:/dev/console @@ -32,4 +32,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index a0e694549..4eccffcc5 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.6 - name: check-the-logs - image: alpine:3.8 + image: alpine:3.9 binds: - /check.sh:/check.sh - /dev/console:/dev/console @@ -29,4 +29,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index d561769a9..6afa79e80 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:4.19.25 onboot: - name: check-bcc - image: alpine:3.8 + image: alpine:3.9 binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] @@ -26,4 +26,4 @@ trust: org: - linuxkit image: - - alpine:3.8 + - alpine:3.9 From d236874874d6ae9cc1c50e36487ab4c181ff06ec Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 20:04:48 +0000 Subject: [PATCH 10/31] tool: Fix azure.go gofmt Looks like the newer gofmt is a little pickier. Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/azure.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/linuxkit/azure.go b/src/cmd/linuxkit/azure.go index f0a948038..eca45e689 100644 --- a/src/cmd/linuxkit/azure.go +++ b/src/cmd/linuxkit/azure.go @@ -113,7 +113,7 @@ func createStorageAccount(accountName, location string, resourceGroup resources. Sku: &storage.Sku{ Name: storage.StandardLRS, }, - Location: &location, + Location: &location, AccountPropertiesCreateParameters: &storage.AccountPropertiesCreateParameters{}, } @@ -332,7 +332,7 @@ func createNetworkInterface(resourceGroup resources.Group, networkInterfaceName InterfaceIPConfigurationPropertiesFormat: &network.InterfaceIPConfigurationPropertiesFormat{ PublicIPAddress: &publicIPAddress, PrivateIPAllocationMethod: network.Dynamic, - Subnet: &subnet, + Subnet: &subnet, }, }, }, From f0815f755a146c821fb81dd1e6326a782f1b9b62 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 10:28:57 +0000 Subject: [PATCH 11/31] tools/alpine: Add more wireguard packages The wireguard package has some sub-packages which are now dependencies. Include them in the alpine base. Also include openresolv, which is required by one of the wireguard packages. Signed-off-by: Rolf Neugebauer --- tools/alpine/Dockerfile | 4 +++- tools/alpine/packages | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 62e30e3a1..426f9df07 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -24,7 +24,9 @@ RUN apk add alpine-sdk libmnl-dev curl && \ curl -fsSLo APKBUILD https://git.alpinelinux.org/cgit/aports/plain/testing/wireguard-tools/APKBUILD && \ curl -fsSLo alpine-compat.patch https://git.alpinelinux.org/aports/plain/testing/wireguard-tools/alpine-compat.patch && \ su -c "abuild-keygen -a -n && abuild -r" builder && \ - cp /home/builder/packages/$(apk --print-arch)/wireguard-tools-[0-9]*.apk /mirror/$(apk --print-arch) + cp /home/builder/packages/$(apk --print-arch)/wireguard-tools-[0-9]*.apk /mirror/$(apk --print-arch) && \ + cp /home/builder/packages/$(apk --print-arch)/wireguard-tools-wg-[0-9]*.apk /mirror/$(apk --print-arch) && \ + cp /home/builder/packages/$(apk --print-arch)/wireguard-tools-wg-quick-[0-9]*.apk /mirror/$(apk --print-arch) # install abuild for signing RUN apk add --no-cache abuild diff --git a/tools/alpine/packages b/tools/alpine/packages index 7baf5c501..d06b4fce9 100644 --- a/tools/alpine/packages +++ b/tools/alpine/packages @@ -87,6 +87,7 @@ nfs-utils open-iscsi openntpd openrc +openresolv openssh-server openssl openssl-dev From d341fdc66690f63cc67434dff2265ed44ecf1271 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 10:35:17 +0000 Subject: [PATCH 12/31] tools/alpine: Update the package Signed-off-by: Rolf Neugebauer --- tools/alpine/versions.aarch64 | 5 ++++- tools/alpine/versions.s390x | 5 ++++- tools/alpine/versions.x86_64 | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 98ca46e6c..209456d5d 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:0a88e4620f01d271f46c99478b6a091c22b60361-arm64 +# linuxkit/alpine:e6dcfd363a0c17f550f515071b57c7008522ed61-arm64 # automatically generated list of installed packages abuild-3.3.0-r1 alpine-baselayout-3.1.0-r3 @@ -232,6 +232,7 @@ 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-r2 openssh-server-7.9_p1-r2 openssh-server-common-7.9_p1-r2 @@ -300,6 +301,8 @@ vim-8.1.0630-r0 virglrenderer-0.7.0-r1 wayland-libs-server-1.16.0-r0 wireguard-tools-0.0.20190227-r0 +wireguard-tools-wg-0.0.20190227-r0 +wireguard-tools-wg-quick-0.0.20190227-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.7-r0 wpa_supplicant-openrc-2.7-r0 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index 84805ad6d..afc3cd57d 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:0b76f8f8e9e86f15d962f80f7b4dc7621e261e7d-s390x +# linuxkit/alpine:8fe0884e721d9810a79d0bf467d49efffce3c7c5-s390x # automatically generated list of installed packages abuild-3.3.0-r1 alpine-baselayout-3.1.0-r3 @@ -226,6 +226,7 @@ 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-r2 openssh-server-7.9_p1-r2 openssh-server-common-7.9_p1-r2 @@ -293,6 +294,8 @@ vim-8.1.0630-r0 virglrenderer-0.7.0-r1 wayland-libs-server-1.16.0-r0 wireguard-tools-0.0.20190227-r0 +wireguard-tools-wg-0.0.20190227-r0 +wireguard-tools-wg-quick-0.0.20190227-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.7-r0 wpa_supplicant-openrc-2.7-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 4acee3eff..165c303b4 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0-amd64 +# linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed-amd64 # automatically generated list of installed packages abuild-3.3.0-r1 alpine-baselayout-3.1.0-r3 @@ -243,6 +243,7 @@ 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-r2 openssh-server-7.9_p1-r2 openssh-server-common-7.9_p1-r2 @@ -312,6 +313,8 @@ vim-8.1.0630-r0 virglrenderer-0.7.0-r1 wayland-libs-server-1.16.0-r0 wireguard-tools-0.0.20190227-r0 +wireguard-tools-wg-0.0.20190227-r0 +wireguard-tools-wg-quick-0.0.20190227-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.7-r0 wpa_supplicant-openrc-2.7-r0 From 9a9d9670e847fda8b6a84c09d001669a1c48be04 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 11:18:21 +0000 Subject: [PATCH 13/31] kernel: Update build to use the latest linuxkit/alpine Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 2 +- kernel/Dockerfile.bcc | 4 ++-- kernel/Dockerfile.kconfig | 2 +- kernel/Dockerfile.zfs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 8ec1c1a0c..582464f07 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:4768505d40f23e198011b6f2c796f985fe50ec39 AS kernel-build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS kernel-build RUN apk add \ argp-standalone \ automake \ diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc index 60900674b..4d437d8f1 100644 --- a/kernel/Dockerfile.bcc +++ b/kernel/Dockerfile.bcc @@ -1,7 +1,7 @@ ARG IMAGE FROM ${IMAGE} as ksrc -FROM linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build RUN apk update && apk upgrade -a && \ apk add --no-cache \ argp-standalone \ @@ -103,7 +103,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:8a89682421abf0d886d777235a05f4a04a736df2 as mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 74f99d8aa..375c9d03d 100644 --- a/kernel/Dockerfile.kconfig +++ b/kernel/Dockerfile.kconfig @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:4768505d40f23e198011b6f2c796f985fe50ec39 AS kernel-build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS kernel-build RUN apk add \ argp-standalone \ bison \ diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs index 5f43b0234..12a15e5c0 100644 --- a/kernel/Dockerfile.zfs +++ b/kernel/Dockerfile.zfs @@ -1,6 +1,6 @@ ARG IMAGE FROM ${IMAGE} AS ksrc -FROM linuxkit/alpine:4768505d40f23e198011b6f2c796f985fe50ec39 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build RUN apk add \ attr-dev \ autoconf \ From 4fdad5319092b5c8fa71c1741d5362a958fb269e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 11:19:11 +0000 Subject: [PATCH 14/31] pkgs: Update packages to the latest linuxkit/alpine except for bpftrace, since it does not compile: https://github.com/linuxkit/linuxkit/pull/3230 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 d25d7c97a..6e660eec1 100644 --- a/pkg/acpid/Dockerfile +++ b/pkg/acpid/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror2 +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 c3f907677..b9b666869 100644 --- a/pkg/auditd/Dockerfile +++ b/pkg/auditd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 cafe936a9..6c5d04c82 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:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 f4f345497..faa638f2d 100644 --- a/pkg/bpftrace/Dockerfile +++ b/pkg/bpftrace/Dockerfile @@ -34,4 +34,4 @@ FROM scratch ENTRYPOINT [] CMD [] WORKDIR / -COPY --from=build /bpftrace/build/src/bpftrace /usr/bin/bpftrace \ No newline at end of file +COPY --from=build /bpftrace/build/src/bpftrace /usr/bin/bpftrace diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile index 16fa4f7bf..fc4024388 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as alpine +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed as alpine RUN apk add ca-certificates diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index ad2138362..23dd5797d 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 32f9afb96..831577455 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac as alpine +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index ff9b8a098..16260c700 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 6551d4996..44b41c023 100644 --- a/pkg/dm-crypt/Dockerfile +++ b/pkg/dm-crypt/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 645bf56ae..9af834e45 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 96bc2c48b..6d4a7416b 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 27dc1f386..c9602e69b 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.28 AS kernel -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build RUN apk add --no-cache git kmod # Clone the firmware repository diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 7155d5240..50c4772e4 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 546617d2a..23b8624b7 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 89de747d8..587069097 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 f7bb199e1..fa73650ee 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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:9f00542b8b74b7815936affb11dedb86945fe4ac AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 211324f39..91b8c67ef 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 2b4b162ca..b27dc4c5f 100644 --- a/pkg/kmsg/Dockerfile +++ b/pkg/kmsg/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 8846938ee..33e8c6881 100644 --- a/pkg/logwrite/Dockerfile +++ b/pkg/logwrite/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 99b922d20..d4ee2c392 100644 --- a/pkg/losetup/Dockerfile +++ b/pkg/losetup/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 88f4b0291..9ab756829 100644 --- a/pkg/memlogd/Dockerfile +++ b/pkg/memlogd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 ae5b5afe4..63ae3cdcc 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 2dc258ad2..0a4d100c2 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 23a818ba3..b23032db4 100644 --- a/pkg/modprobe/Dockerfile +++ b/pkg/modprobe/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 fffd1189a..eed8475bb 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 4df0b49b5..001a680cd 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 720f18134..70c742f5e 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 fbea3e5b2..33a32ede2 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 8defae1fb..cc51bf6be 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 0bc5a4dc0..0ac4ed850 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 b76cd98fe..748154cb2 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:9f00542b8b74b7815936affb11dedb86945fe4ac as alpine +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index dd13ca5fc..5e2d6ff59 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 b326c06d2..7013c5303 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 4db00c1d0..a50aacbfd 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 fb496f213..9daa508ed 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 0ae9efe78..53afe1494 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:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 631b69b76..d3a027987 100644 --- a/pkg/tss/Dockerfile +++ b/pkg/tss/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 3f2ec7075..f8b2fb345 100644 --- a/pkg/vpnkit-expose-port/Dockerfile +++ b/pkg/vpnkit-expose-port/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 d6383f973..3cd17b523 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed 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 6738c889d..7ef04773b 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin From 0552c47a2649ec2131c5e1f875a01218b3449c4e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 20:15:13 +0000 Subject: [PATCH 15/31] pkg/cadvisor: Update to v0.33.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 23dd5797d..06ae2f4a6 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.30.2 +ENV COMMIT=v0.33.0 ADD /static.patch /tmp/ From 82d6f949c76b9c936469274ba526dda5209cc6f0 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 20:18:23 +0000 Subject: [PATCH 16/31] 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 6d4a7416b..0040cff84 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=d1147327232ec4616a66ab898df84f9700c816c1 +ENV FW_COMMIT=9ee52be785cf91fc6a3c6aa27d484873f8270b72 RUN mkdir -p /out/lib && \ cd /out/lib && \ diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index c9602e69b..d540aeec4 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=d1147327232ec4616a66ab898df84f9700c816c1 +ENV FW_COMMIT=9ee52be785cf91fc6a3c6aa27d484873f8270b72 WORKDIR / RUN git clone ${FW_URL} && \ cd /linux-firmware && \ From 14039d059791714d88797f404a9e7c4ffde5af68 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 12:58:47 +0000 Subject: [PATCH 17/31] pkg/bpftrace: Disable the package The compile fails with: [ 30%] Building CXX object src/ast/CMakeFiles/ast.dir/codegen_llvm.cpp.o [ 30%] Building CXX object src/ast/CMakeFiles/ast.dir/irbuilderbpf.cpp.o [ 31%] Building CXX object src/ast/CMakeFiles/ast.dir/printer.cpp.o [ 31%] Building CXX object src/ast/CMakeFiles/ast.dir/semantic_analyser.cpp.o /bpftrace/src/ast/irbuilderbpf.cpp: In member function 'llvm::CallInst* bpftrace::ast::IRBuilderBPF::CreateProbeReadStr(llvm::AllocaInst*, size_t, llvm::Value*)': /bpftrace/src/ast/irbuilderbpf.cpp:279:16: error: 'BPF_FUNC_probe_read_str' was not declared in this scope getInt64(BPF_FUNC_probe_read_str), ^~~~~~~~~~~~~~~~~~~~~~~ /bpftrace/src/ast/irbuilderbpf.cpp: In member function 'llvm::CallInst* bpftrace::ast::IRBuilderBPF::CreateProbeReadStr(llvm::Value*, size_t, llvm::Value*)': /bpftrace/src/ast/irbuilderbpf.cpp:294:16: error: 'BPF_FUNC_probe_read_str' was not declared in this scope getInt64(BPF_FUNC_probe_read_str), ^~~~~~~~~~~~~~~~~~~~~~~ /bpftrace/src/ast/irbuilderbpf.cpp: In member function 'llvm::CallInst* bpftrace::ast::IRBuilderBPF::CreateGetCurrentCgroupId()': /bpftrace/src/ast/irbuilderbpf.cpp:422:16: error: 'BPF_FUNC_get_current_cgroup_id' was not declared in this scope getInt64(BPF_FUNC_get_current_cgroup_id), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /bpftrace/src/ast/irbuilderbpf.cpp: In member function 'llvm::CallInst* bpftrace::ast::IRBuilderBPF::CreateGetCurrentTask()': /bpftrace/src/ast/irbuilderbpf.cpp:461:16: error: 'BPF_FUNC_get_current_task' was not declared in this scope getInt64(BPF_FUNC_get_current_task), ^~~~~~~~~~~~~~~~~~~~~~~~~ /bpftrace/src/ast/irbuilderbpf.cpp: In member function 'llvm::CallInst* bpftrace::ast::IRBuilderBPF::CreateGetStackId(llvm::Value*, bool)': /bpftrace/src/ast/irbuilderbpf.cpp:497:16: error: 'BPF_FUNC_get_stackid' was not declared in this scope getInt64(BPF_FUNC_get_stackid), ^~~~~~~~~~~~~~~~~~~~ /bpftrace/src/ast/semantic_analyser.cpp: In member function 'int bpftrace::ast::SemanticAnalyser::create_maps(bool)': /bpftrace/src/ast/semantic_analyser.cpp:871:68: error: 'BPF_MAP_TYPE_STACK_TRACE' was not declared in this scope bpftrace_.stackid_map_ = std::make_unique(BPF_MAP_TYPE_STACK_TRACE); ^~~~~~~~~~~~~~~~~~~~~~~~ /bpftrace/src/ast/semantic_analyser.cpp:885:64: error: 'BPF_MAP_TYPE_STACK_TRACE' was not declared in this scope bpftrace_.stackid_map_ = std::make_unique(BPF_MAP_TYPE_STACK_TRACE); ^~~~~~~~~~~~~~~~~~~~~~~~ make[2]: *** [src/ast/CMakeFiles/ast.dir/build.make:89: src/ast/CMakeFiles/ast.dir/irbuilderbpf.cpp.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: *** [src/ast/CMakeFiles/ast.dir/build.make:115: src/ast/CMakeFiles/ast.dir/semantic_analyser.cpp.o] Error 1 make[1]: *** [CMakeFiles/Makefile2:276: src/ast/CMakeFiles/ast.dir/all] Error 2 make: *** [Makefile:141: all] Error 2 Signed-off-by: Rolf Neugebauer --- pkg/bpftrace/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/bpftrace/build.yml b/pkg/bpftrace/build.yml index fc714787a..2c203041d 100644 --- a/pkg/bpftrace/build.yml +++ b/pkg/bpftrace/build.yml @@ -1,4 +1,4 @@ image: bpftrace network: true arches: - - amd64 + From a53bfe1b81ceb03ff9b3fdae26904b7459c03ef9 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 14:30:02 +0000 Subject: [PATCH 18/31] tests: Disable the bpftrace test The package does not build at the moment: https://github.com/linuxkit/linuxkit/issues/3296 Signed-off-by: Rolf Neugebauer --- test/cases/040_packages/002_bpftrace/test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/cases/040_packages/002_bpftrace/test.sh b/test/cases/040_packages/002_bpftrace/test.sh index a45574d55..c502db940 100644 --- a/test/cases/040_packages/002_bpftrace/test.sh +++ b/test/cases/040_packages/002_bpftrace/test.sh @@ -1,5 +1,6 @@ #!/bin/sh # SUMMARY: Check that the bpftrace package works +# LABELS: disabled # REPEAT: set -e From 71f87cc6a92d147e4c565c0c3cb58c3adb55e592 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 14:31:42 +0000 Subject: [PATCH 19/31] Update package tags to the latest version Signed-off-by: Rolf Neugebauer --- 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/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/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 ++-- .../020_kernel/001_config_4.9.x/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/006_config_4.20.x/test.yml | 4 +- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 4 +- .../cases/020_kernel/012_kmod_4.14.x/test.yml | 4 +- .../cases/020_kernel/015_kmod_4.19.x/test.yml | 4 +- .../cases/020_kernel/016_kmod_4.20.x/test.yml | 4 +- .../cases/020_kernel/110_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 +-- .../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 +- 96 files changed, 529 insertions(+), 529 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index 16b3098c3..5bb1fc2d8 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.6 + image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 services: - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: sshd - image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 + image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index ce342c4f0..dd84c0a47 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 services: - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee - name: sshd - image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 + image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index aa74ba380..24989a335 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysfs - image: linuxkit/sysfs:v0.6 + image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: ntpd - image: linuxkit/openntpd:v0.6 + image: linuxkit/openntpd:7f48912e995d0eb6d021b5c0d2d2a062b3b2e4d3 - name: docker image: docker:18.06.0-ce-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.6 + image: linuxkit/cadvisor:0fbe6a4a89a555d749ea99735477833757d24d5d files: - path: var/lib/docker directory: true diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 8b634e040..450c64c32 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,30 +2,30 @@ kernel: image: linuxkit/kernel:4.14.88 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 - - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe - - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "/dev/sda"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/dev/sda1", "/var/external"] - name: loop - image: linuxkit/losetup:b05ffc8641cc955abe45f6730cbe6d723b63bd3f + image: linuxkit/losetup:4ceebb2672031d87a8fa60ac5e93e54c2ff1f0f2 command: ["/usr/bin/loopy", "--create", "/var/external/storage_file"] - name: dm-crypt - image: linuxkit/dm-crypt:9e41a164358b0235f0c242219b1a424c6552d46c + image: linuxkit/dm-crypt:6ace64a97f2db77301be0c1106dd2e2ddf9e2eab command: ["/usr/bin/crypto", "crypt_loop_dev", "/dev/loop0"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe 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:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce 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 0fb0b7f87..10f30f5a1 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.88 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 - - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe - - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "/dev/sda"] - name: dm-crypt - image: linuxkit/dm-crypt:9e41a164358b0235f0c242219b1a424c6552d46c + image: linuxkit/dm-crypt:6ace64a97f2db77301be0c1106dd2e2ddf9e2eab command: ["/usr/bin/crypto", "crypt_dev", "/dev/sda1"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe 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:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce 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 9a4926ab0..1dc05338f 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -3,30 +3,30 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/vpnkit-expose-port:v0.6 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/vpnkit-expose-port:b5f279abaa0386efeb3c03f46771609ff7c25bc3 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:v0.6 + image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: sysfs - image: linuxkit/sysfs:v0.6 + image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 - name: binfmt - image: linuxkit/binfmt:e2d222038867ebd13b0b723c8351be559267050b + image: linuxkit/binfmt:1d336b31146564a799673ff1a869c9717c2a86e0 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:v0.6 + image: linuxkit/swap:0b230ed5cbf5f920935f371dfa9e34d838d863fe 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.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:v0.6 + image: linuxkit/acpid:c4559f5fdce997de5dedc4c750c7a0d1044b3425 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:v0.6 + image: linuxkit/openntpd:7f48912e995d0eb6d021b5c0d2d2a062b3b2e4d3 # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:98e554e4f3024c318e42c1f6876b541b654acd9f + image: linuxkit/vsudd:ad3014aba09dd15a82fae6e0f18c482810490c9a 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.6 + image: linuxkit/vpnkit-forwarder:47a75f790250c01d18d0463de9d9943dab50f027 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.6 + image: linuxkit/trim-after-delete:05a7b353e54371d396655610afbd5d0b830e16ac # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:613dc55e67470ec375335a1958650c3711dc4aa6 + image: linuxkit/host-timesync-daemon:dfe46e1f3227ac10d98655d95b2061283afc2f3d # 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 bb311f14a..62e6d6679 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,31 +2,31 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: sysfs - image: linuxkit/sysfs:v0.6 + image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee - name: ntpd - image: linuxkit/openntpd:v0.6 + image: linuxkit/openntpd:7f48912e995d0eb6d021b5c0d2d2a062b3b2e4d3 - name: docker image: docker:18.06.0-ce-dind capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index 7e7b32b76..b9625acdf 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.6 + image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: sshd - image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 + image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 96bc565e4..0ee6f5965 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 5880b4c4e..a055732cb 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee 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:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 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:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 5c264791d..ecb83de3a 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: influxdb diff --git a/examples/logging.yml b/examples/logging.yml index ac2187f89..06247653f 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,21 +3,21 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 - - linuxkit/memlogd:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/memlogd:3d74c1153f99948d92c0fa9c759f816ab48d9855 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee 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:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true # A service which generates log messages for testing @@ -25,9 +25,9 @@ services: image: alpine:3.8 command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); sleep 1; done" ] - name: write-and-rotate-logs - image: linuxkit/logwrite:v0.6 + image: linuxkit/logwrite:62cbf48ee2fcd374f26de7b901adc287ff6f4696 - name: kmsg - image: linuxkit/kmsg:v0.6 + image: linuxkit/kmsg:9329a7bb25b27974d74b765fe15d5f1b76609198 trust: org: - linuxkit diff --git a/examples/minimal.yml b/examples/minimal.yml index 4cd9ce90b..39cc05060 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index a799bf423..112c33e20 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee - name: node_exporter - image: linuxkit/node_exporter:v0.6 + image: linuxkit/node_exporter:4e895be53436f2732f206302f193d5e7b0a1a841 trust: org: - linuxkit diff --git a/examples/openstack.yml b/examples/openstack.yml index e874cd4f7..a5da1dba0 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.6 + image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 command: ["/usr/bin/metadata", "openstack"] services: - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: sshd - image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 + image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 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 c0b89daac..df4e47b81 100644 --- a/examples/packet.arm64.yml +++ b/examples/packet.arm64.yml @@ -10,5 +10,5 @@ kernel: ucode: "" onboot: - name: modprobe - image: linuxkit/modprobe:v0.6 + image: linuxkit/modprobe:90db3b2e63ceb633b7f66626c935c00d48e47c89 command: ["modprobe", "nicvf"] diff --git a/examples/packet.yml b/examples/packet.yml index a1d6a5f28..bae9bea72 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 - - linuxkit/firmware:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/firmware:0e37338a2c994f768fc4569fce47fcf8d9133506 onboot: - name: rngd1 - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.6 + image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 command: ["/usr/bin/metadata", "packet"] services: - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 + image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index cd29964b1..aa149856c 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 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 77fb6dede..66f8beae9 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.87-rt cmdline: "console=tty0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee - name: open-vm-tools - image: linuxkit/open-vm-tools:v0.6 + image: linuxkit/open-vm-tools:ff7d6c5789fe82c901c8a83a20f5a4182838cb3d - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/scaleway.yml b/examples/scaleway.yml index a991eef6d..f83c7ed2e 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: rngd1 - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce command: ["/sbin/rngd", "-1"] - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.6 + image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce trust: org: - linuxkit diff --git a/examples/sshd.yml b/examples/sshd.yml index cffd1dfec..7a05a7e83 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: rngd1 - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee - name: sshd - image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 + image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index c2fd401f6..24dedf995 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:v0.6 + image: linuxkit/swap:0b230ed5cbf5f920935f371dfa9e34d838d863fe # 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:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce trust: org: - linuxkit diff --git a/examples/tpm.yml b/examples/tpm.yml index e790fbf62..d61e2c5e6 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: tss - image: linuxkit/tss:v0.6 + image: linuxkit/tss:8c5284d5302485234c6390e00c42546bc505a5ca - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce 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 2be86bedf..d92051e60 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,22 +2,22 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 8064fdd93..96f61881e 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.8 @@ -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:c4bc89cf0d66733c923ab9cb46198b599eb99320 + image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:v0.6 + image: linuxkit/vpnkit-forwarder:47a75f790250c01d18d0463de9d9943dab50f027 binds: - /var/vpnkit:/port net: host diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index a71fe5583..af9e5af9b 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:98e554e4f3024c318e42c1f6876b541b654acd9f + image: linuxkit/vsudd:ad3014aba09dd15a82fae6e0f18c482810490c9a binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/examples/vultr.yml b/examples/vultr.yml index 7e7b32b76..b9625acdf 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.6 + image: linuxkit/metadata:566864a2e22e318c478ab284f5675da7a7a12f38 services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: sshd - image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 + image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 904f9de53..71d97eb0d 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:v0.6 + image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:v0.6 + image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,12 +40,12 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true net: /run/netns/wg1 - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: nginx image: nginx:1.13.8-alpine net: /run/netns/wg0 diff --git a/linuxkit.yml b/linuxkit.yml index 91df36ca0..2c88ae662 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee 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:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - 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 fbeaa323e..4d5295d2d 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:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 481dc510f..c10423874 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,32 +2,32 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: sysfs - image: linuxkit/sysfs:v0.6 + image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: ntpd - image: linuxkit/openntpd:v0.6 + image: linuxkit/openntpd:7f48912e995d0eb6d021b5c0d2d2a062b3b2e4d3 - name: docker image: docker:18.06.0-ce-dind capabilities: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 90a9d89c1..79df37a27 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,32 +2,32 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: sysfs - image: linuxkit/sysfs:v0.6 + image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: ntpd - image: linuxkit/openntpd:v0.6 + image: linuxkit/openntpd:7f48912e995d0eb6d021b5c0d2d2a062b3b2e4d3 - name: docker image: docker:18.06.0-ce-dind capabilities: diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index e2295f1f3..9ef6a1893 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:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 7f1a635db..633da79d9 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:a2166a6048ce041eebe005ab99454cfdeaa5c848 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 5dd591e9f..95898a674 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,16 +2,16 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540" cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 094e2bebf..5fc1aeb1b 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:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 - samoht/fdd onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee 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 0518458f5..b8666f290 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - 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:c4bc89cf0d66733c923ab9cb46198b599eb99320 + image: linuxkit/sshd:6e4740bee64bf44e9913a1db4a38b5c3a5fb6ab1 - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 32982ba98..3dcf40367 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:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 services: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 56f8121f8..8e10aa3fe 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:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - 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 6afef2f3c..aed9a355e 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:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: mkimage - image: linuxkit/mkimage:v0.6 + image: linuxkit/mkimage:a8680e89070591c8b9e80d54e185787c19921668 - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 trust: diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index ce8e1c2ee..cb6af7755 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:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee 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 f3aba5728..79d8cb0ed 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:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee 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:v0.6 + image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b # 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 1ebd57a72..4849a4bc2 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 1ebd57a72..4849a4bc2 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 be1a98809..7e17f79c3 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 ab4d78106..574f2a461 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 ab4d78106..574f2a461 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 ab4d78106..574f2a461 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 ab4d78106..574f2a461 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 343a557cb..0f6bf8d79 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 ab4d78106..574f2a461 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 ab4d78106..574f2a461 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 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 21c477981..aad5a4e5e 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:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 services: - name: acpid - image: linuxkit/acpid:v0.6 + image: linuxkit/acpid:c4559f5fdce997de5dedc4c750c7a0d1044b3425 trust: org: - linuxkit diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index 8f8f921d6..6aed054c3 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.161 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:85727fa0ad52861758230cd264059c79f657b953 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 aacc6d36b..b7511f5c0 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.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:85727fa0ad52861758230cd264059c79f657b953 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 0f6baf6f3..c90995af8 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.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:85727fa0ad52861758230cd264059c79f657b953 diff --git a/test/cases/020_kernel/006_config_4.20.x/test.yml b/test/cases/020_kernel/006_config_4.20.x/test.yml index f9f743deb..c0c9bd417 100644 --- a/test/cases/020_kernel/006_config_4.20.x/test.yml +++ b/test/cases/020_kernel/006_config_4.20.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.20.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:85727fa0ad52861758230cd264059c79f657b953 diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index e6180bd94..7e1ec41fa 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.161 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/012_kmod_4.14.x/test.yml b/test/cases/020_kernel/012_kmod_4.14.x/test.yml index f334914f0..8d73a39ba 100644 --- a/test/cases/020_kernel/012_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/012_kmod_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.104 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/015_kmod_4.19.x/test.yml b/test/cases/020_kernel/015_kmod_4.19.x/test.yml index 0c8573534..ca2d8f56d 100644 --- a/test/cases/020_kernel/015_kmod_4.19.x/test.yml +++ b/test/cases/020_kernel/015_kmod_4.19.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/016_kmod_4.20.x/test.yml b/test/cases/020_kernel/016_kmod_4.20.x/test.yml index b5ef8271a..2f4a61b5d 100644 --- a/test/cases/020_kernel/016_kmod_4.20.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.20.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.20.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/110_namespace/common.yml b/test/cases/020_kernel/110_namespace/common.yml index 69bdb8cdb..3e68b92ec 100644 --- a/test/cases/020_kernel/110_namespace/common.yml +++ b/test/cases/020_kernel/110_namespace/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af 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 6592cf507..ca36d4690 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:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: sysfs - image: linuxkit/sysfs:v0.6 + image: linuxkit/sysfs:21a2071205e7060ed76656960eda5434b2fdcd91 - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:v0.6 + image: linuxkit/rngd:dc49cff2c835b196610a3f2efb585bb276658bce - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee - name: docker image: docker:18.06.0-ce-dind capabilities: diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 27881d62f..0f62c7650 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 001353422..da7b2c498 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: binfmt - image: linuxkit/binfmt:e2d222038867ebd13b0b723c8351be559267050b + image: linuxkit/binfmt:1d336b31146564a799673ff1a869c9717c2a86e0 - name: test image: alpine:3.9 binds: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index d2a496cb5..ea6852839 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 447f23811..6b02b593b 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib"] - name: test image: linuxkit/test-containerd:998fdcb9ee8116ba77b24ca7ce7c5d0ad7be2dbe diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 2ad4ae76b..ea5bb2b75 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: alpine:3.9 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 47ed9d6c3..cdf95b0e8 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:4.14.88 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 - - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: dm-crypt - image: linuxkit/dm-crypt:9e41a164358b0235f0c242219b1a424c6552d46c + image: linuxkit/dm-crypt:6ace64a97f2db77301be0c1106dd2e2ddf9e2eab command: ["/usr/bin/crypto", "it_is_encrypted", "/dev/sda"] - name: test image: alpine:3.9 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 a2b5adab4..bc755f6e3 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:4.14.88 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 - - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: dm-crypt - image: linuxkit/dm-crypt:9e41a164358b0235f0c242219b1a424c6552d46c + image: linuxkit/dm-crypt:6ace64a97f2db77301be0c1106dd2e2ddf9e2eab command: ["/usr/bin/crypto", "-l", "it_is_encrypted", "/dev/sda"] - name: test image: alpine:3.9 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 74ad61a03..301c69ccd 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:4.14.88 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 - - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: dm-crypt - image: linuxkit/dm-crypt:9e41a164358b0235f0c242219b1a424c6552d46c + image: linuxkit/dm-crypt:6ace64a97f2db77301be0c1106dd2e2ddf9e2eab 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 62eea18c5..bf18b1b9b 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 a2f4407e9..ec21afeaf 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: extend - image: linuxkit/extend:v0.6 + image: linuxkit/extend:4af9cb8282eabb1df184a0c4f74e0d651f16bf24 - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 36a13a0dd..b1e3bfb86 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: modprobe - image: linuxkit/modprobe:v0.6 + image: linuxkit/modprobe:90db3b2e63ceb633b7f66626c935c00d48e47c89 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 9e9463dd1..3c71ff007 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: modprobe - image: linuxkit/modprobe:v0.6 + image: linuxkit/modprobe:90db3b2e63ceb633b7f66626c935c00d48e47c89 command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:v0.6 + image: linuxkit/extend:4af9cb8282eabb1df184a0c4f74e0d651f16bf24 command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 372fdb42c..20a3c630a 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 2f5f3a0b7..a90a5e8f3 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: extend - image: linuxkit/extend:v0.6 + image: linuxkit/extend:4af9cb8282eabb1df184a0c4f74e0d651f16bf24 command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 6b55d4e7a..4c0ba57fd 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 48e97aa78..6a2de8fc3 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.9 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 0a7777ae3..8ff15e423 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.9 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 ef4bdf7ab..edaaa7bef 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: modprobe - image: linuxkit/modprobe:v0.6 + image: linuxkit/modprobe:90db3b2e63ceb633b7f66626c935c00d48e47c89 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 bbb2e4913..fd81912a1 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.9 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 d21eaeca3..61b47e909 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 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 01e87faf5..f0c8c9a4a 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:v0.6 + image: linuxkit/format:ada5fd97592c33399140f5f93f517c02f55edb14 command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:v0.6 + image: linuxkit/mount:019bc551972cf2d136b443d70b4bf94c54d0d1fe command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 5da263079..58a58105d 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 + image: linuxkit/getty:01993189b8c583dc91cbbc7d4be131832c0fc205 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 6863c55b5..3ec192b21 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:4.14.88 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 - - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: losetup - image: linuxkit/losetup:b05ffc8641cc955abe45f6730cbe6d723b63bd3f + image: linuxkit/losetup:4ceebb2672031d87a8fa60ac5e93e54c2ff1f0f2 command: ["/usr/bin/loopy", "-c", "/var/test.img"] - name: test image: alpine:3.9 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 2611f3de2..564fe2106 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: mkimage - image: linuxkit/mkimage:v0.6 + image: linuxkit/mkimage:a8680e89070591c8b9e80d54e185787c19921668 - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 trust: diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index f09a144ca..bff9cd79e 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: poweroff image: linuxkit/poweroff:9f4e04f09bbb4a028f0a1f57d430e1ad3095ace1 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 1cd5cd1f5..a3ef55c96 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: sysctl - image: linuxkit/sysctl:v0.6 + image: linuxkit/sysctl:713e535f2d4e4c74aba50cc7f73e3826b2dd3857 - name: test image: alpine:3.9 net: host diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 3a25f2a6a..4b8e17b31 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:v0.6 + image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:v0.6 + image: linuxkit/ip:4787413a729748bcf7560c73e0b46d38b8a8df2b 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 114c1ed8f..e4e3e7936 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 - - linuxkit/memlogd:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/memlogd:3d74c1153f99948d92c0fa9c759f816ab48d9855 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.6 + image: linuxkit/logwrite:62cbf48ee2fcd374f26de7b901adc287ff6f4696 command: ["/usr/bin/logwrite", "-max-log-size", "1024"] - name: check-the-logs image: alpine:3.9 diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 4eccffcc5..c59a7e47f 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 - - linuxkit/ca-certificates:v0.6 - - linuxkit/memlogd:v0.6 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 + - linuxkit/ca-certificates:906c46a26fd2df271bf64c0259bf2267f7593213 + - linuxkit/memlogd:3d74c1153f99948d92c0fa9c759f816ab48d9855 services: - name: kmsg - image: linuxkit/kmsg:v0.6 + image: linuxkit/kmsg:9329a7bb25b27974d74b765fe15d5f1b76609198 - name: write-and-rotate-logs - image: linuxkit/logwrite:v0.6 + image: linuxkit/logwrite:62cbf48ee2fcd374f26de7b901adc287ff6f4696 - name: check-the-logs image: alpine:3.9 binds: diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index 6afa79e80..3723d8d50 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:4.19.26 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 - - linuxkit/runc:v0.5 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af - linuxkit/kernel-bcc:4.19.25 onboot: - name: check-bcc diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 5afb3859e..0b8e150a3 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index ef2e11930..98f55cb09 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,12 +4,12 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 - - linuxkit/containerd:2aff4d486220667364b2971b5fc6225bf165a069 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/containerd:6e6841be5ad15c30752d81d121b247fa3ae08c97 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.6 + image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config image: linuxkit/test-kernel-config:85727fa0ad52861758230cd264059c79f657b953 diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 57e945da0..022b90a7c 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:4.19.26 cmdline: "console=ttyS0" init: - - linuxkit/init:a2166a6048ce041eebe005ab99454cfdeaa5c848 - - linuxkit/runc:069d5cd3cc4f0aec70e4af53aed5d27a21c79c35 + - linuxkit/init:005807f5c6a74e23f485a6d1657818bdccb70cd0 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af onboot: - name: test-ns image: linuxkit/test-ns: From e8a80665dcf1b506f75d847badd981fd65d29151 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 14:32:40 +0000 Subject: [PATCH 20/31] examples: Update to Alpine 3.9 Signed-off-by: Rolf Neugebauer --- examples/docker-for-mac.yml | 4 ++-- examples/logging.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 1dc05338f..a00caf728 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.8 + image: alpine:3.9 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.8 + image: alpine:3.9 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 06247653f..e288486d7 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.8 + image: alpine:3.9 command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); sleep 1; done" ] - name: write-and-rotate-logs image: linuxkit/logwrite:62cbf48ee2fcd374f26de7b901adc287ff6f4696 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 96f61881e..ccaa2fa0b 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -10,7 +10,7 @@ onboot: image: linuxkit/dhcpcd:85738d3d2f152a7879e17a61444f7714b858c2ee command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit - image: alpine:3.8 + image: alpine:3.9 binds: - /var/:/host_var:rbind,rshared capabilities: From 7c1952785d09c26009dfc3f0637f6818c5fdd81a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 14:33:53 +0000 Subject: [PATCH 21/31] Update Authors Signed-off-by: Rolf Neugebauer --- AUTHORS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index 9efeaa776..ce5a71524 100644 --- a/AUTHORS +++ b/AUTHORS @@ -56,6 +56,7 @@ Jeffrey Hogan Jeremy Yallop Jes Ferrier Jesse Adametz +Johannes Würbach John Albietz Jose Carlos Venegas Munoz Justin Barrick @@ -125,6 +126,7 @@ Tiejun Chen Tim Potter Tobias Gesellchen Tobias Klauser +Tomas Knappek Tristan Slominski Tycho Andersen Vincent Demeester From 7750ac10bf301373e15aec2ba2ee68b902d3a1eb Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 14:49:46 +0000 Subject: [PATCH 22/31] circleci: Bump go to 1.11 Signed-off-by: Rolf Neugebauer --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9bba3ecbd..32b3708f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: /go/src/github.com/linuxkit/linuxkit docker: - - image: circleci/golang:1.10-stretch + - image: circleci/golang:1.11-stretch steps: - checkout - run: mkdir -p ./bin From 27f8e8c850cb27789d738b943ecaa4626efab350 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 15:02:49 +0000 Subject: [PATCH 23/31] cmd: de-lint moby/docker.go Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/moby/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/moby/docker.go b/src/cmd/linuxkit/moby/docker.go index e22560fec..c8ca94352 100644 --- a/src/cmd/linuxkit/moby/docker.go +++ b/src/cmd/linuxkit/moby/docker.go @@ -219,7 +219,7 @@ func getAuth(cli *client.Client, refStr string) string { // Normalise ref ref, err := distref.ParseNormalizedNamed(refStr) if err != nil { - log.Debugf("Failed to parse reference %s: %v: %v", refStr, err) + log.Debugf("Failed to parse reference %s: %v", refStr, err) return "" } hostname := distref.Domain(ref) From 9f9252c3f39ae75f343ba26cd9835123d774696d Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 15:07:05 +0000 Subject: [PATCH 24/31] src: De-lint run_qemu.go Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/run_qemu.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmd/linuxkit/run_qemu.go b/src/cmd/linuxkit/run_qemu.go index 0b3d446a9..98114d33d 100644 --- a/src/cmd/linuxkit/run_qemu.go +++ b/src/cmd/linuxkit/run_qemu.go @@ -94,7 +94,7 @@ func retrieveMAC(statePath string) net.HardwareAddr { if macString, err := ioutil.ReadFile(fileName); err == nil { if mac, err = net.ParseMAC(string(macString)); err != nil { - log.Fatal("failed to parse mac-addr file: %s\n", macString) + log.Fatalf("failed to parse mac-addr file: %s\n", macString) } } else { // we did not generate a mac yet. generate one @@ -114,7 +114,7 @@ func generateMAC() net.HardwareAddr { log.WithError(err).Fatal("failed to generate random mac address") } if n != 6 { - log.WithError(err).Fatal("generated %d bytes for random mac address", n) + log.WithError(err).Fatalf("generated %d bytes for random mac address", n) } mac[0] &^= 0x01 // Clear multicast bit mac[0] |= 0x2 // Set locally administered bit @@ -546,7 +546,7 @@ func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) { case "x86_64": goArch = "amd64" default: - log.Fatalf("%s is an unsupported architecture.") + log.Fatalf("%s is an unsupported architecture.", config.Arch) } if goArch != runtime.GOARCH { From e340827c5c19d31248f38cfcf885f3eb422093da Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 15:08:05 +0000 Subject: [PATCH 25/31] src: De-lint push_aws.go Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/push_aws.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/push_aws.go b/src/cmd/linuxkit/push_aws.go index 3b5fe06ef..bba786791 100644 --- a/src/cmd/linuxkit/push_aws.go +++ b/src/cmd/linuxkit/push_aws.go @@ -144,7 +144,7 @@ func pushAWS(args []string) { if snapshotID == nil { log.Fatalf("SnapshotID unavailable after import completed") } else { - log.Debugf("SnapshotID: %s", snapshotID) + log.Debugf("SnapshotID: %s", *snapshotID) } regParams := &ec2.RegisterImageInput{ From e71a88a929ec15ba3ab5aa841fcc1b0036381fef Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 15:09:13 +0000 Subject: [PATCH 26/31] src: De-lint scaleway code Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/push_scaleway.go | 2 +- src/cmd/linuxkit/scaleway.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/linuxkit/push_scaleway.go b/src/cmd/linuxkit/push_scaleway.go index 08af5e4f2..886aec116 100644 --- a/src/cmd/linuxkit/push_scaleway.go +++ b/src/cmd/linuxkit/push_scaleway.go @@ -98,7 +98,7 @@ func pushScaleway(args []string) { if !*noCleanFlag { err = client.DeleteInstanceAndVolumes(instanceID) if err != nil { - log.Fatalf("Error deleting Scaleway instance and volumes: %v") + log.Fatalf("Error deleting Scaleway instance and volumes: %v", err) } } } diff --git a/src/cmd/linuxkit/scaleway.go b/src/cmd/linuxkit/scaleway.go index aa0949ba4..7841d9c77 100644 --- a/src/cmd/linuxkit/scaleway.go +++ b/src/cmd/linuxkit/scaleway.go @@ -492,7 +492,7 @@ func (s *ScalewayClient) ConnectSerialPort(instanceID string) error { fullURL := fmt.Sprintf("%s?arg=%s&arg=%s", gottyURL, s.api.Token, instanceID) - log.Debugf("Connection to ", fullURL) + log.Debugf("Connection to %s", fullURL) gottyClient, err := gotty.NewClient(fullURL) if err != nil { return err From a0e49c68bf798591f9dc297d4fbd979af048f0c5 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 3 Mar 2019 15:11:20 +0000 Subject: [PATCH 27/31] src: De-lint run_packet.go Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/run_packet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/run_packet.go b/src/cmd/linuxkit/run_packet.go index 32ca3e6e8..9cfba64e5 100644 --- a/src/cmd/linuxkit/run_packet.go +++ b/src/cmd/linuxkit/run_packet.go @@ -80,7 +80,7 @@ func runPacket(args []string) { url := getStringValue(packetBaseURL, *baseURLFlag, "") if url == "" { - log.Fatal("Need to specify a value for --base-url where the images are hosted. This URL should contain /%s-kernel, /%s-initrd.img and /%s-packet.ipxe") + log.Fatalf("Need to specify a value for --base-url where the images are hosted. This URL should contain /%s-kernel, /%s-initrd.img and /%s-packet.ipxe", prefix, prefix, prefix) } facility := getStringValue(packetZoneVar, *zoneFlag, "") plan := getStringValue(packetMachineVar, *machineFlag, defaultMachine) From 94516fe2a8a8a2b6e4f5255a5fad5002f854c357 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 5 Mar 2019 23:18:58 +0000 Subject: [PATCH 28/31] kernel: Remove libressl from kernel build Dockerfile Alpine 3.9 no longer uses libressl Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 582464f07..fdcec0302 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -16,8 +16,6 @@ RUN apk add \ installkernel \ kmod \ libelf-dev \ - libressl \ - libressl-dev \ linux-headers \ mpc1-dev \ mpfr-dev \ From d041e7d2bf3e25e09bd5850a8de15b6dbd0ffdc5 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 6 Mar 2019 00:37:31 +0000 Subject: [PATCH 29/31] kernel: Factor our perf build from main kernel build The build of the perf utility has been quite bothersome, with different arches and kernel versions failing. Since we now have the ful kernel source in the package, factor out the actual build into Dockerfile.perf Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 10 ---------- kernel/Dockerfile.perf | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index fdcec0302..a625e1eb7 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -172,16 +172,6 @@ RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdept RUN printf "KERNEL_SOURCE=${KERNEL_SOURCE}\n" > /out/kernel-source-info -# perf -# Only build perf for the latest LTS and the latest stable kernel. -# Skip arm64 for now as perf for 4.19.x fails to build. -RUN if [ "${KERNEL_SERIES}" != 4.9.x ] && [ $(uname -m) != aarch64 ]; then \ - mkdir -p /build/perf && \ - make -C tools/perf LDFLAGS=-static O=/build/perf && \ - strip /build/perf/perf && \ - cp /build/perf/perf /out; \ - fi - # Download Intel ucode and create a CPIO archive for it ENV UCODE_URL=https://downloadmirror.intel.com/28039/eng/microcode-20180807.tgz RUN set -e && \ diff --git a/kernel/Dockerfile.perf b/kernel/Dockerfile.perf index 5f08e7a97..ee20a3637 100644 --- a/kernel/Dockerfile.perf +++ b/kernel/Dockerfile.perf @@ -1,10 +1,43 @@ -# This Dockerfile extracts the perf utility from a kernel package and -# places it into a scratch image +# This Dockerfile extracts the source code and headers from a kernel package, +# builds the perf utility, and places it into a scratch image ARG IMAGE -FROM ${IMAGE} AS kernel +FROM ${IMAGE} AS ksrc + +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build +RUN apk add \ + argp-standalone \ + bash \ + bc \ + binutils-dev \ + bison \ + build-base \ + diffutils \ + flex \ + gmp-dev \ + installkernel \ + kmod \ + libelf-dev \ + mpc1-dev \ + mpfr-dev \ + sed \ + tar \ + xz \ + xz-dev \ + zlib-dev + +COPY --from=ksrc /linux.tar.xz /kernel-headers.tar / +RUN tar xf linux.tar.xz && \ + tar xf kernel-headers.tar + +WORKDIR /linux + +RUN mkdir -p /out && \ + make -C tools/perf LDFLAGS=-static && \ + strip tools/perf/perf && \ + cp tools/perf/perf /out FROM scratch ENTRYPOINT [] CMD [] WORKDIR / -COPY --from=kernel /perf /usr/bin/perf +COPY --from=build /out/perf /usr/bin/perf From 94cdfb55b62fbeb4829ad9575116d4d29e26186a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 6 Mar 2019 01:04:54 +0000 Subject: [PATCH 30/31] kernel: Skip perf build for now See https://github.com/linuxkit/linuxkit/issues/3299 Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 0b064afe0..004a0b69b 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -157,10 +157,9 @@ fetch: sources/linux-$(1).tar.xz # 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 for the latest LTS and the latest stable kernel -ifneq ($(2), $(filter $(2),4.9.x)) -ifneq ($(ARCH),aarch64) -# Skip arm64 for now as perf for 4.19.x fails to build. +# Skip perf build for now. See: +# https://github.com/linuxkit/linuxkit/issues/3299 +ifeq ($(ARCH),SKIP) 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 \ @@ -194,7 +193,6 @@ forcebuild: forcebuild_perf_$(2)$(3)$(4) push: push_perf_$(2)$(3)$(4) forcepush: forcepush_perf_$(2)$(3)$(4) endif -endif # Only build BCC on x86 and only on latest LTS and latest stable kernels. ifeq ($(ARCH),x86_64) From 3228d21abf312860b65cde776c4c1e156b505463 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 6 Mar 2019 20:12:00 +0000 Subject: [PATCH 31/31] kernel: Update gcc version in 4.19.x and 4.20 kernel config Signed-off-by: Rolf Neugebauer --- kernel/config-4.19.x-aarch64 | 4 ++-- kernel/config-4.19.x-s390x | 4 ++-- kernel/config-4.19.x-x86_64 | 4 ++-- kernel/config-4.20.x-aarch64 | 4 ++-- kernel/config-4.20.x-s390x | 4 ++-- kernel/config-4.20.x-x86_64 | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kernel/config-4.19.x-aarch64 b/kernel/config-4.19.x-aarch64 index b8a6f1586..8b9a6adeb 100644 --- a/kernel/config-4.19.x-aarch64 +++ b/kernel/config-4.19.x-aarch64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 6.4.0) 6.4.0 +# Compiler: gcc (Alpine 8.2.0) 8.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=60400 +CONFIG_GCC_VERSION=80200 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/kernel/config-4.19.x-s390x b/kernel/config-4.19.x-s390x index f6fa2b9c3..9e9e9b388 100644 --- a/kernel/config-4.19.x-s390x +++ b/kernel/config-4.19.x-s390x @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 6.4.0) 6.4.0 +# Compiler: gcc (Alpine 8.2.0) 8.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=60400 +CONFIG_GCC_VERSION=80200 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/kernel/config-4.19.x-x86_64 b/kernel/config-4.19.x-x86_64 index 6e1b834a4..982d529f3 100644 --- a/kernel/config-4.19.x-x86_64 +++ b/kernel/config-4.19.x-x86_64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 6.4.0) 6.4.0 +# Compiler: gcc (Alpine 8.2.0) 8.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=60400 +CONFIG_GCC_VERSION=80200 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/kernel/config-4.20.x-aarch64 b/kernel/config-4.20.x-aarch64 index 3c1904fba..1714e1385 100644 --- a/kernel/config-4.20.x-aarch64 +++ b/kernel/config-4.20.x-aarch64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 6.4.0) 6.4.0 +# Compiler: gcc (Alpine 8.2.0) 8.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=60400 +CONFIG_GCC_VERSION=80200 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/kernel/config-4.20.x-s390x b/kernel/config-4.20.x-s390x index 2bff8c327..d88442fee 100644 --- a/kernel/config-4.20.x-s390x +++ b/kernel/config-4.20.x-s390x @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 6.4.0) 6.4.0 +# Compiler: gcc (Alpine 8.2.0) 8.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=60400 +CONFIG_GCC_VERSION=80200 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/kernel/config-4.20.x-x86_64 b/kernel/config-4.20.x-x86_64 index 04b7e7315..c76452285 100644 --- a/kernel/config-4.20.x-x86_64 +++ b/kernel/config-4.20.x-x86_64 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Alpine 6.4.0) 6.4.0 +# Compiler: gcc (Alpine 8.2.0) 8.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=60400 +CONFIG_GCC_VERSION=80200 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y