From 6cbc3ed518031946b24ffaf68227d26b36a6874a Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 7 Sep 2017 18:31:57 +0100 Subject: [PATCH] Bump init+containerd to new alpine base with containerd beta.0 Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 2 +- pkg/init/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 f4d7c41bf..8e61902ae 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 as alpine +FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 as alpine RUN \ apk add \ btrfs-progs-dev \ diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 8413a24e0..011fc06d8 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 AS build +FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -13,7 +13,7 @@ RUN go-compile.sh /go/src/cmd/init RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service -FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 AS mirror +FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 6069b5a52..39d601103 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 AS mirror +FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 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)