From 8ad9f65ec841bc1c80a6ecb28ec9e6009f2ab88c Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Jul 2018 09:29:08 +0100 Subject: [PATCH] alpine: Bump to containerd v1.1.1 Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 2 +- tools/alpine/versions.aarch64 | 2 +- tools/alpine/versions.s390x | 2 +- tools/alpine/versions.x86_64 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index c32405fea..5ca53df26 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.0-rc.2 +ENV CONTAINERD_COMMIT=v1.1.1 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 886f97c88..0e2d9ad66 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:3c2327e66cd7927a419e59cedc1e2b8742f4c1eb-arm64 +# linuxkit/alpine:16423407969d02cf36c3ae6b76d4280701bbbfa6-arm64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index 80f861d1b..7cf3c510b 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:a2a74a40b39cd910df5361246bc0ae7f98a05bc4-s390x +# linuxkit/alpine:91e3f51daf5fe62369fd517e6490c4b34f28c447-s390x # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index cd2bfe7db..ec3849714 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:6264e5b39af8eb1da7ffa4c05a7ccc597da01197-amd64 +# linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc-amd64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0