X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=e5b135ecceb6e280910d5de1a1613c5e353fbed1;hb=refs%2Fchanges%2F15%2F11315%2F1;hp=1202e33bf5e18f983cf00820e07d3b0118ea1dc3;hpb=a14e62880d8ea31b1ada3f6f1c06f191eec971fb;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 1202e33b..e5b135ec 100755 --- 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