extern/homer
1
0
Fork 1
mirror of https://github.com/bastienwirtz/homer.git synced 2024-10-05 01:42:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added su-exec to ARM dockerfiles and removed USER line

Browse Source
This commit is contained in:
AgileVirus 2020-07-09 18:47:33 +01:00
parent 4bfcc5bc95
commit fd9237eb52
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/assets /www/default-assets
COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
COPY entrypoint.sh /entrypoint.sh
EXPOSE ${PORT}
VOLUME /www/assets

5
Dockerfile.arm32v7
View File

@ -28,14 +28,13 @@ ENV UID 911
ENV PORT 8080
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
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
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}
VOLUME /www/assets
ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

5
Dockerfile.arm64v8
View File

@ -28,14 +28,13 @@ ENV UID 911
ENV PORT 8080
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
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
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}
VOLUME /www/assets
ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

4
entrypoint.sh
View File

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