Switch from guestmount / libguestfs to loop device

Downside is that the container needs to be in privileged mode during installation
This commit is contained in:
Kroese
2023-03-30 03:16:32 +02:00
parent 1244c04f4b
commit 67b5b87ac3
3 changed files with 48 additions and 58 deletions

View File

@@ -5,22 +5,22 @@ WORKDIR /src/serial
RUN go get -d -v golang.org/x/net/html
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /src/serial/main .
FROM debian:bullseye-20230109-slim
FROM debian:bookworm-20230320-slim
RUN apt-get update && apt-get -y upgrade && \
apt-get --no-install-recommends -y install \
iproute2 \
jq \
netcat \
xz-utils \
unzip \
wget \
python3 \
linux-image-generic \
libguestfs-tools \
ca-certificates \
qemu-system-x86 \
udhcpd \
iproute2 \
jq \
wget \
unzip \
parted \
procps \
python3 \
xz-utils \
ca-certificates \
netcat-openbsd \
qemu-system-x86 \
udhcpd \
&& apt-get clean
COPY generate-dhcpd-conf /run/
@@ -38,13 +38,11 @@ RUN ["chmod", "+x", "/run/qemu-ifup"]
RUN ["chmod", "+x", "/run/run.sh"]
RUN ["chmod", "+x", "/run/serial.sh"]
RUN ["chmod", "+x", "/run/server.sh"]
RUN ["chmod", "+x", "/run/serial.bin"]
RUN ["chmod", "+x", "/run/install.sh"]
COPY extractor/lib* /run/
COPY extractor/scemd /run/syno_extract_system_patch
RUN ["chmod", "+x", "/run/syno_extract_system_patch"]
COPY extractor/lib* /run/extract/
COPY extractor/scemd /run/extract/syno_extract_system_patch
COPY disks/template.img.xz /data/
VOLUME /storage
@@ -60,9 +58,9 @@ EXPOSE 5001
ENV RAM_SIZE 512M
ENV DISK_SIZE 16G
#ENV URL https://global.synologydownload.com/download/DSM/beta/7.2/64216/DSM_VirtualDSM_64216.pat
ENV URL https://global.synologydownload.com/download/DSM/beta/7.2/64216/DSM_VirtualDSM_64216.pat
#ENV URL https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat
ENV URL https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_VirtualDSM_42962.pat
#ENV URL https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_VirtualDSM_42962.pat
ENTRYPOINT ["/run/run.sh"]