Skip to content

Commit fd9237e

Browse files
author
AgileVirus
committed
Added su-exec to ARM dockerfiles and removed USER line
1 parent 4bfcc5b commit fd9237e

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} &
2323

2424
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
2525
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist/assets /www/default-assets
26-
COPY --chown=${USER}:${GROUP} entrypoint.sh /entrypoint.sh
26+
COPY entrypoint.sh /entrypoint.sh
2727

2828
EXPOSE ${PORT}
2929
VOLUME /www/assets

Dockerfile.arm32v7

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ ENV UID 911
2828
ENV PORT 8080
2929

3030
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 && \
3232
rm /usr/bin/qemu-arm-static
3333

3434
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
3535
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
3737

38-
USER ${USER}
3938
EXPOSE ${PORT}
4039
VOLUME /www/assets
4140
ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

Dockerfile.arm64v8

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ ENV UID 911
2828
ENV PORT 8080
2929

3030
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 && \
3232
rm /usr/bin/qemu-aarch64-static
3333

3434
COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
3535
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
3737

38-
USER ${USER}
3938
EXPOSE ${PORT}
4039
VOLUME /www/assets
4140
ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ fi
1111
# Install default config if no one is available.
1212
yes n | cp -i /www/default-assets/config.yml.dist /www/assets/config.yml &> /dev/null
1313

14-
chown -R $UID:$GID /www/assets/*
15-
exec su-exec $USER:$GROUP darkhttpd /www/ --no-listing --port "$PORT"
14+
chown -R $UID:$GID /www/assets
15+
exec su-exec $UID:$GID darkhttpd /www/ --no-listing --port "$PORT"

0 commit comments

Comments
 (0)