Merge pull request #421 from bastienwirtz/docker-rework

Docker rework

1 files changed, 10 insertions, 6 deletions

diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 95a2db1..7e1d92b 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -21,23 +21,27 @@ FROM arm32v7/alpine:3.11
 
 COPY --from=qemu qemu-arm-static /usr/bin/
 
-ENV USER darkhttpd
-ENV GROUP darkhttpd
+ENV USER lighttpd
+ENV GROUP lighttpd
 ENV GID 911
 ENV UID 911
 ENV PORT 8080
+ENV SUBFOLDER "/_"
 
 RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
-    apk add -U --no-cache darkhttpd su-exec && \
+    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 --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets
-COPY entrypoint.sh /entrypoint.sh
 
+USER ${USER}
 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"]