commit cf603f518c916cc4a4a74b36b4a578445a5b9036
author garciadeblas <gerardo.garciadeblas@telefonica.com> Wed Jun 04 11:57:28 2025 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Tue Jun 17 23:45:07 2025 +0200
tree 96800a7f8bca84422faf62e35435c184d5d5f662
parent 6c7b9358d48dcf59bcbe83d34f8e4b80d6a0cc11

Feature 11071: Modular OSM installation

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

installers/install_docker_ce.sh

diff --git a/installers/install_docker_ce.sh b/installers/install_docker_ce.sh
index 16fb817..023a9f9 100755
--- a/installers/install_docker_ce.sh
+++ b/installers/install_docker_ce.sh
@@ -116,44 +116,16 @@
     return 0
 }
 
-while getopts ":D:p:-: P" o; do
-    case "${o}" in
-        D)
-            OSM_DEVOPS="${OPTARG}"
-            ;;
-        p)
-            DOCKER_PROXY_URL="${OPTARG}"
-            ;;
-        P)
-            OSM_BEHIND_PROXY="y"
-            ;;
-        -)
-            [ "${OPTARG}" == "debug" ] && DEBUG_INSTALL="y" && continue
-            echo -e "Invalid option: '--$OPTARG'\n" >&2
-            exit 1
-            ;;
-        :)
-            echo "Option -$OPTARG requires an argument" >&2
-            exit 1
-            ;;
-        \?)
-            echo -e "Invalid option: '-$OPTARG'\n" >&2
-            exit 1
-            ;;
-        *)
-            exit 1
-            ;;
-    esac
-done
-
 DEBUG_INSTALL=${DEBUG_INSTALL:-}
+OSM_DEVOPS=${OSM_DEVOPS:-"/usr/share/osm-devops"}
 DOCKER_PROXY_URL=${DOCKER_PROXY_URL:-}
 OSM_BEHIND_PROXY=${OSM_BEHIND_PROXY:-}
 echo "DEBUG_INSTALL=$DEBUG_INSTALL"
+echo "OSM_DEVOPS=$OSM_DEVOPS"
 echo "DOCKER_PROXY_URL=$DOCKER_PROXY_URL"
 echo "OSM_BEHIND_PROXY=$OSM_BEHIND_PROXY"
 echo "USER=$USER"
 
-source $OSM_DEVOPS/common/logging
+source $OSM_DEVOPS/library/logging
 
 install_docker_ce