aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBastien Wirtz <bastien.wirtz@gmail.com>2020-06-19 08:01:44 -0700
committerGitHub <noreply@github.com>2020-06-19 08:01:44 -0700
commit638dee77047993a56953285a5a85685a0e101c79 (patch)
tree908edca2f073eb3f486d02272c90176a6d41cd07
parentaac817970ce37f5991ae94c5c58ea2e1695420e2 (diff)
parent29d6b359abd243e9b4c026020bfc5d82bee88b12 (diff)
downloadhomer-140991098.tar.gz
homer-140991098.tar.zst
homer-140991098.zip
Merge pull request #87 from GlennToms/master140991098
Added ENV PORT options and EXPORT PORT
-rw-r--r--Dockerfile9
-rw-r--r--Dockerfile.arm32v79
-rw-r--r--Dockerfile.arm64v89
-rw-r--r--entrypoint.sh6
4 files changed, 24 insertions, 9 deletions
diff --git a/Dockerfile b/Dockerfile
index 205d759..cd3ab11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,12 +16,15 @@ ENV USER darkhttpd
16ENV GROUP darkhttpd 16ENV GROUP darkhttpd
17ENV GID 911 17ENV GID 911
18ENV UID 911 18ENV UID 911
19ENV PORT 8080
19 20
20RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ 21RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
21 apk add -U darkhttpd 22 apk add -U darkhttpd
22 23
23USER ${USER}
24
25COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ 24COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
25COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
26 26
27ENTRYPOINT ["darkhttpd","/www/", "--no-listing"] \ No newline at end of file 27USER ${USER}
28EXPOSE ${PORT}
29VOLUME [ "/www/config.yml", "/www/assets" ]
30ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 7664f66..ef01d1f 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -25,13 +25,16 @@ ENV USER darkhttpd
25ENV GROUP darkhttpd 25ENV GROUP darkhttpd
26ENV GID 911 26ENV GID 911
27ENV UID 911 27ENV UID 911
28ENV PORT 8080
28 29
29RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ 30RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
30 apk add -U darkhttpd && \ 31 apk add -U darkhttpd && \
31 rm /usr/bin/qemu-arm-static 32 rm /usr/bin/qemu-arm-static
32 33
33USER ${USER}
34
35COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ 34COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
35COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
36 36
37ENTRYPOINT ["darkhttpd","/www/","--no-listing"] 37USER ${USER}
38EXPOSE ${PORT}
39VOLUME [ "/www/config.yml", "/www/assets" ]
40ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 0175341..7899027 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -25,13 +25,16 @@ ENV USER darkhttpd
25ENV GROUP darkhttpd 25ENV GROUP darkhttpd
26ENV GID 911 26ENV GID 911
27ENV UID 911 27ENV UID 911
28ENV PORT 8080
28 29
29RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ 30RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
30 apk add -U darkhttpd && \ 31 apk add -U darkhttpd && \
31 rm /usr/bin/qemu-aarch64-static 32 rm /usr/bin/qemu-aarch64-static
32 33
33USER ${USER}
34
35COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ 34COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
35COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
36 36
37ENTRYPOINT ["darkhttpd","/www/","--no-listing"] 37USER ${USER}
38EXPOSE ${PORT}
39VOLUME [ "/www/config.yml", "/www/assets" ]
40ENTRYPOINT ["/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 @@
1#!/bin/sh
2
3yes n | cp -i /www/config.yml.dist /www/config.yml
4while true; do echo n; done | cp -Ri /app/dist/www/assets /www/assets 2>/dev/null
5
6darkhttpd /www/ --no-listing --port $PORT