From 902e6182b0cd95dabfef4c3fda98ba349f92988c Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 12 Jul 2017 15:53:36 +0100 Subject: [PATCH] Temporarily use https://github.com/containerd/containerd/pull/1141 We expect this (or something very similar) to be merged soon, it fixes #2131 so moving ahead now. The new alpine mirror is linuxkit/alpine:6832775a7e861ee2d7842e157688ece52d007142 Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 2 +- tools/alpine/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 65ff2a05b..76523bfda 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:8bb8664eec04e02a8a131c53aa7d5d94119270ef as alpine +FROM linuxkit/alpine:6832775a7e861ee2d7842e157688ece52d007142 as alpine RUN \ apk add \ btrfs-progs-dev \ diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 65f207038..9d84cb095 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -49,5 +49,5 @@ COPY --from=mirror /Dockerfile /Dockerfile RUN apk update && apk upgrade -a -ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.0.0-alpha0 +ENV CONTAINERD_REPO=https://github.com/ijc/containerd.git +ENV CONTAINERD_COMMIT=3455ffc08c553db0ca9fe60b4ba2b3e8a2dc960b