github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Temporarily use https://github.com/containerd/containerd/pull/1141

Browse Source 
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 <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-07-12 15:53:36 +01:00
parent c5634c4650
commit 902e6182b0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/containerd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:8bb8664eec04e02a8a131c53aa7d5d94119270ef as alpine FROM linuxkit/alpine:6832775a7e861ee2d7842e157688ece52d007142 as alpine
RUN \ RUN \
apk add \ apk add \
btrfs-progs-dev \ btrfs-progs-dev \

4
tools/alpine/Dockerfile
View File

@ -49,5 +49,5 @@ COPY --from=mirror /Dockerfile /Dockerfile
RUN apk update && apk upgrade -a RUN apk update && apk upgrade -a
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git ENV CONTAINERD_REPO=https://github.com/ijc/containerd.git
ENV CONTAINERD_COMMIT=v1.0.0-alpha0 ENV CONTAINERD_COMMIT=3455ffc08c553db0ca9fe60b4ba2b3e8a2dc960b