From 2ad451867e5053cf95d8c3f4aafd2c1a6758a42f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 25 Sep 2018 15:40:11 +0100 Subject: [PATCH] alpine: Bump to containerd v1.1.4 Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 2 +- tools/alpine/versions.aarch64 | 28 ++++++++++++++-------------- tools/alpine/versions.s390x | 28 ++++++++++++++-------------- tools/alpine/versions.x86_64 | 28 ++++++++++++++-------------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 8a34d145c..2142ea7b6 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -53,7 +53,7 @@ RUN go get -u github.com/LK4D4/vndr # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # `test/pkg/containerd/Dockerfile` when changing this. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.1.3 +ENV CONTAINERD_COMMIT=v1.1.4 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 0df5db8c5..94e7fe60b 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,9 +1,9 @@ -# linuxkit/alpine:764aa6732decb2db94befec53199b9086950954d-arm64 +# linuxkit/alpine:045a5aaa5b0b373f00048fbc19e5be78fb676a68-arm64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 alpine-keys-2.1-r1 -apk-tools-2.10.0-r3 +apk-tools-2.10.1-r0 argon2-libs-20171227-r1 argp-standalone-1.3-r3 attr-2.4.47-r7 @@ -40,7 +40,7 @@ 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.0-r0 +curl-7.61.1-r0 db-5.3.28-r0 dbus-libs-1.10.24-r1 device-mapper-libs-2.02.178-r0 @@ -127,8 +127,8 @@ 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.2o-r2 -libcurl-7.61.0-r0 +libcrypto1.0-1.0.2p-r0 +libcurl-7.61.1-r0 libdrm-2.4.92-r0 libedit-20170329.3.1-r3 libedit-dev-20170329.3.1-r3 @@ -148,7 +148,7 @@ libgpg-error-1.30-r0 libintl-0.19.8.1-r2 libisoburn-1.4.8-r0 libisofs-1.4.8-r0 -libjpeg-turbo-1.5.3-r1 +libjpeg-turbo-1.5.3-r3 libksba-1.3.5-r0 libldap-2.4.46-r0 libltdl-2.4.6-r5 @@ -171,7 +171,7 @@ libseccomp-2.3.3-r1 libseccomp-dev-2.3.3-r1 libsmartcols-2.32-r0 libssh2-1.8.0-r3 -libssl1.0-1.0.2o-r2 +libssl1.0-1.0.2p-r0 libstdc++-6.4.0-r8 libtasn1-4.13-r0 libtirpc-1.0.3-r0 @@ -214,10 +214,10 @@ 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-r0 -ncurses-libs-6.1_p20180818-r0 -ncurses-terminfo-6.1_p20180818-r0 -ncurses-terminfo-base-6.1_p20180818-r0 +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-r3 nfs-utils-openrc-2.3.1-r3 @@ -231,8 +231,8 @@ openrc-0.35.5-r4 openssh-keygen-7.7_p1-r3 openssh-server-7.7_p1-r3 openssh-server-common-7.7_p1-r3 -openssl-1.0.2o-r2 -openssl-dev-1.0.2o-r2 +openssl-1.0.2p-r0 +openssl-dev-1.0.2p-r0 opus-1.2.1-r1 p11-kit-0.23.10-r0 patch-2.7.6-r2 @@ -294,7 +294,7 @@ 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.20180809-r0 +wireguard-tools-0.0.20180918-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r14 wpa_supplicant-openrc-2.6-r14 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index 3f1297752..348c07943 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,9 +1,9 @@ -# linuxkit/alpine:5ac20042d1a6ad619d9e66d6e152b6034fc83fae-s390x +# linuxkit/alpine:397ade1c9ee609a2ed6066365a78e0ee2a96e2d5-s390x # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 alpine-keys-2.1-r1 -apk-tools-2.10.0-r3 +apk-tools-2.10.1-r0 argon2-libs-20171227-r1 argp-standalone-1.3-r3 attr-2.4.47-r7 @@ -40,7 +40,7 @@ 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.0-r0 +curl-7.61.1-r0 db-5.3.28-r0 dbus-libs-1.10.24-r1 device-mapper-libs-2.02.178-r0 @@ -126,8 +126,8 @@ 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.2o-r2 -libcurl-7.61.0-r0 +libcrypto1.0-1.0.2p-r0 +libcurl-7.61.1-r0 libdrm-2.4.92-r0 libedit-20170329.3.1-r3 libedit-dev-20170329.3.1-r3 @@ -145,7 +145,7 @@ libgpg-error-1.30-r0 libintl-0.19.8.1-r2 libisoburn-1.4.8-r0 libisofs-1.4.8-r0 -libjpeg-turbo-1.5.3-r1 +libjpeg-turbo-1.5.3-r3 libksba-1.3.5-r0 libldap-2.4.46-r0 libltdl-2.4.6-r5 @@ -168,7 +168,7 @@ libseccomp-2.3.3-r1 libseccomp-dev-2.3.3-r1 libsmartcols-2.32-r0 libssh2-1.8.0-r3 -libssl1.0-1.0.2o-r2 +libssl1.0-1.0.2p-r0 libstdc++-6.4.0-r8 libtasn1-4.13-r0 libtirpc-1.0.3-r0 @@ -207,10 +207,10 @@ 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-r0 -ncurses-libs-6.1_p20180818-r0 -ncurses-terminfo-6.1_p20180818-r0 -ncurses-terminfo-base-6.1_p20180818-r0 +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-r3 nfs-utils-openrc-2.3.1-r3 @@ -224,8 +224,8 @@ openrc-0.35.5-r4 openssh-keygen-7.7_p1-r3 openssh-server-7.7_p1-r3 openssh-server-common-7.7_p1-r3 -openssl-1.0.2o-r2 -openssl-dev-1.0.2o-r2 +openssl-1.0.2p-r0 +openssl-dev-1.0.2p-r0 opus-1.2.1-r1 p11-kit-0.23.10-r0 patch-2.7.6-r2 @@ -287,7 +287,7 @@ 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.20180809-r0 +wireguard-tools-0.0.20180918-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r14 wpa_supplicant-openrc-2.6-r14 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 7b1efd6b3..236b7a02c 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,9 +1,9 @@ -# linuxkit/alpine:4d13c6209a679fc7c4e850f144b7aef879914d01-amd64 +# linuxkit/alpine:4768505d40f23e198011b6f2c796f985fe50ec39-amd64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 alpine-keys-2.1-r1 -apk-tools-2.10.0-r3 +apk-tools-2.10.1-r0 argon2-libs-20171227-r1 argp-standalone-1.3-r3 attr-2.4.47-r7 @@ -40,7 +40,7 @@ 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.0-r0 +curl-7.61.1-r0 db-5.3.28-r0 dbus-libs-1.10.24-r1 device-mapper-libs-2.02.178-r0 @@ -131,8 +131,8 @@ 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.2o-r2 -libcurl-7.61.0-r0 +libcrypto1.0-1.0.2p-r0 +libcurl-7.61.1-r0 libdrm-2.4.92-r0 libedit-20170329.3.1-r3 libedit-dev-20170329.3.1-r3 @@ -152,7 +152,7 @@ libgpg-error-1.30-r0 libintl-0.19.8.1-r2 libisoburn-1.4.8-r0 libisofs-1.4.8-r0 -libjpeg-turbo-1.5.3-r1 +libjpeg-turbo-1.5.3-r3 libksba-1.3.5-r0 libldap-2.4.46-r0 libltdl-2.4.6-r5 @@ -177,7 +177,7 @@ libseccomp-2.3.3-r1 libseccomp-dev-2.3.3-r1 libsmartcols-2.32-r0 libssh2-1.8.0-r3 -libssl1.0-1.0.2o-r2 +libssl1.0-1.0.2p-r0 libstdc++-6.4.0-r8 libtasn1-4.13-r0 libtirpc-1.0.3-r0 @@ -221,10 +221,10 @@ 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-r0 -ncurses-libs-6.1_p20180818-r0 -ncurses-terminfo-6.1_p20180818-r0 -ncurses-terminfo-base-6.1_p20180818-r0 +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-r3 nfs-utils-openrc-2.3.1-r3 @@ -239,8 +239,8 @@ openrc-0.35.5-r4 openssh-keygen-7.7_p1-r3 openssh-server-7.7_p1-r3 openssh-server-common-7.7_p1-r3 -openssl-1.0.2o-r2 -openssl-dev-1.0.2o-r2 +openssl-1.0.2p-r0 +openssl-dev-1.0.2p-r0 opus-1.2.1-r1 ovmf-0.0.20170624-r0 p11-kit-0.23.10-r0 @@ -303,7 +303,7 @@ 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.20180809-r0 +wireguard-tools-0.0.20180918-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r14 wpa_supplicant-openrc-2.6-r14