From e11c1c0224e43e14ce17242690e4f4178361730c Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 11 Aug 2017 15:37:23 +0100 Subject: [PATCH] pkg: Bump to containerd v1.0.0-alpha4 and runc v1.0.0-rc4 Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 2 +- pkg/runc/Dockerfile | 4 ++-- test/pkg/containerd/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index c11b6fa7c..fcb03c29d 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:4a9e5f80a774bbea494d49324428a22c6f018865 as alpine +FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 as alpine RUN \ apk add \ btrfs-progs-dev \ diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index f17606fd1..316cf5492 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:4a9e5f80a774bbea494d49324428a22c6f018865 as alpine +FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 as alpine RUN \ apk add \ bash \ @@ -11,7 +11,7 @@ RUN \ make \ && true ENV GOPATH=/go PATH=$PATH:/go/bin -ENV RUNC_COMMIT=45bde006ca8c90e089894508708bcf0e2cdf9e13 +ENV RUNC_COMMIT=v1.0.0-rc4 RUN mkdir -p $GOPATH/src/github.com/opencontainers && \ cd $GOPATH/src/github.com/opencontainers && \ git clone https://github.com/opencontainers/runc.git diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 402f82fd5..978e2f21f 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup)