From 481ab9a01bdbe44ca64e5b065f2b81e41bee3ea0 Mon Sep 17 00:00:00 2001
From: Glenn Toms <Glenn@glenntoms.gg>
Date: Fri, 12 Jun 2020 17:50:07 +0100
Subject: [PATCH 1/2] Added ENV PORT options and EXPORT PORT

---
 Dockerfile         | 7 ++++++-
 Dockerfile.arm32v7 | 7 ++++++-
 Dockerfile.arm64v8 | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 205d759..73519e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,12 +16,17 @@ ENV USER darkhttpd
 ENV GROUP darkhttpd
 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 darkhttpd
 
+RUN echo "darkhttpd /www/ --no-listing --port $PORT" > /entrypoint.sh
+RUN set -ex chown ${USER}:${GROUP} /entrypoint.sh
+
 USER ${USER}
 
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
 
-ENTRYPOINT ["darkhttpd","/www/", "--no-listing"]
\ No newline at end of file
+EXPOSE ${PORT}
+ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 7664f66..952ecb7 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -25,13 +25,18 @@ ENV USER darkhttpd
 ENV GROUP darkhttpd
 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 darkhttpd && \
     rm /usr/bin/qemu-arm-static
 
+RUN echo "darkhttpd /www/ --no-listing --port $PORT" > /entrypoint.sh
+RUN set -ex chown ${USER}:${GROUP} /entrypoint.sh
+
 USER ${USER}
 
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
 
-ENTRYPOINT ["darkhttpd","/www/","--no-listing"]
+EXPOSE ${PORT}
+ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 0175341..d9c8aab 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -25,13 +25,18 @@ ENV USER darkhttpd
 ENV GROUP darkhttpd
 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 darkhttpd && \
     rm /usr/bin/qemu-aarch64-static
 
+RUN echo "darkhttpd /www/ --no-listing --port $PORT" > /entrypoint.sh
+RUN set -ex chown ${USER}:${GROUP} /entrypoint.sh
+
 USER ${USER}
 
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
 
-ENTRYPOINT ["darkhttpd","/www/","--no-listing"]
+EXPOSE ${PORT}
+ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

From 29d6b359abd243e9b4c026020bfc5d82bee88b12 Mon Sep 17 00:00:00 2001
From: Glenn Toms <Glenn@glenntoms.gg>
Date: Thu, 18 Jun 2020 15:46:33 +0100
Subject: [PATCH 2/2] Added entrypoint script and Dockerfile port&volume

---
 Dockerfile         | 8 +++-----
 Dockerfile.arm32v7 | 8 +++-----
 Dockerfile.arm64v8 | 8 +++-----
 entrypoint.sh      | 6 ++++++
 4 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index 73519e0..cd3ab11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,12 +21,10 @@ ENV PORT 8080
 RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
     apk add -U darkhttpd
 
-RUN echo "darkhttpd /www/ --no-listing --port $PORT" > /entrypoint.sh
-RUN set -ex chown ${USER}:${GROUP} /entrypoint.sh
+COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
 
 USER ${USER}
-
-COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
-
 EXPOSE ${PORT}
+VOLUME [ "/www/config.yml", "/www/assets" ]
 ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 952ecb7..ef01d1f 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -31,12 +31,10 @@ RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} &
     apk add -U darkhttpd && \
     rm /usr/bin/qemu-arm-static
 
-RUN echo "darkhttpd /www/ --no-listing --port $PORT" > /entrypoint.sh
-RUN set -ex chown ${USER}:${GROUP} /entrypoint.sh
+COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
 
 USER ${USER}
-
-COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
-
 EXPOSE ${PORT}
+VOLUME [ "/www/config.yml", "/www/assets" ]
 ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index d9c8aab..7899027 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -31,12 +31,10 @@ RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} &
     apk add -U darkhttpd && \
     rm /usr/bin/qemu-aarch64-static
 
-RUN echo "darkhttpd /www/ --no-listing --port $PORT" > /entrypoint.sh
-RUN set -ex chown ${USER}:${GROUP} /entrypoint.sh
+COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
 
 USER ${USER}
-
-COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
-
 EXPOSE ${PORT}
+VOLUME [ "/www/config.yml", "/www/assets" ]
 ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100644
index 0000000..7623322
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+yes n | cp -i /www/config.yml.dist /www/config.yml
+while true; do echo n; done | cp -Ri /app/dist/www/assets /www/assets 2>/dev/null
+
+darkhttpd /www/ --no-listing --port $PORT