From 473d544996453c727a6d705d2f005d97cdcdd3af Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 2 Aug 2017 18:24:32 +0100 Subject: [PATCH] tools: Update remaining tools to the multi-arch base linuxkit/mkimage-iso-bios did not work on aarch64 (no syslinux) and will error. Signed-off-by: Rolf Neugebauer --- tools/mkimage-iso-bios/Dockerfile | 2 +- tools/mkimage-iso-bios/Makefile | 1 + tools/mkimage-iso-efi/Dockerfile | 2 +- tools/qemu/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/mkimage-iso-bios/Dockerfile b/tools/mkimage-iso-bios/Dockerfile index 1c98f2caa..11f826d95 100644 --- a/tools/mkimage-iso-bios/Dockerfile +++ b/tools/mkimage-iso-bios/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 RUN \ apk update && apk upgrade && \ diff --git a/tools/mkimage-iso-bios/Makefile b/tools/mkimage-iso-bios/Makefile index ff6f47e3c..9a920db2c 100644 --- a/tools/mkimage-iso-bios/Makefile +++ b/tools/mkimage-iso-bios/Makefile @@ -1,4 +1,5 @@ IMAGE=mkimage-iso-bios DEPS=make-iso +ARCHES=x86_64 include ../../pkg/package.mk diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile index 034e666e2..4fd4e6cb2 100644 --- a/tools/mkimage-iso-efi/Dockerfile +++ b/tools/mkimage-iso-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 RUN \ apk update && apk upgrade && \ diff --git a/tools/qemu/Dockerfile b/tools/qemu/Dockerfile index 42e745873..201f34ea4 100644 --- a/tools/qemu/Dockerfile +++ b/tools/qemu/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:77c8dfc5860012c869a19d7a2c68e701469692c8 AS mirror +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 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 \