From cab7bfd15e55b1cde48c9cd4f84032e1b9cc8ec9 Mon Sep 17 00:00:00 2001
From: Bastien Wirtz <bastien.wirtz@gmail.com>
Date: Sat, 30 Apr 2022 15:58:04 +0200
Subject: [PATCH] Apply lastest update to arm dockerfile

---
 Dockerfile         |  2 +-
 Dockerfile.arm32v7 | 16 +++++++++-------
 Dockerfile.arm64v8 | 16 +++++++++-------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0e9d51a..4d0c4e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ WORKDIR /www
 COPY lighttpd.conf /lighttpd.conf
 COPY entrypoint.sh /entrypoint.sh
 COPY --from=build-stage --chown=${UID}:${GID} /app/dist /www/
-COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets
+COPY --from=build-stage --chown=${UID}:${GID} /app/dist/assets /www/default-assets
 
 USER ${UID}:${GID}
 
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 7e1d92b..59a2639 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -21,23 +21,25 @@ FROM arm32v7/alpine:3.11
 
 COPY --from=qemu qemu-arm-static /usr/bin/
 
-ENV USER lighttpd
-ENV GROUP lighttpd
-ENV GID 911
-ENV UID 911
+ENV GID 1000
+ENV UID 1000
 ENV PORT 8080
 ENV SUBFOLDER "/_"
+ENV INIT_ASSETS 1
 
-RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
+RUN addgroup -S lighttpd -g ${GID} && adduser -D -S -u ${UID} lighttpd lighttpd && \
     apk add -U --no-cache lighttpd && \
     rm /usr/bin/qemu-arm-static
 
 WORKDIR /www
 
 COPY lighttpd.conf /lighttpd.conf
-COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY entrypoint.sh /entrypoint.sh
+COPY --from=build-stage --chown=${UID}:${GID} /app/dist /www/
+COPY --from=build-stage --chown=${UID}:${GID} /app/dist/assets /www/default-assets
+
+USER ${UID}:${GID}
 
-USER ${USER}
 HEALTHCHECK --interval=30s --timeout=5s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:${PORT}/ || exit 1
 
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 573a2e4..d948db7 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -21,23 +21,25 @@ FROM arm64v8/alpine:3.11
 
 COPY --from=qemu qemu-aarch64-static /usr/bin/
 
-ENV USER lighttpd
-ENV GROUP lighttpd
-ENV GID 911
-ENV UID 911
+ENV GID 1000
+ENV UID 1000
 ENV PORT 8080
 ENV SUBFOLDER "/_"
+ENV INIT_ASSETS 1
 
-RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
+RUN addgroup -S lighttpd -g ${GID} && adduser -D -S -u ${UID} lighttpd lighttpd && \
     apk add -U --no-cache lighttpd && \
     rm /usr/bin/qemu-aarch64-static
 
 WORKDIR /www
 
 COPY lighttpd.conf /lighttpd.conf
-COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY entrypoint.sh /entrypoint.sh
+COPY --from=build-stage --chown=${UID}:${GID} /app/dist /www/
+COPY --from=build-stage --chown=${UID}:${GID} /app/dist/assets /www/default-assets
+
+USER ${UID}:${GID}
 
-USER ${USER}
 HEALTHCHECK --interval=30s --timeout=5s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:${PORT}/ || exit 1
 
-- 
2.41.0