From: beierlm <mark.beierl@canonical.com>
Date: Fri, 19 Feb 2021 14:34:57 +0000 (-0500)
Subject: Correct Docker Proxy Syntax
X-Git-Tag: branch-sol006v331-start~53
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=8ef389381688e96f1aba089e98342c94c4b4fb88;hp=845aa5264f928851618f07b6dcc1b28a41069bb6;p=osm%2Fdevops.git

Correct Docker Proxy Syntax

Updates the syntax for managing the docker proxy so we can avoid
the rate limit issue

Change-Id: I29f9da9f7b3af57dd1614ded595d463c4ef14f9e
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index f69d4c19..05bfd062 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -412,18 +412,18 @@ function install_docker_ce() {
         echo "Configuring docker proxy ..."
         if [ -f /etc/docker/daemon.json ]; then
             if grep -q registry-mirrors /etc/docker/daemon.json; then
-                sudo sed -Ei 's/("registry-mirrors".*\[)(.*)\]/\1\2, \"'"${DOCKER_PROXY_URL}"'\"\]/' /etc/docker/daemon.json
+                sudo sed -i "s|registry-mirrors.*|registry-mirrors\": [\"${DOCKER_PROXY_URL}\"] |" /etc/docker/daemon.json
             else
-                sudo sed -i 's/{/{\n  "registry-mirrors": [\"'"${DOCKER_PROXY_URL}"'\"]",/' /etc/docker/daemon.json
+                sudo sed -i "s|{|{\n  \"registry-mirrors\": [\"${DOCKER_PROXY_URL}\"],|" /etc/docker/daemon.json
             fi
         else
-            sudo cat << EOF > /etc/docker/daemon.json
+            sudo bash -c "cat << EOF > /etc/docker/daemon.json
 {
-  "registry-mirrors": ["${DOCKER_PROXY_URL}"]
+  \"registry-mirrors\": [\"${DOCKER_PROXY_URL}\"]
 }
-EOF
+EOF"
         fi
-	sudo systemctl daemon-reload
+        sudo systemctl daemon-reload
         sudo service docker restart
         echo "... restarted Docker service again"
     fi