diff options
author | Glenn Toms <Glenn@glenntoms.gg> | 2020-06-18 15:46:33 +0100 |
---|---|---|
committer | Glenn Toms <Glenn@glenntoms.gg> | 2020-06-18 15:46:33 +0100 |
commit | 29d6b359abd243e9b4c026020bfc5d82bee88b12 (patch) | |
tree | 908edca2f073eb3f486d02272c90176a6d41cd07 | |
parent | 5f71d1ea01c54a79fb8f459f8acbe92b0ea99c61 (diff) | |
download | homer-29d6b359abd243e9b4c026020bfc5d82bee88b12.tar.gz homer-29d6b359abd243e9b4c026020bfc5d82bee88b12.tar.zst homer-29d6b359abd243e9b4c026020bfc5d82bee88b12.zip |
Added entrypoint script and Dockerfile port&volume
-rw-r--r-- | Dockerfile | 8 | ||||
-rw-r--r-- | Dockerfile.arm32v7 | 8 | ||||
-rw-r--r-- | Dockerfile.arm64v8 | 8 | ||||
-rw-r--r-- | entrypoint.sh | 6 |
4 files changed, 15 insertions, 15 deletions
@@ -21,12 +21,10 @@ ENV PORT 8080 | |||
21 | RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ | 21 | RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ |
22 | apk add -U darkhttpd | 22 | apk add -U darkhttpd |
23 | 23 | ||
24 | RUN echo "darkhttpd /www/ --no-listing --port $PORT" > /entrypoint.sh | ||
25 | RUN set -ex chown ${USER}:${GROUP} /entrypoint.sh | ||
26 | |||
27 | USER ${USER} | ||
28 | |||
29 | COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ | 24 | COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ |
25 | COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh | ||
30 | 26 | ||
27 | USER ${USER} | ||
31 | EXPOSE ${PORT} | 28 | EXPOSE ${PORT} |
29 | VOLUME [ "/www/config.yml", "/www/assets" ] | ||
32 | ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] | 30 | 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} & | |||
31 | apk add -U darkhttpd && \ | 31 | apk add -U darkhttpd && \ |
32 | rm /usr/bin/qemu-arm-static | 32 | rm /usr/bin/qemu-arm-static |
33 | 33 | ||
34 | RUN echo "darkhttpd /www/ --no-listing --port $PORT" > /entrypoint.sh | ||
35 | RUN set -ex chown ${USER}:${GROUP} /entrypoint.sh | ||
36 | |||
37 | USER ${USER} | ||
38 | |||
39 | COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ | 34 | COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ |
35 | COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh | ||
40 | 36 | ||
37 | USER ${USER} | ||
41 | EXPOSE ${PORT} | 38 | EXPOSE ${PORT} |
39 | VOLUME [ "/www/config.yml", "/www/assets" ] | ||
42 | ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] | 40 | 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} & | |||
31 | apk add -U darkhttpd && \ | 31 | apk add -U darkhttpd && \ |
32 | rm /usr/bin/qemu-aarch64-static | 32 | rm /usr/bin/qemu-aarch64-static |
33 | 33 | ||
34 | RUN echo "darkhttpd /www/ --no-listing --port $PORT" > /entrypoint.sh | ||
35 | RUN set -ex chown ${USER}:${GROUP} /entrypoint.sh | ||
36 | |||
37 | USER ${USER} | ||
38 | |||
39 | COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ | 34 | COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ |
35 | COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh | ||
40 | 36 | ||
37 | USER ${USER} | ||
41 | EXPOSE ${PORT} | 38 | EXPOSE ${PORT} |
39 | VOLUME [ "/www/config.yml", "/www/assets" ] | ||
42 | ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] | 40 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | yes n | cp -i /www/config.yml.dist /www/config.yml | ||
4 | while true; do echo n; done | cp -Ri /app/dist/www/assets /www/assets 2>/dev/null | ||
5 | |||
6 | darkhttpd /www/ --no-listing --port $PORT | ||