From 61ca7518400166ac16b73102f98c45ce9422b197 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 9 Nov 2017 09:54:51 +0000 Subject: [PATCH] Bump packages to new alpine w/ containerd v1.0.0-beta.3 Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 2 +- pkg/init/Dockerfile | 2 +- test/pkg/containerd/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 266e9ba7b..da7dc62cd 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 as alpine +FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 238912b0c..adfd8c1e5 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build +FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 8aca51015..90ed3637c 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS mirror +FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 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)