From 6ef10ae33b358924dfe13f0bf14a6069d7541305 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 3 Aug 2017 11:56:37 +0100 Subject: [PATCH] Update to containerd v1.0.0-alpha3 and runc master Runc is master as of this morning, slightly newer than what is vendored into containerd v1.0.0-alpha3 but the differences[0] seemed benign and/or good to have. Signed-off-by: Ian Campbell [0] https://github.com/opencontainers/runc/compare/429a53871236...45bde006ca8c --- pkg/containerd/Dockerfile | 2 +- pkg/runc/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 01dd6813c..c11b6fa7c 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 as alpine +FROM linuxkit/alpine:4a9e5f80a774bbea494d49324428a22c6f018865 as alpine RUN \ apk add \ btrfs-progs-dev \ diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index 5ca01803a..f17606fd1 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 as alpine +FROM linuxkit/alpine:4a9e5f80a774bbea494d49324428a22c6f018865 as alpine RUN \ apk add \ bash \ @@ -11,7 +11,7 @@ RUN \ make \ && true ENV GOPATH=/go PATH=$PATH:/go/bin -ENV RUNC_COMMIT=429a5387123625040bacfbb60d96b1cbd02293ab +ENV RUNC_COMMIT=45bde006ca8c90e089894508708bcf0e2cdf9e13 RUN mkdir -p $GOPATH/src/github.com/opencontainers && \ cd $GOPATH/src/github.com/opencontainers && \ git clone https://github.com/opencontainers/runc.git