From a208413ac094a0b0c03904bce77e90da669b8cbd Mon Sep 17 00:00:00 2001 From: Tycho Andersen Date: Wed, 7 Jun 2017 16:19:40 -0600 Subject: [PATCH] fix package builds in some cases 0eb21735ae1b73d6012beff2898aaae49bf46f34 accidentally broke some package builds by switching linuxkit/alpine to linuxkit/containerd. Let's revert the ones that shouldn't be there. Closes #1991 Signed-off-by: Tycho Andersen --- pkg/binfmt/Dockerfile | 2 +- pkg/ca-certificates/Dockerfile | 2 +- pkg/dhcpcd/Dockerfile | 2 +- pkg/docker-ce/Dockerfile | 2 +- pkg/format/Dockerfile | 2 +- pkg/init/Dockerfile | 2 +- pkg/mkimage/Dockerfile | 2 +- pkg/mount/Dockerfile | 2 +- pkg/open-vm-tools/Dockerfile | 2 +- pkg/openntpd/Dockerfile | 2 +- pkg/qemu-ga/Dockerfile | 2 +- pkg/rngd/Dockerfile | 2 +- pkg/runc/Dockerfile | 2 +- pkg/sshd/Dockerfile | 2 +- pkg/swap/Dockerfile | 2 +- pkg/sysctl/Dockerfile | 2 +- pkg/sysfs/Dockerfile | 2 +- pkg/vsudd/Dockerfile | 2 +- projects/swarmd/swarmd/Dockerfile | 2 +- projects/wireguard/tools/Dockerfile | 2 +- test/pkg/virtsock/Dockerfile | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 2675524ed..9eae1e14e 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS qemu +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS qemu RUN apk add \ qemu-aarch64 \ qemu-arm \ diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile index 5b99f6253..3bd8c7dc5 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf as alpine +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 as alpine RUN apk add ca-certificates diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index d76c234c5..fd40b6fbb 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 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 \ diff --git a/pkg/docker-ce/Dockerfile b/pkg/docker-ce/Dockerfile index 46c66330a..639156913 100644 --- a/pkg/docker-ce/Dockerfile +++ b/pkg/docker-ce/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies # removed openssl as I do not think server needs it diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 1603c4881..73f1c604f 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 82944153e..850066d8e 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 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/pkg/mkimage/Dockerfile b/pkg/mkimage/Dockerfile index 0c72dfcbb..a5fa368d0 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile index dc48c69ba..b4609b24b 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index 700df6241..18db88aac 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 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 \ diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile index 1134da90a..a021587c4 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/qemu-ga/Dockerfile b/pkg/qemu-ga/Dockerfile index 380349e69..9691b25f4 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS build +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS build RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/var/run RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index 82166458a..87eace35d 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ tini diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index 706d2ddc7..b49ecfde2 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf as alpine +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index 0338ae1aa..31c48bc7e 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/swap/Dockerfile b/pkg/swap/Dockerfile index 8b6881cd1..7ad7f0ab0 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/sysctl/Dockerfile b/pkg/sysctl/Dockerfile index 0c6d27845..828e80ac1 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile index b43a0c429..3383ef010 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vsudd/Dockerfile b/pkg/vsudd/Dockerfile index 3ea74859f..d9f6392e5 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/projects/swarmd/swarmd/Dockerfile b/projects/swarmd/swarmd/Dockerfile index 875acb17f..08d060f6a 100644 --- a/projects/swarmd/swarmd/Dockerfile +++ b/projects/swarmd/swarmd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS build +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS build RUN \ apk update && apk upgrade && \ diff --git a/projects/wireguard/tools/Dockerfile b/projects/wireguard/tools/Dockerfile index 4f200cf68..e2ed1e373 100644 --- a/projects/wireguard/tools/Dockerfile +++ b/projects/wireguard/tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf as tools +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 as tools RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories RUN \ apk update && \ diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile index ed2b32e20..25effd1a5 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror +FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ tini