From cab27698f41498ec76e9f3cfcd5ceac2a6b11c16 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 27 Jun 2017 15:59:37 +0100 Subject: [PATCH] pkg: Update all packages to the new alpine base In a subsequent commit, all YAML files will be updated with new package hashes since all packages needed rebuild due to build system changes in commit adae27b8d1ba86a028 ("Simplify Makefiles for Packages"). So, we might as well bring all packages up to the latest alpine base package. Signed-off-by: Rolf Neugebauer --- pkg/binfmt/Dockerfile | 4 ++-- pkg/ca-certificates/Dockerfile | 2 +- pkg/containerd/Dockerfile | 2 +- pkg/dhcpcd/Dockerfile | 2 +- pkg/docker-ce/Dockerfile | 2 +- pkg/format/Dockerfile | 2 +- pkg/getty/Dockerfile | 2 +- pkg/init/Dockerfile | 4 ++-- pkg/metadata/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 | 4 ++-- pkg/runc/Dockerfile | 2 +- pkg/sshd/Dockerfile | 2 +- pkg/swap/Dockerfile | 2 +- pkg/sysctl/Dockerfile | 2 +- pkg/sysfs/Dockerfile | 2 +- pkg/vpnkit-forwarder/Dockerfile | 2 +- pkg/vsudd/Dockerfile | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 9eae1e14e..dd6dadf76 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS qemu +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 AS qemu RUN apk add \ qemu-aarch64 \ qemu-arm \ qemu-ppc64le -FROM linuxkit/alpine:451603daf499e3a40308dbf5571dcffed2343ffa AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile index 3bd8c7dc5..35bab864e 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 as alpine +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 as alpine RUN apk add ca-certificates diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 9587cbcac..0aef231f4 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:c96f56ef989ccb31fd115d25c1b90f05b992271d as alpine +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 as alpine RUN \ apk add \ btrfs-progs-dev \ diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index fd40b6fbb..7dfc17ba8 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 cf5f235c7..2c0c534b2 100644 --- a/pkg/docker-ce/Dockerfile +++ b/pkg/docker-ce/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 73f1c604f..0342b710c 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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/getty/Dockerfile b/pkg/getty/Dockerfile index bc679a09c..73ed45b9d 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 85af575cb..73f6804d2 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS build +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev ADD usermode-helper.c . RUN make usermode-helper -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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/metadata/Dockerfile b/pkg/metadata/Dockerfile index d3fa8fd1d..518fab4ef 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:451603daf499e3a40308dbf5571dcffed2343ffa AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/mkimage/Dockerfile b/pkg/mkimage/Dockerfile index a5fa368d0..656393915 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 b4609b24b..9b3da8ad8 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 18db88aac..471b8a2d5 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 a021587c4..09440cd54 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 9691b25f4..32629d1c8 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS build +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 07fd49dbd..ee6bd4deb 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,11 +1,11 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ tini RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache RUN mkdir -p /out/dev /out/proc /out/sys -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS build +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 AS build RUN apk add \ argp-standalone \ automake \ diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index b49ecfde2..02a83f3d5 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 as alpine +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index ad6889148..bf6f1c618 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 7ad7f0ab0..c95d5da2d 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 828e80ac1..994794b24 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 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 3383ef010..4ee6397f0 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vpnkit-forwarder/Dockerfile b/pkg/vpnkit-forwarder/Dockerfile index e6141e2ac..65ab82b22 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vsudd/Dockerfile b/pkg/vsudd/Dockerfile index d9f6392e5..aba279eca 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror +FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin