Added su-exec to ARM dockerfiles and removed USER line

diff --git a/Dockerfile b/Dockerfile
index 03751124aebfe2a0df8a084c1ea6681c4bbb9b33..19d01f810aab9ac58277190be5ead17ea4ed9f0e 100644 (file)
--- 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 ba9c95d1ada6db5db6dd6841a19bc97ca5186668..4a2200309626183dd98b596bea8cbe47b7ae540e 100644 (file)
--- 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 4e307d834442fb0b12630717384b71faff1e8892..479f8a14408dae80da388bc6df4adcf3747e2c58 100644 (file)
--- 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 dd55cdbb5ed05827ed389ca5a266bfd48bf651a9..f1a8c229a38159d660f157d4ac089c2c7575cbd7 100644 (file)
--- 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"