From ad556eab78590eef5e4ef65bd01facd5850c1d44 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 30 Aug 2018 13:40:00 +0100 Subject: [PATCH] Bump packages to new alpine w/ containerd v1.1.3 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 4967ce3b9..2804c1fff 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as alpine +FROM linuxkit/alpine:4d13c6209a679fc7c4e850f144b7aef879914d01 as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index fa42bff12..90bc159d1 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build +FROM linuxkit/alpine:4d13c6209a679fc7c4e850f144b7aef879914d01 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -16,7 +16,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:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:4d13c6209a679fc7c4e850f144b7aef879914d01 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 2ff676263..6a902001d 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:4d13c6209a679fc7c4e850f144b7aef879914d01 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)