From 26aa5ebc2a989134c35bc26a7acb28900ceee615 Mon Sep 17 00:00:00 2001
From: nucleogenic <nr@nucleogenic.com>
Date: Mon, 19 Sep 2022 14:20:12 +0100
Subject: [PATCH] Update Dockerfiles to allow testing of additional RaSCSI web
 UI features

---
 docker/rascsi-web/Dockerfile | 19 +++++++++++++++----
 docker/rascsi/Dockerfile     |  7 ++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/docker/rascsi-web/Dockerfile b/docker/rascsi-web/Dockerfile
index 4c4298d5..fbd8b7ac 100644
--- a/docker/rascsi-web/Dockerfile
+++ b/docker/rascsi-web/Dockerfile
@@ -6,18 +6,29 @@ FROM "${OS_ARCH}/${OS_DISTRO}:${OS_VERSION}"
 EXPOSE 80 443
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y --no-install-recommends sudo rsyslog procps
+RUN apt-get update && apt-get install -y --no-install-recommends sudo systemd rsyslog procps
 
 RUN groupadd pi
 RUN useradd --create-home --shell /bin/bash -g pi pi
 RUN echo "pi ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+RUN echo "pi:rascsi" | chpasswd 
 
-WORKDIR /home/pi
+RUN mkdir /home/pi/afpshare
+RUN touch /etc/dhcpcd.conf
+RUN mkdir -p /etc/network/interfaces.d/
+
+WORKDIR /home/pi/RASCSI
 USER pi
-COPY --chown=pi:pi . RASCSI
-RUN cd RASCSI && ./easyinstall.sh --run_choice=11 --skip-token
+COPY --chown=pi:pi . .
+
+# Standalone RaSCSI web UI
+RUN ./easyinstall.sh --run_choice=11 --skip-token
+
+# Wired network bridge
+RUN ./easyinstall.sh --run_choice=6 --headless
 
 USER root
+WORKDIR /home/pi
 RUN pip3 install watchdog
 COPY docker/rascsi-web/start.sh /usr/local/bin/start.sh
 RUN chmod +x /usr/local/bin/start.sh
diff --git a/docker/rascsi/Dockerfile b/docker/rascsi/Dockerfile
index 508bd185..4e3c60f5 100644
--- a/docker/rascsi/Dockerfile
+++ b/docker/rascsi/Dockerfile
@@ -6,15 +6,15 @@ FROM "${OS_ARCH}/${OS_DISTRO}:${OS_VERSION}"
 EXPOSE 6868
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y --no-install-recommends sudo rsyslog patch
+RUN apt-get update && apt-get install -y --no-install-recommends sudo systemd rsyslog patch
 
 RUN groupadd pi
 RUN useradd --create-home --shell /bin/bash -g pi pi
 RUN echo "pi ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
-USER pi
-COPY --chown=pi:pi . /home/pi/RASCSI
 WORKDIR /home/pi/RASCSI
+USER pi
+COPY --chown=pi:pi . .
 
 # Workaround for Bullseye amd64 compilation error
 # https://github.com/akuker/RASCSI/issues/821
@@ -24,6 +24,7 @@ RUN patch -p0 < docker/rascsi/cfilesystem.patch
 RUN ./easyinstall.sh --run_choice=10 --cores=`nproc` --skip-token
 
 USER root
+WORKDIR /home/pi
 COPY docker/rascsi/rascsi_wrapper.sh /usr/local/bin/rascsi_wrapper.sh
 RUN chmod +x /usr/local/bin/rascsi_wrapper.sh
 CMD ["/usr/local/bin/rascsi_wrapper.sh", "-L", "trace", "-r", "7", "-F", "/home/pi/images"]