Commit d94a9d09 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Extract files inside container 

fix: Extract files inside container
parents 0bd0806c 6d9c281a

Dockerfile

+4 −5
Original line number Diff line number Diff line 
FROM ghcr.io/qemu-tools/qemu-host as builder

FROM qemux/qemu-host as builder



#  FROM golang as builder

#  WORKDIR /
@@ -21,14 +21,13 @@ RUN apt-get update && apt-get -y upgrade && \ 
	unzip \

	socat \	

	procps \

	dnsmasq \

	xz-utils \

	iptables \

	iproute2 \

 	dnsmasq \

  	net-tools \

	btrfs-progs \

	netcat-openbsd \

	ca-certificates \

	netcat-openbsd \

	qemu-system-x86 \

    && apt-get clean \

    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

run/disk.sh

+1 −1
Original line number Diff line number Diff line
@@ -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

run/install.sh

+6 −1
Original line number Diff line number Diff line
@@ -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