From d4a60b3ece47dddbe8733fb1a9b789e342c1c239 Mon Sep 17 00:00:00 2001 From: rare-magma Date: Thu, 18 Jul 2024 21:22:12 +0200 Subject: [PATCH] ci: add user and mount dir under home, delete redundant entrypoint Signed-off-by: rare-magma --- support/build.Dockerfile | 9 +++++---- support/entrypoint.sh | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) delete mode 100755 support/entrypoint.sh diff --git a/support/build.Dockerfile b/support/build.Dockerfile index 801c9bc..4f3b04d 100644 --- a/support/build.Dockerfile +++ b/support/build.Dockerfile @@ -5,9 +5,10 @@ RUN make FROM docker.io/library/alpine:3.20 ENV UID="1000" GID="1000" HOST="0.0.0.0" PORT="8001" PREFIX="/" FOLLOW_SYMLINKS="false" SKIP_HIDDEN_FILES="true" DATADIR="/shared" READONLY="false" VERB="false" -RUN apk add --no-cache su-exec -COPY ./support/entrypoint.sh /entrypoint.sh +RUN addgroup -g ${GID} user \ + && adduser -D -u ${UID} -G user user COPY --from=builder /gossaSrc/gossa /gossa -USER nobody -ENTRYPOINT "/entrypoint.sh" +USER ${UID}:${GID} +WORKDIR /home/user/${DATADIR} +ENTRYPOINT /gossa -h ${HOST} -p ${PORT} -k=${SKIP_HIDDEN_FILES} -ro=${READONLY} --symlinks=${FOLLOW_SYMLINKS} --prefix=${PREFIX} --verb=${VERB} ${DATADIR} HEALTHCHECK --timeout=5s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider 127.0.0.1:8001 || exit 1 \ No newline at end of file diff --git a/support/entrypoint.sh b/support/entrypoint.sh deleted file mode 100755 index 7a84624..0000000 --- a/support/entrypoint.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec su-exec ${UID}:${GID} /gossa -h ${HOST} -p ${PORT} -k=${SKIP_HIDDEN_FILES} -ro=${READONLY} --symlinks=${FOLLOW_SYMLINKS} --prefix=${PREFIX} --verb=${VERB} ${DATADIR}