Skip to content

Commit

Permalink
Merge "Closes-bug: #1665444 - Do not start docker registry if one is …
Browse files Browse the repository at this point in the history
…already running during the setup.sh for Server manager installation"
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Feb 18, 2017
2 parents 75f925b + b2c6045 commit d59f83f
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions build/deb_server_manager_setup.sh 100644 → 100755
Expand Up @@ -51,11 +51,19 @@ function ansible_and_docker_configs()
sed -i "/ssh_args/c\ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o UserKnownHostsFile=/dev/null" /etc/ansible/ansible.cfg

ansible-galaxy install -r /opt/contrail/server_manager/ansible/playbooks/requirements.yml
echo "Starting docker registry"
echo "Starting docker"

echo "DOCKER_OPTS=\"--insecure-registry $HOSTIP:5100\"" >> /etc/default/docker
service docker restart >> $log_file 2>&1
docker run -d -p 5100:5000 --restart=always --name registry registry:2

cur_name=`docker ps | grep registry | awk '{print $12}'`

if [ $cur_name='registry' ]; then
echo "Docker registry already running"
else
echo "Starting docker registry"
docker run -d -p 5100:5000 --restart=always --name registry registry:2
fi

#echo "Cleaning up docker images"
#docker rmi -f `docker images -a | grep -v registry | grep -v REPOSITORY | awk '{print $3}'`
Expand Down

0 comments on commit d59f83f

Please sign in to comment.