commit 910f5f42a2adf33888768bf49a790f780302edb0
author garciadeblas <gerardo.garciadeblas@telefonica.com> Mon Nov 08 23:02:01 2021 +0100
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Mon Nov 08 23:02:01 2021 +0100
tree d0fdb93825c6390f47d769edf811190a2db92986
parent a14e62880d8ea31b1ada3f6f1c06f191eec971fb

Fix bug 1747 to allow installation without docker proxy

Change-Id: I900f1acf9656ca79b96dac60aad4a99c7b1576af
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

installers/full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 1202e33..e5b135e 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -657,7 +657,11 @@
 
     track prereqok
 
-    [ -n "$INSTALL_NODOCKER" ] || $OSM_DEVOPS/installers/install_docker_ce.sh -p $DOCKER_PROXY_URL -D $OSM_DEVOPS $DEBUG_INSTALL
+    if [ ! -n "$INSTALL_NODOCKER" ]; then
+        DOCKER_CE_OPTS="-D ${OSM_DEVOPS} ${DEBUG_INSTALL}"
+        [ -n "${DOCKER_PROXY_URL}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -p ${DOCKER_PROXY_URL}"
+        $OSM_DEVOPS/installers/install_docker_ce.sh ${DOCKER_CE_OPTS}
+    fi
 
     track docker_ce