holm/homer
1
0
Fork 0
forked from extern/homer
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108 from GlennToms/master

Browse Source 
Added su-exec to ARM dockerfiles and removed USER line
This commit is contained in:
Bastien Wirtz 2020-07-12 21:09:42 -07:00 committed by GitHub
commit 6de53c49b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -23,7 +23,7 @@ RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} &
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets
COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh
EXPOSE ${PORT} EXPOSE ${PORT}
VOLUME /www/assets VOLUME /www/assets

5
Dockerfile.arm32v7
View File

@ -28,14 +28,13 @@ ENV UID 911
ENV PORT 8080 ENV PORT 8080
RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
apk add -U darkhttpd && \ apk add -U darkhttpd su-exec && \
rm /usr/bin/qemu-arm-static rm /usr/bin/qemu-arm-static
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets
COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh
USER ${USER}
EXPOSE ${PORT} EXPOSE ${PORT}
VOLUME /www/assets VOLUME /www/assets
ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

5
Dockerfile.arm64v8
View File

@ -28,14 +28,13 @@ ENV UID 911
ENV PORT 8080 ENV PORT 8080
RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \ RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
apk add -U darkhttpd && \ apk add -U darkhttpd su-exec && \
rm /usr/bin/qemu-aarch64-static rm /usr/bin/qemu-aarch64-static
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/ COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets
COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh
USER ${USER}
EXPOSE ${PORT} EXPOSE ${PORT}
VOLUME /www/assets VOLUME /www/assets
ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

4
entrypoint.sh
View File

@ -11,5 +11,5 @@ fi
# Install default config if no one is available. # Install default config if no one is available.
yes n | cp -i /www/default-assets/config.yml.dist /www/assets/config.yml &> /dev/null yes n | cp -i /www/default-assets/config.yml.dist /www/assets/config.yml &> /dev/null
chown -R $UID:$GID /www/assets/* chown -R $UID:$GID /www/assets
exec su-exec $USER:$GROUP darkhttpd /www/ --no-listing --port "$PORT" exec su-exec $UID:$GID darkhttpd /www/ --no-listing --port "$PORT"