From fd9237eb52affce2d202ff3f21ef47a8bb3cf542 Mon Sep 17 00:00:00 2001
From: AgileVirus <agilevirus@pop-os.localdomain>
Date: Thu, 9 Jul 2020 18:47:33 +0100
Subject: [PATCH] Added su-exec to ARM dockerfiles and removed USER line

---
 Dockerfile         | 2 +-
 Dockerfile.arm32v7 | 5 ++---
 Dockerfile.arm64v8 | 5 ++---
 entrypoint.sh      | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 03751124a..19d01f810 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} &
 
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets
-COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
+COPY entrypoint.sh /entrypoint.sh
 
 EXPOSE ${PORT}
 VOLUME /www/assets
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index ba9c95d1a..4a2200309 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -28,14 +28,13 @@ ENV UID 911
 ENV PORT 8080
 
 RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
-    apk add -U darkhttpd && \
+    apk add -U darkhttpd su-exec && \
     rm /usr/bin/qemu-arm-static
 
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets
-COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
+COPY entrypoint.sh /entrypoint.sh
 
-USER ${USER}
 EXPOSE ${PORT}
 VOLUME /www/assets
 ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 4e307d834..479f8a144 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -28,14 +28,13 @@ ENV UID 911
 ENV PORT 8080
 
 RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
-    apk add -U darkhttpd && \
+    apk add -U darkhttpd su-exec && \
     rm /usr/bin/qemu-aarch64-static
 
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets
-COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
+COPY entrypoint.sh /entrypoint.sh
 
-USER ${USER}
 EXPOSE ${PORT}
 VOLUME /www/assets
 ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
index dd55cdbb5..f1a8c229a 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -11,5 +11,5 @@ fi
 # Install default config if no one is available.
 yes n | cp -i /www/default-assets/config.yml.dist /www/assets/config.yml &> /dev/null
 
-chown -R $UID:$GID /www/assets/*
-exec su-exec $USER:$GROUP darkhttpd /www/ --no-listing --port "$PORT"
+chown -R $UID:$GID /www/assets
+exec su-exec $UID:$GID darkhttpd /www/ --no-listing --port "$PORT"