From 36ab360d99e5ab8f31f16a8c6ae62c2e1d101eba Mon Sep 17 00:00:00 2001 From: poyaz Date: Sat, 13 Apr 2019 10:14:22 +0430 Subject: [PATCH 1/2] add options for set privilege docker.sock file --- 0.X/docker-entrypoint.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/0.X/docker-entrypoint.sh b/0.X/docker-entrypoint.sh index f9bf854..5ea5590 100755 --- a/0.X/docker-entrypoint.sh +++ b/0.X/docker-entrypoint.sh @@ -37,6 +37,21 @@ if [ -n "$CONSUL_CLIENT_INTERFACE" ]; then echo "==> Found address '$CONSUL_CLIENT_ADDRESS' for interface '$CONSUL_CLIENT_INTERFACE', setting client option..." fi +# You can set CONSUL_DOCKER_API for docker.sock file +# Default find docker.sock in /var/run/ if exist set permission +# Use -e CONSUL_DOCKER_API if want use with environment +if [ -n "$CONSUL_DOCKER_API" ] || [ -S /var/run/docker.sock ]; then + docker_group=$(getent group docker | sed 's/:.*//') + + if [ -z "$docker_group" ]; then + echo "==> Create docker group for access to docker API" + addgroup docker + fi + + chgrp docker ${CONSUL_DOCKER_API:-/var/run/docker.sock} + adduser consul docker +fi + # CONSUL_DATA_DIR is exposed as a volume for possible persistent storage. The # CONSUL_CONFIG_DIR isn't exposed as a volume but you can compose additional # config files in there if you use this image as a base, or use CONSUL_LOCAL_CONFIG From ed805ff5f50d36cfc2755ec8582fc4f9322d8436 Mon Sep 17 00:00:00 2001 From: poyaz Date: Sat, 20 Apr 2019 14:51:36 +0430 Subject: [PATCH 2/2] Remove create docker group. add permission docker.sock for consul group --- 0.X/docker-entrypoint.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/0.X/docker-entrypoint.sh b/0.X/docker-entrypoint.sh index 5ea5590..8e61a1d 100755 --- a/0.X/docker-entrypoint.sh +++ b/0.X/docker-entrypoint.sh @@ -41,15 +41,7 @@ fi # Default find docker.sock in /var/run/ if exist set permission # Use -e CONSUL_DOCKER_API if want use with environment if [ -n "$CONSUL_DOCKER_API" ] || [ -S /var/run/docker.sock ]; then - docker_group=$(getent group docker | sed 's/:.*//') - - if [ -z "$docker_group" ]; then - echo "==> Create docker group for access to docker API" - addgroup docker - fi - - chgrp docker ${CONSUL_DOCKER_API:-/var/run/docker.sock} - adduser consul docker + chgrp consul ${CONSUL_DOCKER_API:-/var/run/docker.sock} fi # CONSUL_DATA_DIR is exposed as a volume for possible persistent storage. The