From 930c9c21df8037cd3bc83495cac79f2d7d8d3728 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 26 Jul 2017 15:22:35 +0100 Subject: [PATCH] tools/qemu: Install ovmf for x86 The previous commit moved ovmf to the packages instead of stashing it on the filesystem. This requires the package to be installed here. Signed-off-by: Rolf Neugebauer --- tools/qemu/Dockerfile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tools/qemu/Dockerfile b/tools/qemu/Dockerfile index fe2522b52..42e745873 100644 --- a/tools/qemu/Dockerfile +++ b/tools/qemu/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS mirror +FROM linuxkit/alpine:77c8dfc5860012c869a19d7a2c68e701469692c8 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 \ @@ -7,21 +7,12 @@ RUN apk add --no-cache --initdb -p /out \ qemu-img && \ case $(uname -m) in \ x86_64) \ - apk add --no-cache --initdb -p /out qemu-system-x86_64; \ + apk add --no-cache --initdb -p /out qemu-system-x86_64 ovmf; \ ;; \ aarch64) \ apk add --no-cache --initdb -p /out qemu-system-aarch64; \ ;; \ esac - -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