From 45dcbc38af01567056413a00d1fc31413001de8b Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 12:53:59 +0100 Subject: [PATCH] tools: Update to the latest linuxkit/alpine with the exception of grub. It does not compile with the latest version, see: https://github.com/linuxkit/linuxkit/issues/3494 Signed-off-by: Rolf Neugebauer --- tools/go-compile/Dockerfile | 2 +- tools/mkimage-iso-bios/Dockerfile | 2 +- tools/mkimage-iso-efi/Dockerfile | 2 +- tools/mkimage-iso/Dockerfile | 2 +- tools/mkimage-qcow2-efi/Dockerfile | 2 +- tools/mkimage-raw-bios/Dockerfile | 2 +- tools/mkimage-raw-efi/Dockerfile | 2 +- tools/mkimage-rpi3/Dockerfile | 2 +- tools/mkimage-squashfs/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile index 1cbed0a05..6ec5bb592 100644 --- a/tools/go-compile/Dockerfile +++ b/tools/go-compile/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 07fe81340..3cc8cf78f 100644 --- a/tools/mkimage-iso-bios/Dockerfile +++ b/tools/mkimage-iso-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile index 0a72af6bc..5251788d2 100644 --- a/tools/mkimage-iso-efi/Dockerfile +++ b/tools/mkimage-iso-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:a0e2211d39c3c71613f902b3e29746badee3295e AS grub -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 888dcd461..d7d40ee8a 100644 --- a/tools/mkimage-iso/Dockerfile +++ b/tools/mkimage-iso/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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-qcow2-efi/Dockerfile b/tools/mkimage-qcow2-efi/Dockerfile index 15886248f..7e68b8eed 100644 --- a/tools/mkimage-qcow2-efi/Dockerfile +++ b/tools/mkimage-qcow2-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:a0e2211d39c3c71613f902b3e29746badee3295e AS grub -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 c436d37f1..82a74a3ef 100644 --- a/tools/mkimage-raw-bios/Dockerfile +++ b/tools/mkimage-raw-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile index 42e74a391..9bb0dd8d7 100644 --- a/tools/mkimage-raw-efi/Dockerfile +++ b/tools/mkimage-raw-efi/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/grub:a0e2211d39c3c71613f902b3e29746badee3295e AS grub -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 fbee6f6e7..6db3db614 100644 --- a/tools/mkimage-rpi3/Dockerfile +++ b/tools/mkimage-rpi3/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec as build +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as build RUN apk add \ bc \ bison \ diff --git a/tools/mkimage-squashfs/Dockerfile b/tools/mkimage-squashfs/Dockerfile index e780952d0..49b61d492 100644 --- a/tools/mkimage-squashfs/Dockerfile +++ b/tools/mkimage-squashfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS mirror +FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 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 \