From 4f715f5f2af822d60f41726c35317f1fe4d931c4 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 2 Mar 2019 19:06:59 +0000 Subject: [PATCH] tools: Update to the latest linuxkit/alpine Skip the packages which use grub to boot EFI images. The grub build fails, see: https://github.com/linuxkit/linuxkit/issues/3295 Signed-off-by: Rolf Neugebauer --- tools/go-compile/Dockerfile | 2 +- tools/mkimage-iso-bios/Dockerfile | 2 +- tools/mkimage-iso/Dockerfile | 2 +- tools/mkimage-raw-bios/Dockerfile | 2 +- tools/mkimage-rpi3/Dockerfile | 2 +- tools/mkimage-squashfs/Dockerfile | 2 +- tools/qemu/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile index 4a0cf82ff..dc33a6a4e 100644 --- a/tools/go-compile/Dockerfile +++ b/tools/go-compile/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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/tools/mkimage-iso-bios/Dockerfile b/tools/mkimage-iso-bios/Dockerfile index 84aa838d6..dbc7d0c64 100644 --- a/tools/mkimage-iso-bios/Dockerfile +++ b/tools/mkimage-iso-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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/tools/mkimage-iso/Dockerfile b/tools/mkimage-iso/Dockerfile index 110bccf65..c924695cf 100644 --- a/tools/mkimage-iso/Dockerfile +++ b/tools/mkimage-iso/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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/tools/mkimage-raw-bios/Dockerfile b/tools/mkimage-raw-bios/Dockerfile index 9fc6f6e69..864b139c7 100644 --- a/tools/mkimage-raw-bios/Dockerfile +++ b/tools/mkimage-raw-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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/tools/mkimage-rpi3/Dockerfile b/tools/mkimage-rpi3/Dockerfile index a653de6b4..7928a9215 100644 --- a/tools/mkimage-rpi3/Dockerfile +++ b/tools/mkimage-rpi3/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as build +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 as build RUN apk add \ bc \ dtc \ diff --git a/tools/mkimage-squashfs/Dockerfile b/tools/mkimage-squashfs/Dockerfile index a5cbfcbf0..4e9accd92 100644 --- a/tools/mkimage-squashfs/Dockerfile +++ b/tools/mkimage-squashfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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/tools/qemu/Dockerfile b/tools/qemu/Dockerfile index b33ac618c..9f2d4eeae 100644 --- a/tools/qemu/Dockerfile +++ b/tools/qemu/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror +FROM linuxkit/alpine:5ce235f4fb55772e7f78871a70bfe26f774fe2b0 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 \