From d563d78ac133e0d0eefd8d0ed0574aa220cd7914 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 25 Apr 2018 09:58:31 +0100 Subject: [PATCH] Bump packages to new alpine w/ containerd v1.1.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 b08ba496e..e613935e0 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:02d7e748614512ea099e8c76254e41bcea03ba8f as alpine +FROM linuxkit/alpine:90571a1a9059f3bf33ca3431bc5396aa837a47d3 as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index deedda510..cb47d95d4 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:02d7e748614512ea099e8c76254e41bcea03ba8f AS build +FROM linuxkit/alpine:90571a1a9059f3bf33ca3431bc5396aa837a47d3 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:02d7e748614512ea099e8c76254e41bcea03ba8f AS mirror +FROM linuxkit/alpine:90571a1a9059f3bf33ca3431bc5396aa837a47d3 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 b603413cc..0ebd44966 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:02d7e748614512ea099e8c76254e41bcea03ba8f AS mirror +FROM linuxkit/alpine:90571a1a9059f3bf33ca3431bc5396aa837a47d3 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)