From 910f5f42a2adf33888768bf49a790f780302edb0 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 8 Nov 2021 23:02:01 +0100 Subject: [PATCH] Fix bug 1747 to allow installation without docker proxy Change-Id: I900f1acf9656ca79b96dac60aad4a99c7b1576af Signed-off-by: garciadeblas --- installers/full_install_osm.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- 2.25.1