X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=Dockerfile.arm64v8;h=f940bde45ec263a349a4f578f1c047696a24d7d4;hb=1327cc0ab0e78d0cfc2fe11fddca8cc32dae8ac6;hp=7d772f030ca74ee6ec240cd15b277eacb3d02ab3;hpb=b6b31e440c7915e82fe8b9a4b93083ec9fb2e9fd;p=github%2Fbastienwirtz%2Fhomer.git

diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 7d772f0..f940bde 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -17,28 +17,33 @@ ARG QEMU_VERSION="v4.2.0-7"
 RUN wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-aarch64-static && chmod +x qemu-aarch64-static
 
 # production stage
-FROM arm64v8/alpine:3.11
+FROM arm64v8/alpine:3.16
 
 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
 
-COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
-COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets
-COPY entrypoint.sh /entrypoint.sh
+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=${UID}:${GID} /app/dist/assets /www/default-assets
+
+USER ${UID}:${GID}
 
 HEALTHCHECK --interval=30s --timeout=5s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:${PORT}/ || exit 1
 
 EXPOSE ${PORT}
 VOLUME /www/assets
-ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
+
+CMD ["lighttpd", "-D", "-f", "/lighttpd.conf"]