diff options
author | Bastien Wirtz <bastien.wirtz@gmail.com> | 2020-07-12 21:09:42 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-12 21:09:42 -0700 |
commit | 6de53c49b357df0bb77f1ea5edef20dec6cf3133 (patch) | |
tree | 8be01b854e29226938e0d62fd85e72489898d5be /Dockerfile.arm32v7 | |
parent | ab40c4e007c40f3d059ede3a912b9e180e04c274 (diff) | |
parent | fd9237eb52affce2d202ff3f21ef47a8bb3cf542 (diff) | |
download | homer-6de53c49b357df0bb77f1ea5edef20dec6cf3133.tar.gz homer-6de53c49b357df0bb77f1ea5edef20dec6cf3133.tar.zst homer-6de53c49b357df0bb77f1ea5edef20dec6cf3133.zip |
Merge pull request #108 from GlennToms/masterv20.07.2
Added su-exec to ARM dockerfiles and removed USER line
Diffstat (limited to 'Dockerfile.arm32v7')
-rw-r--r-- | Dockerfile.arm32v7 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index ba9c95d..4a22003 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 | |||
@@ -28,14 +28,13 @@ ENV UID 911 | |||
28 | ENV PORT 8080 | 28 | ENV PORT 8080 |
29 | 29 | ||
30 | RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ | 30 | RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ |
31 | apk add -U darkhttpd && \ | 31 | apk add -U darkhttpd su-exec && \ |
32 | rm /usr/bin/qemu-arm-static | 32 | rm /usr/bin/qemu-arm-static |
33 | 33 | ||
34 | COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ | 34 | COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ |
35 | COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets | 35 | COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets |
36 | COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh | 36 | COPY entrypoint.sh /entrypoint.sh |
37 | 37 | ||
38 | USER ${USER} | ||
39 | EXPOSE ${PORT} | 38 | EXPOSE ${PORT} |
40 | VOLUME /www/assets | 39 | VOLUME /www/assets |
41 | ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] | 40 | ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] |