Skip to content

Commit 02a89f6

Browse files
committed
fix: clean up logic and only apply group if needed
1 parent b89e312 commit 02a89f6

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ FROM library/docker:stable
33
ENV HOME_DIR=/opt/crontab
44
RUN apk add --no-cache --virtual .run-deps bash jq \
55
&& mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects \
6-
&& adduser -S docker -D \
7-
&& sed -i "s/999/99/" /etc/group
6+
&& adduser -S docker -D
87

98
COPY docker-entrypoint /
109
ENTRYPOINT ["/docker-entrypoint"]

docker-entrypoint

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects
2525
# Create docker group using correct gid from host, and add docker user to it
2626
if ! grep -q "^docker:" /etc/group; then
2727
DOCKER_GID=$(stat -c '%g' ${DOCKER_SOCK})
28-
addgroup -g ${DOCKER_GID} docker
29-
adduser docker docker
28+
if [ "${DOCKER_GID}" != "0" ]; then
29+
addgroup -g ${DOCKER_GID} docker
30+
adduser docker docker
31+
else
32+
adduser docker root
33+
fi
3034
fi
3135

3236
slugify() {

0 commit comments

Comments
 (0)