From b6b31e440c7915e82fe8b9a4b93083ec9fb2e9fd Mon Sep 17 00:00:00 2001
From: Kirmy <mikekirmizakis@gmail.com>
Date: Thu, 9 Dec 2021 13:09:09 +0100
Subject: Replaced darkhttpd with lighttpd

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 0a43027..f24d7be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,18 +12,19 @@ RUN yarn build
 # production stage
 FROM alpine:3.15
 
-ENV USER darkhttpd
-ENV GROUP darkhttpd
+ENV USER lighttpd
+ENV GROUP lighttpd
 ENV GID 911
 ENV UID 911
 ENV PORT 8080
 
 RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
-    apk add -U --no-cache su-exec darkhttpd
+    apk add -U --no-cache lighttpd
 
 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
+COPY lighttpd.conf /lighttpd.conf
 
 HEALTHCHECK --interval=30s --timeout=5s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:${PORT}/ || exit 1
-- 
cgit v1.2.3


From cd75da69f9e57c3fe0f63c3ed6def0577d75a47c Mon Sep 17 00:00:00 2001
From: Bastien Wirtz <bastien.wirtz@gmail.com>
Date: Sun, 20 Mar 2022 21:46:36 +0100
Subject: Alias subfolder hosting

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index f24d7be..ffe50c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,15 +17,16 @@ 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 lighttpd
 
-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
 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
 HEALTHCHECK --interval=30s --timeout=5s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:${PORT}/ || exit 1
 
-- 
cgit v1.2.3


From 049f85221e945b90bf87d21afe4d306839d65740 Mon Sep 17 00:00:00 2001
From: Bastien Wirtz <bastien.wirtz@gmail.com>
Date: Sun, 10 Apr 2022 11:55:11 +0200
Subject: Simplify the container starting process to allow it to run with a
 unprivileged user

---
 Dockerfile | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index ffe50c4..0e9d51a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,24 +12,28 @@ RUN yarn build
 # production stage
 FROM alpine:3.15
 
-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
 
-COPY entrypoint.sh /entrypoint.sh
-COPY lighttpd.conf /lighttpd.conf
+WORKDIR /www
 
-COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /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
+
+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"]
-- 
cgit v1.2.3