From 90f7d1bed9c75f454159c14a06a8311df0ef0fad Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 19 Jun 2018 16:01:20 +0100 Subject: [PATCH] Bump packages to new alpine w/ containerd v1.1.1-rc.1 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 a3605bd2d..cdc28e0f5 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:aacd96ba37a981d0ba659fd57316c7140cf59a36 as alpine +FROM linuxkit/alpine:f43a74d6693a8f11d4016a8fc6dcb87365b71eb6 as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index cb1e80adb..9e876f7e7 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:aacd96ba37a981d0ba659fd57316c7140cf59a36 AS build +FROM linuxkit/alpine:f43a74d6693a8f11d4016a8fc6dcb87365b71eb6 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -19,7 +19,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s 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:aacd96ba37a981d0ba659fd57316c7140cf59a36 AS mirror +FROM linuxkit/alpine:f43a74d6693a8f11d4016a8fc6dcb87365b71eb6 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 89f04b954..43a3743a1 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:aacd96ba37a981d0ba659fd57316c7140cf59a36 AS mirror +FROM linuxkit/alpine:f43a74d6693a8f11d4016a8fc6dcb87365b71eb6 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)