From ff801558897c69bcd0f201191ae6cd9dfe8f8adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gerdau?= Date: Tue, 24 Nov 2020 13:25:35 +0100 Subject: [PATCH] chore: update to qemu 5.1 --- Dockerfile | 7 ++++--- entrypoint.sh | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2911cca..e2f513a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Build stage for qemu-system-arm FROM debian:stable-slim AS qemu-builder -ARG QEMU_VERSION=4.2.0 +ARG QEMU_VERSION=5.1.0 ENV QEMU_TARBALL="qemu-${QEMU_VERSION}.tar.xz" WORKDIR /qemu @@ -67,6 +67,7 @@ ARG RPI_KERNEL_CHECKSUM="295a22f1cd49ab51b9e7192103ee7c917624b063cc5ca2e11434164 COPY --from=qemu-builder /qemu/arm-softmmu/qemu-system-arm /usr/local/bin/qemu-system-arm COPY --from=qemu-builder /qemu/aarch64-softmmu/qemu-system-aarch64 /usr/local/bin/qemu-system-aarch64 +COPY --from=qemu-builder /qemu/qemu-img /usr/local/bin/qemu-img COPY --from=fatcat-builder /fatcat/fatcat /usr/local/bin/fatcat ADD $RPI_KERNEL_URL /tmp/qemu-rpi-kernel.zip @@ -89,8 +90,8 @@ ENTRYPOINT ["./entrypoint.sh"] # It's just the VM image with a compressed Raspbian filesystem added FROM dockerpi-vm as dockerpi LABEL maintainer="Luke Childs " -ARG FILESYSTEM_IMAGE_URL="http://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2019-09-30/2019-09-26-raspbian-buster-lite.zip" -ARG FILESYSTEM_IMAGE_CHECKSUM="a50237c2f718bd8d806b96df5b9d2174ce8b789eda1f03434ed2213bbca6c6ff" +ARG FILESYSTEM_IMAGE_URL="http://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2020-02-14/2020-02-13-raspbian-buster-lite.zip" +ARG FILESYSTEM_IMAGE_CHECKSUM="12ae6e17bf95b6ba83beca61e7394e7411b45eba7e6a520f434b0748ea7370e8" ADD $FILESYSTEM_IMAGE_URL /filesystem.zip diff --git a/entrypoint.sh b/entrypoint.sh index 1c726c8..f47c4e1 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -10,6 +10,8 @@ if [ ! -e $image_path ]; then echo "Extracting fresh filesystem..." unzip $zip_path mv -- *.img $image_path + + qemu-img resize $image_path 2G else exit 1 fi