openstack/devstack
Code Issues Proposed changes

Merge "Mute false alarm when installing docker"

Browse Source
This commit is contained in:
Jenkins 2014-01-01 13:28:24 +00:00 committed by Gerrit Code Review
commit 62c0cfa5d9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/docker/install_docker.sh
View File

@ -45,7 +45,7 @@ restart_service docker
echo "Waiting for docker daemon to start..." echo "Waiting for docker daemon to start..."
DOCKER_GROUP=$(groups | cut -d' ' -f1) DOCKER_GROUP=$(groups | cut -d' ' -f1)
CONFIGURE_CMD="while ! /bin/echo -e 'GET /v1.3/version HTTP/1.0\n\n' | socat - unix-connect:$DOCKER_UNIX_SOCKET | grep -q '200 OK'; do CONFIGURE_CMD="while ! /bin/echo -e 'GET /v1.3/version HTTP/1.0\n\n' | socat - unix-connect:$DOCKER_UNIX_SOCKET 2>/dev/null | grep -q '200 OK'; do
# Set the right group on docker unix socket before retrying # Set the right group on docker unix socket before retrying
sudo chgrp $DOCKER_GROUP $DOCKER_UNIX_SOCKET sudo chgrp $DOCKER_GROUP $DOCKER_UNIX_SOCKET
sudo chmod g+rw $DOCKER_UNIX_SOCKET sudo chmod g+rw $DOCKER_UNIX_SOCKET