From 6791ad986c5b4c85c6f4adfb748c8eee2efd1dca Mon Sep 17 00:00:00 2001 From: Dennis Chen Date: Mon, 17 Jul 2017 07:28:48 +0000 Subject: [PATCH] ARM64: Multi-arch support in qemu Dockerfile Update the qemu Dockerfile to support both amd64 and arm64. Signed-off-by: Dennis Chen --- tools/qemu/Dockerfile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/qemu/Dockerfile b/tools/qemu/Dockerfile index 680671805..fe2522b52 100644 --- a/tools/qemu/Dockerfile +++ b/tools/qemu/Dockerfile @@ -4,11 +4,24 @@ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ busybox \ libarchive-tools \ - qemu-img \ - qemu-system-x86_64 + qemu-img && \ + case $(uname -m) in \ + x86_64) \ + apk add --no-cache --initdb -p /out qemu-system-x86_64; \ + ;; \ + aarch64) \ + apk add --no-cache --initdb -p /out qemu-system-aarch64; \ + ;; \ + esac -RUN mkdir -p /out/usr/share/ovmf \ - && cp /usr/share/ovmf/bios.bin /out/usr/share/ovmf/bios.bin +RUN case $(uname -m) in \ + x86_64) \ + mkdir -p /out/usr/share/ovmf \ + && cp /usr/share/ovmf/bios.bin /out/usr/share/ovmf/bios.bin; \ + ;; \ + aarch64) \ + ;; \ + esac RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache FROM scratch