added the prod VM as an insecure reg by default and made the enable remote reg script smarter
Change-Id: Id899a02abe7fedb7dc862b05ad5bac97c595eb5c
diff --git a/ansible/roles/docker/templates/docker.cfg b/ansible/roles/docker/templates/docker.cfg
index ac03f17..63bfb56 100644
--- a/ansible/roles/docker/templates/docker.cfg
+++ b/ansible/roles/docker/templates/docker.cfg
@@ -1 +1,2 @@
-DOCKER_OPTS="$DOCKER_OPTS --insecure-registry 10.100.198.200:5000 -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --registry-mirror=http://10.100.198.200:5001"
\ No newline at end of file
+DOCKER_OPTS="$DOCKER_OPTS --insecure-registry 10.100.198.200:5000 -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --registry-mirror=http://10.100.198.200:5001"
+DOCKER_OPTS="$DOCKER_OPTS --insecure-registry 10.100.198.201:5000"
diff --git a/utils/enable-remote-docker-registry b/utils/enable-remote-docker-registry
index 1876369..9492187 100755
--- a/utils/enable-remote-docker-registry
+++ b/utils/enable-remote-docker-registry
@@ -9,15 +9,22 @@
exit 1
fi
+LINE="DOCKER_OPTS=\"\$DOCKER_OPTS --insecure-registry $1\""
+
OUT=$(tempfile)
-head -1 /etc/default/docker >> $OUT
-echo "" >> $OUT
+cat /etc/default/docker >> $OUT
+CHANGED=0
while [ $# -gt 0 ]; do
- echo "DOCKER_OPTS=\"\$DOCKER_OPTS --insecure-registry $1\"" >> $OUT
+ FOUND=$(grep "$LINE" /etc/default/docker | wc -l)
+ if [ $FOUND -eq 0 ]; then
+ echo "DOCKER_OPTS=\"\$DOCKER_OPTS --insecure-registry $1\"" >> $OUT
+ CHANGED=1
+ fi
shift
done
-sudo cp $OUT /etc/default/docker
-rm $OUT
-
-sudo service docker restart
+if [ $CHANGED -eq 1 ]; then
+ sudo cp $OUT /etc/default/docker
+ sudo service docker restart
+fi
+rm -f $OUT