From 7a48d9358c320ca7dba840e7aa9b397a50fad1ba Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 3 Apr 2018 09:52:04 +0100 Subject: [PATCH] alpine: Bump to containerd v1.0.3 Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 2 +- tools/alpine/versions.aarch64 | 10 +++++----- tools/alpine/versions.x86_64 | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 6f27d36dc..cee91e851 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.0.2 +ENV CONTAINERD_COMMIT=v1.0.3 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 1a7feb7fb..017b715ed 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:714160cc12b9c890b1de98fa4f7d104987130fa5-arm64 +# linuxkit/alpine:6d019c0ba6b9a9238b5c03ac8a85aecaac217711-arm64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 @@ -36,7 +36,7 @@ cmake-3.9.5-r0 coreutils-8.28-r0 cryptsetup-1.7.5-r1 cryptsetup-libs-1.7.5-r1 -curl-7.58.0-r1 +curl-7.59.0-r0 db-5.3.28-r0 dbus-libs-1.10.24-r0 device-mapper-libs-2.02.175-r0 @@ -116,7 +116,7 @@ libcap-ng-0.7.8-r1 libcap-ng-dev-0.7.8-r1 libcom_err-1.43.7-r0 libcrypto1.0-1.0.2n-r0 -libcurl-7.58.0-r1 +libcurl-7.59.0-r0 libdrm-2.4.88-r0 libedit-20170329.3.1-r3 libelf-0.8.13-r3 @@ -235,7 +235,7 @@ qemu-system-x86_64-2.10.1-r3 readline-7.0.003-r0 rhash-libs-1.3.5-r1 rpcbind-0.2.4-r0 -rsync-3.1.2-r7 +rsync-3.1.3-r0 scanelf-1.2.2-r1 sed-4.4-r1 sfdisk-2.31-r0 @@ -267,7 +267,7 @@ vim-8.0.1359-r0 wayland-libs-client-1.14.0-r2 wayland-libs-cursor-1.14.0-r2 wayland-libs-server-1.14.0-r2 -wireguard-tools-0.0.20180218-r0 +wireguard-tools-0.0.20180304-r2 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 xfsprogs-4.14.0-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 8c8c6cb97..1d4b8e004 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee-amd64 +# linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7-amd64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 @@ -36,7 +36,7 @@ cmake-3.9.5-r0 coreutils-8.28-r0 cryptsetup-1.7.5-r1 cryptsetup-libs-1.7.5-r1 -curl-7.58.0-r1 +curl-7.59.0-r0 db-5.3.28-r0 dbus-libs-1.10.24-r0 device-mapper-libs-2.02.175-r0 @@ -118,8 +118,8 @@ libcap-2.25-r1 libcap-ng-0.7.8-r1 libcap-ng-dev-0.7.8-r1 libcom_err-1.43.7-r0 -libcrypto1.0-1.0.2n-r0 -libcurl-7.58.0-r1 +libcrypto1.0-1.0.2o-r0 +libcurl-7.59.0-r0 libdrm-2.4.88-r0 libedit-20170329.3.1-r3 libelf-0.8.13-r3 @@ -165,7 +165,7 @@ libseccomp-2.3.2-r1 libseccomp-dev-2.3.2-r1 libsmartcols-2.31-r0 libssh2-1.8.0-r2 -libssl1.0-1.0.2n-r0 +libssl1.0-1.0.2o-r0 libstdc++-6.4.0-r5 libtasn1-4.12-r3 libtirpc-1.0.1-r2 @@ -214,8 +214,8 @@ openrc-0.24.1-r4 openssh-keygen-7.5_p1-r8 openssh-server-7.5_p1-r8 openssh-server-common-7.5_p1-r8 -openssl-1.0.2n-r0 -openssl-dev-1.0.2n-r0 +openssl-1.0.2o-r0 +openssl-dev-1.0.2o-r0 opus-1.2.1-r1 ovmf-0.0.20170624-r0 p11-kit-0.23.2-r2 @@ -242,7 +242,7 @@ qemu-system-x86_64-2.10.1-r3 readline-7.0.003-r0 rhash-libs-1.3.5-r1 rpcbind-0.2.4-r0 -rsync-3.1.2-r7 +rsync-3.1.3-r0 scanelf-1.2.2-r1 sed-4.4-r1 sfdisk-2.31-r0 @@ -275,7 +275,7 @@ vim-8.0.1359-r0 wayland-libs-client-1.14.0-r2 wayland-libs-cursor-1.14.0-r2 wayland-libs-server-1.14.0-r2 -wireguard-tools-0.0.20180304-r0 +wireguard-tools-0.0.20180304-r2 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 xfsprogs-4.14.0-r0