openstack
/
devstack-plugin-container
Code Issues Proposed changes

Make docker group configurable 

In devstack gate, jobs might be run with users other than $STACK_USER,
so the docker group should be configurable.

Change-Id: I64665b9883094d5603f3e737a1c08d924a058960
This commit is contained in:
Hongbin Lu 2017-09-21 19:57:25 +00:00
parent d29c0ad629
commit b8f4f066ba
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/docker
View File

@ -24,6 +24,7 @@ set +o xtrace
DOCKER_ENGINE_SOCKET_FILE=${DOCKER_ENGINE_SOCKET_FILE:-/var/run/docker.sock}
DOCKER_ENGINE_PORT=${DOCKER_ENGINE_PORT:-2375}
DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-}
DOCKER_GROUP=${DOCKER_GROUP:-$STACK_USER}
# Functions
@ -86,7 +87,7 @@ function configure_docker {
cat <<EOF | sudo tee $docker_config_file >/dev/null
{
$cluster_store_opts
"group": "$STACK_USER",
"group": "$DOCKER_GROUP",
"hosts": [
"unix://$DOCKER_ENGINE_SOCKET_FILE",
"tcp://0.0.0.0:$DOCKER_ENGINE_PORT"