From cf371980fde7d5388a8909197d696db6acfea460 Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 9 Oct 2023 02:42:20 +0200 Subject: [PATCH 1/6] build: Dockerfile --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49a09e9e..77f0e6e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,6 @@ on: - '.dockerignore' - '.github/**' - '.github/workflows/**' - - 'Dockerfile' jobs: shellcheck: From 3ec1ebe035ed1e429bef09e8c36588fb36c48758 Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 9 Oct 2023 02:50:59 +0200 Subject: [PATCH 2/6] fix: Install platform dependant packages --- Dockerfile | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 33243380..eebf3e3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,32 +9,35 @@ FROM qemux/qemu-host as builder FROM debian:bookworm-slim +ARG TARGETARCH ARG DEBCONF_NOWARNINGS="yes" ARG DEBIAN_FRONTEND noninteractive -RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ - ADD_PKG="xserver-xorg-video-intel"; fi && \ +RUN if [ "$TARGETARCH" = "arm64" ]; then \ + PKG="qemu-user"; fi && \ + if [ "$TARGETARCH" = "amd64" ]; then \ + PKG="xserver-xorg-video-intel"; fi && \ apt-get update && apt-get -y upgrade && \ apt-get --no-install-recommends -y install \ - curl \ - cpio \ - wget \ - fdisk \ - unzip \ - socat \ - procps \ - xz-utils \ - iptables \ - iproute2 \ - dnsmasq \ - net-tools \ - ca-certificates \ - netcat-openbsd \ - qemu-system-x86 \ - ${ADD_PKG} \ + curl \ + cpio \ + wget \ + fdisk \ + unzip \ + socat \ + procps \ + xz-utils \ + iptables \ + iproute2 \ + dnsmasq \ + net-tools \ + ca-certificates \ + netcat-openbsd \ + qemu-system-x86 \ + ${PKG} \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - + COPY run/*.sh /run/ COPY agent/*.sh /agent/ @@ -46,7 +49,7 @@ VOLUME /storage EXPOSE 22 EXPOSE 80 -EXPOSE 139 +EXPOSE 139 EXPOSE 445 EXPOSE 5000 From a28dc5b451e1499915bc055e42be080ece3e3aaf Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 9 Oct 2023 03:14:41 +0200 Subject: [PATCH 3/6] feat: Install GPU drivers --- run/install.sh | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/run/install.sh b/run/install.sh index 7de9c7c5..88672617 100644 --- a/run/install.sh +++ b/run/install.sh @@ -102,7 +102,7 @@ if [ -f "${RDC}" ]; then cp "$TMP/usr/lib/libc.so.6" /lib64/ cp "$TMP/usr/lib/libpthread.so.0" /lib64/ cp "$TMP/usr/lib/ld-linux-x86-64.so.2" /lib64/ - fi + fi mv /run/extract/scemd /run/extract/syno_extract_system_patch chmod +x /run/extract/syno_extract_system_patch @@ -127,16 +127,17 @@ if ((SIZE<250000000)); then error "The specified PAT file is probably an update pack as it's too small." && exit 62 fi -info "Install: Extracting downloaded image..." - if { tar tf "$PAT"; } >/dev/null 2>&1; then + info "Install: Extracting downloaded image..." tar xpf "$PAT" -C "$TMP/." else if [ "$ARCH" != "amd64" ]; then + info "Install: Installing QEMU..." + export DEBCONF_NOWARNINGS="yes" export DEBIAN_FRONTEND="noninteractive" @@ -149,6 +150,24 @@ else fi + if [[ "${GPU}" == [Yy1]* ]] && [[ "$ARCH" == "amd64" ]]; then + + info "Install: Installing GPU drivers..." + + export DEBCONF_NOWARNINGS="yes" + export DEBIAN_FRONTEND="noninteractive" + + apt-get -qq update + apt-get -qq -y upgrade + apt-get -qq --no-install-recommends -y install xserver-xorg-video-intel > /dev/null + + export DEBIAN_FRONTEND="" + export DEBCONF_NOWARNINGS="" + + fi + + info "Install: Extracting downloaded image..." + export LD_LIBRARY_PATH="/run/extract" if [ "$ARCH" == "amd64" ]; then From bb0572c60eb794bfaea44762c53b1d30325be1a3 Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 9 Oct 2023 03:21:06 +0200 Subject: [PATCH 4/6] feat: Install GPU drivers --- run/install.sh | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/run/install.sh b/run/install.sh index 88672617..e15bb2c5 100644 --- a/run/install.sh +++ b/run/install.sh @@ -134,36 +134,25 @@ if { tar tf "$PAT"; } >/dev/null 2>&1; then else + export DEBCONF_NOWARNINGS="yes" + export DEBIAN_FRONTEND="noninteractive" + if [ "$ARCH" != "amd64" ]; then info "Install: Installing QEMU..." - export DEBCONF_NOWARNINGS="yes" - export DEBIAN_FRONTEND="noninteractive" - - apt-get -qq update - apt-get -qq -y upgrade + apt-get -qq update && apt-get -qq -y upgrade apt-get -qq --no-install-recommends -y install qemu-user > /dev/null - export DEBIAN_FRONTEND="" - export DEBCONF_NOWARNINGS="" - fi if [[ "${GPU}" == [Yy1]* ]] && [[ "$ARCH" == "amd64" ]]; then - + info "Install: Installing GPU drivers..." - - export DEBCONF_NOWARNINGS="yes" - export DEBIAN_FRONTEND="noninteractive" - apt-get -qq update - apt-get -qq -y upgrade + apt-get -qq update && apt-get -qq -y upgrade apt-get -qq --no-install-recommends -y install xserver-xorg-video-intel > /dev/null - export DEBIAN_FRONTEND="" - export DEBCONF_NOWARNINGS="" - fi info "Install: Extracting downloaded image..." From 728cab692e19efc2cbc2afd0ac13c85e725a3dfd Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 9 Oct 2023 03:23:54 +0200 Subject: [PATCH 5/6] fix: Remove platform dependant packages --- Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index eebf3e3d..b98e74ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,15 +9,10 @@ FROM qemux/qemu-host as builder FROM debian:bookworm-slim -ARG TARGETARCH ARG DEBCONF_NOWARNINGS="yes" ARG DEBIAN_FRONTEND noninteractive -RUN if [ "$TARGETARCH" = "arm64" ]; then \ - PKG="qemu-user"; fi && \ - if [ "$TARGETARCH" = "amd64" ]; then \ - PKG="xserver-xorg-video-intel"; fi && \ - apt-get update && apt-get -y upgrade && \ +RUN apt-get update && apt-get -y upgrade && \ apt-get --no-install-recommends -y install \ curl \ cpio \ @@ -34,7 +29,6 @@ RUN if [ "$TARGETARCH" = "arm64" ]; then \ ca-certificates \ netcat-openbsd \ qemu-system-x86 \ - ${PKG} \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From e394dddadcaebfe6b14b0a8b65b27099ec04ce6b Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 9 Oct 2023 03:27:45 +0200 Subject: [PATCH 6/6] style: Empty line --- run/network.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/run/network.sh b/run/network.sh index 759de2ff..f3dced95 100644 --- a/run/network.sh +++ b/run/network.sh @@ -146,7 +146,6 @@ configureNAT () { ip link set dev "${VM_NET_TAP}" master dockerbridge - # Add internet connection to the VM IP=$(ip address show dev "${VM_NET_DEV}" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)