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

Merge pull request #25 from sergey-shambir/issue_20

Browse Source 
Use another way to ensure docker socket is accessible
This commit is contained in:
will Farrell 2019-03-17 13:10:08 -06:00 committed by GitHub
commit 68fa96e2e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
docker-entrypoint
View File

@ -22,16 +22,26 @@ CRONTAB_FILE=/etc/crontabs/docker
# Ensure dir exist - in case of volume mapping
mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects
# Create docker group using correct gid from host, and add docker user to it
if ! grep -q "^docker:" /etc/group; then
DOCKER_GID=$(stat -c '%g' ${DOCKER_SOCK})
if [ "${DOCKER_GID}" != "0" ]; then
addgroup -g ${DOCKER_GID} docker
adduser docker docker
else
adduser docker root
fi
fi
ensure_docker_socket_accessible() {
if ! grep -q "^docker:" /etc/group; then
# Ensure 'docker' user has permissions for docker socket (without changing permissions)
DOCKER_GID=$(stat -c '%g' ${DOCKER_SOCK})
if [ "${DOCKER_GID}" != "0" ]; then
if ! grep -qE "^[^:]+:[^:]+:${DOCKER_GID}:" /etc/group; then
# No group with such gid exists - create group docker
addgroup -g ${DOCKER_GID} docker
adduser docker docker
else
# Group with such gid exists - add user "docker" to this group
DOCKER_GROUP_NAME=`getent group "${DOCKER_GID}" | awk -F':' '{{ print $1 }}'`
adduser docker $DOCKER_GROUP_NAME
fi
else
# Docker socket belongs to "root" group - add user "docker" to this group
adduser docker root
fi
fi
}
slugify() {
echo "$@" | iconv -t ascii | sed -r s/[~\^]+//g | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | tr A-Z a-z
@ -220,6 +230,8 @@ EOF
done
}
ensure_docker_socket_accessible
if [ "$1" = "crond" ]; then
if [ -f ${CONFIG} ]; then
build_crontab