From: Glenn Toms <Glenn@glenntoms.gg>
Date: Thu, 18 Jun 2020 14:46:33 +0000 (+0100)
Subject: Added entrypoint script and Dockerfile port&volume
X-Git-Tag: 140991098^2
X-Git-Url: https://git.immae.eu/?p=github%2Fbastienwirtz%2Fhomer.git;a=commitdiff_plain;h=29d6b359abd243e9b4c026020bfc5d82bee88b12

Added entrypoint script and Dockerfile port&volume
---

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
-
-USER ${USER}
-
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
 
+USER ${USER}
 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
-
-USER ${USER}
-
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
 
+USER ${USER}
 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
-
-USER ${USER}
-
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
 
+USER ${USER}
 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