From 6a8093a3f4a902c5af7cc4d91dc5627716b3d0c8 Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 5 Oct 2023 15:31:42 +0200 Subject: [PATCH 1/4] fix: Do not format image as btrfs --- run/disk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/disk.sh b/run/disk.sh index 165364c..404835c 100644 --- a/run/disk.sh +++ b/run/disk.sh @@ -125,7 +125,7 @@ if [ ! -f "${DATA}" ]; then fi # Format as BTRFS filesystem - mkfs.btrfs -q -L data -d single -m dup "${DATA}" > /dev/null + # mkfs.btrfs -q -L data -d single -m dup "${DATA}" > /dev/null fi From 97918abdb063f9c8553c2a57f812f37828083f19 Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 5 Oct 2023 15:35:24 +0200 Subject: [PATCH 2/4] build: Remove btrfs-progs --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9efb952..8b76973 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,14 +21,13 @@ RUN apt-get update && apt-get -y upgrade && \ unzip \ socat \ procps \ - dnsmasq \ xz-utils \ iptables \ iproute2 \ - net-tools \ - btrfs-progs \ - netcat-openbsd \ + dnsmasq \ + net-tools \ ca-certificates \ + netcat-openbsd \ qemu-system-x86 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From da51c1df1f3ab36aac505c71f4f31566e8b0610a Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 5 Oct 2023 15:47:17 +0200 Subject: [PATCH 3/4] fix: Extract files inside container --- run/install.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/run/install.sh b/run/install.sh index 8bdc812..f4178a9 100644 --- a/run/install.sh +++ b/run/install.sh @@ -31,7 +31,7 @@ rm -f "$STORAGE"/"$BASE".agent rm -f "$STORAGE"/"$BASE".boot.img rm -f "$STORAGE"/"$BASE".system.img -TMP="$STORAGE/tmp" +TMP="/tmp/dsm" RDC="$STORAGE/dsm.rd" rm -rf "$TMP" && mkdir -p "$TMP" @@ -250,6 +250,11 @@ mke2fs -q -t ext4 -b 4096 -d "$MOUNT/" -L "$LABEL" -F -E "offset=$OFFSET" "$SYST rm -rf "$MOUNT" echo "$BASE" > "$STORAGE"/dsm.ver + +# Check free diskspace +SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1) +(( 6442450944 > SPACE )) && error "Not enough free space in destination folder." && exit 94 + mv -f "$PAT" "$STORAGE"/"$BASE".pat mv -f "$BOOT" "$STORAGE"/"$BASE".boot.img mv -f "$SYSTEM" "$STORAGE"/"$BASE".system.img From 6d9c281add623af08992a919c1d96bb7432594dd Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 5 Oct 2023 15:51:42 +0200 Subject: [PATCH 4/4] build: Use DockerHub mirror --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8b76973..d43346e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/qemu-tools/qemu-host as builder +FROM qemux/qemu-host as builder # FROM golang as builder # WORKDIR /