Snck3rs/docker-crontab
Snck3rs/docker-crontab
1
0
Fork 0
mirror of https://github.com/willfarrell/docker-crontab.git synced 2025-04-12 01:10:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: clean up logic and only apply group if needed

Browse Source
This commit is contained in:
will Farrell 2018-06-30 15:23:27 -06:00
parent b89e312569
commit 02a89f6dac
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -3,8 +3,7 @@ FROM library/docker:stable
ENV HOME_DIR=/opt/crontab ENV HOME_DIR=/opt/crontab
RUN apk add --no-cache --virtual .run-deps bash jq \ RUN apk add --no-cache --virtual .run-deps bash jq \
&& mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects \ && mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects \
&& adduser -S docker -D \ && adduser -S docker -D
&& sed -i "s/999/99/" /etc/group
COPY docker-entrypoint / COPY docker-entrypoint /
ENTRYPOINT ["/docker-entrypoint"] ENTRYPOINT ["/docker-entrypoint"]

8
docker-entrypoint
View File

@ -25,8 +25,12 @@ mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects
# Create docker group using correct gid from host, and add docker user to it # Create docker group using correct gid from host, and add docker user to it
if ! grep -q "^docker:" /etc/group; then if ! grep -q "^docker:" /etc/group; then
DOCKER_GID=$(stat -c '%g' ${DOCKER_SOCK}) DOCKER_GID=$(stat -c '%g' ${DOCKER_SOCK})
addgroup -g ${DOCKER_GID} docker if [ "${DOCKER_GID}" != "0" ]; then
adduser docker docker addgroup -g ${DOCKER_GID} docker
adduser docker docker
else
adduser docker root
fi
fi fi
slugify() { slugify() {