Fix bug 1747 to allow installation without docker proxy

[osm/devops.git] / installers / full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 1202e33..e5b135e 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -657,7 +657,11 @@ function install_osm() {
 
     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