From da6cbf74f356a2f66eb427eaf55db417ad2611b5 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 11 Aug 2017 15:22:17 +0100 Subject: [PATCH] alpine: Update to containerd v1.0.0-alpha4 base. Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 5 +++-- tools/alpine/versions.aarch64 | 16 ++++++++-------- tools/alpine/versions.x86_64 | 16 ++++++++-------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 83556c1fb..dbf85d6c7 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -51,6 +51,7 @@ COPY --from=mirror /Dockerfile /Dockerfile RUN apk update && apk upgrade -a -# Update `FROM` in `test/pkg/containerd/Dockerfile` when changing this. +# Update `FROM` in both `pkg/containerd/Dockerfile` and +# `test/pkg/containerd/Dockerfile` when changing this. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.0.0-alpha3 +ENV CONTAINERD_COMMIT=v1.0.0-alpha4 diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index df002a870..329ff75aa 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:304ee372743f6221c3ffe901a67763b3a7fb2aa6-arm64 +# linuxkit/alpine:38032f77c1bebafebe9eb72906de38fb12078a79-arm64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 @@ -55,7 +55,7 @@ gettext-0.19.8.1-r1 gettext-asprintf-0.19.8.1-r1 gettext-dev-0.19.8.1-r1 gettext-libs-0.19.8.1-r1 -git-2.13.0-r0 +git-2.13.5-r0 glib-2.52.1-r0 gmp-6.1.2-r0 gmp-dev-6.1.2-r0 @@ -161,10 +161,10 @@ mtools-4.0.18-r1 musl-1.1.16-r13 musl-dev-1.1.16-r13 musl-utils-1.1.16-r13 -ncurses-dev-6.0-r7 -ncurses-libs-6.0-r7 -ncurses-terminfo-6.0-r7 -ncurses-terminfo-base-6.0-r7 +ncurses-dev-6.0-r8 +ncurses-libs-6.0-r8 +ncurses-terminfo-6.0-r8 +ncurses-terminfo-base-6.0-r8 nettle-3.3-r0 npth-1.2-r0 oniguruma-6.2.0-r0 @@ -200,7 +200,7 @@ sfdisk-2.28.2-r2 slang-2.3.1-r0 slang-dev-2.3.1-r0 snappy-1.1.4-r1 -spice-server-0.13.3-r1 +spice-server-0.13.3-r2 sqlite-libs-3.18.0-r0 squashfs-tools-4.3-r3 strace-4.16-r1 @@ -217,7 +217,7 @@ util-linux-dev-2.28.2-r2 vde2-libs-2.3.2-r7 vim-8.0.0595-r0 wayland-1.13.0-r0 -wireguard-tools-0.0.20170726-r0 +wireguard-tools-0.0.20170810-r0 xfsprogs-4.5.0-r0 xfsprogs-extra-4.5.0-r0 xfsprogs-libs-4.5.0-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 3990f5c84..6c15027d8 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:4a9e5f80a774bbea494d49324428a22c6f018865-amd64 +# linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4-amd64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 @@ -57,7 +57,7 @@ gettext-0.19.8.1-r1 gettext-asprintf-0.19.8.1-r1 gettext-dev-0.19.8.1-r1 gettext-libs-0.19.8.1-r1 -git-2.13.0-r0 +git-2.13.5-r0 glib-2.52.1-r0 gmp-6.1.2-r0 gmp-dev-6.1.2-r0 @@ -168,10 +168,10 @@ mtools-4.0.18-r1 musl-1.1.16-r13 musl-dev-1.1.16-r13 musl-utils-1.1.16-r13 -ncurses-dev-6.0-r7 -ncurses-libs-6.0-r7 -ncurses-terminfo-6.0-r7 -ncurses-terminfo-base-6.0-r7 +ncurses-dev-6.0-r8 +ncurses-libs-6.0-r8 +ncurses-terminfo-6.0-r8 +ncurses-terminfo-base-6.0-r8 nettle-3.3-r0 npth-1.2-r0 oniguruma-6.2.0-r0 @@ -208,7 +208,7 @@ sfdisk-2.28.2-r2 slang-2.3.1-r0 slang-dev-2.3.1-r0 snappy-1.1.4-r1 -spice-server-0.13.3-r1 +spice-server-0.13.3-r2 sqlite-libs-3.18.0-r0 squashfs-tools-4.3-r3 strace-4.16-r1 @@ -226,7 +226,7 @@ util-linux-dev-2.28.2-r2 vde2-libs-2.3.2-r7 vim-8.0.0595-r0 wayland-1.13.0-r0 -wireguard-tools-0.0.20170726-r0 +wireguard-tools-0.0.20170810-r0 xfsprogs-4.5.0-r0 xfsprogs-extra-4.5.0-r0 xfsprogs-libs-4.5.0-r0