Merge pull request #87 from GlennToms/master

Added ENV PORT options and EXPORT PORT

diff --git a/Dockerfile b/Dockerfile
index 205d759fe2c02e463e07455ff86d09bfa85d800d..cd3ab118cc5e32906aef57a14312b63745b7af7a 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,12 +16,15 @@ 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
 
-USER ${USER}
-
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
 
-ENTRYPOINT ["darkhttpd","/www/", "--no-listing"]
\ No newline at end of file
+USER ${USER}
+EXPOSE ${PORT}
+VOLUME [ "/www/config.yml", "/www/assets" ]
+ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 7664f6611252a472bdeae8a9224a764b66d7654e..ef01d1fb2dbf1dc3ba5a21e0c30a743990d7a0fc 100644 (file)
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -25,13 +25,16 @@ 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
 
-USER ${USER}
-
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
 
-ENTRYPOINT ["darkhttpd","/www/","--no-listing"]
+USER ${USER}
+EXPOSE ${PORT}
+VOLUME [ "/www/config.yml", "/www/assets" ]
+ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 0175341d9ed490bd6603cdf7b213fd5558608ca0..7899027743a20f9b55751457b98bf8d4c9a9742b 100644 (file)
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -25,13 +25,16 @@ 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
 
-USER ${USER}
-
 COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
+COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
 
-ENTRYPOINT ["darkhttpd","/www/","--no-listing"]
+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 (file)
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