From baa56f8b22fccbd64ecbbe5b78bcc80ff3b1a8b8 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 11 Feb 2019 09:32:56 +0000 Subject: [PATCH] alpine: Bump to containerd v1.2.3 Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 2 +- tools/alpine/versions.aarch64 | 14 +++++++------- tools/alpine/versions.s390x | 14 +++++++------- tools/alpine/versions.x86_64 | 14 +++++++------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 2840b0ff8..b00e9049f 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -54,7 +54,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.2.2 +ENV CONTAINERD_COMMIT=v1.2.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 1f6985f5d..9948eb4eb 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:ee9fdc5147feab0152bfcd767d8f9f534163b6fe-arm64 +# linuxkit/alpine:65ce4957b08baf27c6cce9dd3af2e869472f32d8-arm64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 @@ -25,7 +25,7 @@ btrfs-progs-dev-4.17-r1 btrfs-progs-libs-4.17-r1 build-base-0.5-r1 busybox-1.28.4-r3 -busybox-initscripts-3.1-r3 +busybox-initscripts-3.1-r4 bzip2-1.0.6-r6 ca-certificates-20171114-r3 cdrkit-1.1.11-r2 @@ -85,7 +85,7 @@ gmp-6.1.2-r1 gmp-dev-6.1.2-r1 gnupg-2.2.8-r0 gnutls-3.6.2-r0 -go-1.10.7-r0 +go-1.10.8-r0 grep-3.1-r2 guile-2.0.14-r0 guile-libs-2.0.14-r0 @@ -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-r3 +libjpeg-turbo-1.5.3-r4 libksba-1.3.5-r0 libldap-2.4.46-r0 libltdl-2.4.6-r5 @@ -273,7 +273,7 @@ slang-dev-2.3.2-r0 snappy-1.1.4-r4 sntpc-0.9-r6 socat-1.7.3.2-r4 -spice-server-0.14.1-r0 +spice-server-0.14.1-r1 sqlite-libs-3.25.3-r0 squashfs-tools-4.3-r4 ssl_client-1.28.4-r3 @@ -281,7 +281,7 @@ strace-4.22-r0 sudo-1.8.23-r2 swig-3.0.12-r3 talloc-2.1.12-r0 -tar-1.30-r0 +tar-1.31-r0 tcl-8.6.7-r0 tcpdump-4.9.2-r3 tini-0.18.0-r0 @@ -295,7 +295,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.20181218-r2 +wireguard-tools-0.0.20190123-r2 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 af3bc8660..0b0758e7e 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:38454edfbc59fc89a8efe9e5b16e944ad3e329b0-s390x +# linuxkit/alpine:6b8f260bcaa4d7037049fab41cb1cca84a061568-s390x # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 @@ -25,7 +25,7 @@ btrfs-progs-dev-4.17-r1 btrfs-progs-libs-4.17-r1 build-base-0.5-r1 busybox-1.28.4-r3 -busybox-initscripts-3.1-r3 +busybox-initscripts-3.1-r4 bzip2-1.0.6-r6 ca-certificates-20171114-r3 cdrkit-1.1.11-r2 @@ -85,7 +85,7 @@ gmp-6.1.2-r1 gmp-dev-6.1.2-r1 gnupg-2.2.8-r0 gnutls-3.6.2-r0 -go-1.10.7-r0 +go-1.10.8-r0 grep-3.1-r2 guile-2.0.14-r0 guile-libs-2.0.14-r0 @@ -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-r3 +libjpeg-turbo-1.5.3-r4 libksba-1.3.5-r0 libldap-2.4.46-r0 libltdl-2.4.6-r5 @@ -266,7 +266,7 @@ slang-dev-2.3.2-r0 snappy-1.1.4-r4 sntpc-0.9-r6 socat-1.7.3.2-r4 -spice-server-0.14.1-r0 +spice-server-0.14.1-r1 sqlite-libs-3.25.3-r0 squashfs-tools-4.3-r4 ssl_client-1.28.4-r3 @@ -274,7 +274,7 @@ strace-4.22-r0 sudo-1.8.23-r2 swig-3.0.12-r3 talloc-2.1.12-r0 -tar-1.30-r0 +tar-1.31-r0 tcl-8.6.7-r0 tcpdump-4.9.2-r3 tini-0.18.0-r0 @@ -288,7 +288,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.20181218-r2 +wireguard-tools-0.0.20190123-r2 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 f34f46012..d735b87b6 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:0de3332a65895be3a610a99377545c157ca4b138-amd64 +# linuxkit/alpine:19576072dd2b2f17fa73828e4bbd442e954992a3-amd64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 @@ -25,7 +25,7 @@ btrfs-progs-dev-4.17-r1 btrfs-progs-libs-4.17-r1 build-base-0.5-r1 busybox-1.28.4-r3 -busybox-initscripts-3.1-r3 +busybox-initscripts-3.1-r4 bzip2-1.0.6-r6 ca-certificates-20171114-r3 cdrkit-1.1.11-r2 @@ -86,7 +86,7 @@ gmp-6.1.2-r1 gmp-dev-6.1.2-r1 gnupg-2.2.8-r0 gnutls-3.6.2-r0 -go-1.10.7-r0 +go-1.10.8-r0 grep-3.1-r2 guile-2.0.14-r0 guile-libs-2.0.14-r0 @@ -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-r3 +libjpeg-turbo-1.5.3-r4 libksba-1.3.5-r0 libldap-2.4.46-r0 libltdl-2.4.6-r5 @@ -281,7 +281,7 @@ slang-dev-2.3.2-r0 snappy-1.1.4-r4 sntpc-0.9-r6 socat-1.7.3.2-r4 -spice-server-0.14.1-r0 +spice-server-0.14.1-r1 sqlite-libs-3.25.3-r0 squashfs-tools-4.3-r4 ssl_client-1.28.4-r3 @@ -290,7 +290,7 @@ sudo-1.8.23-r2 swig-3.0.12-r3 syslinux-6.04_pre1-r1 talloc-2.1.12-r0 -tar-1.30-r0 +tar-1.31-r0 tcl-8.6.7-r0 tcpdump-4.9.2-r3 tini-0.18.0-r0 @@ -304,7 +304,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.20181218-r2 +wireguard-tools-0.0.20190123-r2 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r14 wpa_supplicant-openrc-2.6-r14