diff --git a/deploy.sh b/deploy.sh index 15ea580..c7b8af7 100755 --- a/deploy.sh +++ b/deploy.sh @@ -140,9 +140,11 @@ install_additionals() { fi; fi + cp -av /tmp/$SERVICE_EXEC_REPO/scripts/additional_install.sh $DISCOVERY_DIR } git clone ssh://$GIT_REPO/$ORGANIZATION/$CORE_DNS.git /tmp/$CORE_DNS +git clone ssh://$GIT_REPO/$ORGANIZATION/$SERVICE_EXEC_REPO.git /tmp/$SERVICE_EXEC_REPO if [[ "$LOCAL_PROXY" == "YES" || "$LOCAL_PROXY" == "TRUE" ]]; then git clone ssh://$GIT_REPO/$ORGANIZATION/$LOCAL_PROXY_REPO.git /tmp/$LOCAL_PROXY_REPO @@ -157,10 +159,6 @@ if [[ "$CRON" == "YES" || "$CRON" == "TRUE" ]]; then git clone ssh://$GIT_REPO/$ORGANIZATION/$CRON_REPO.git /tmp/$CRON_REPO fi -if [[ "$DISCOVERY" == "YES" ]]; then - git clone ssh://$GIT_REPO/$ORGANIZATION/$SERVICE_EXEC_REPO.git /tmp/$SERVICE_EXEC_REPO -fi; - # INSTALL PROXY SERVICES for i in $(echo $PROXY_TYPE); do @@ -285,3 +283,4 @@ for i in $(echo $PROXY_TYPE); do fi done + diff --git a/install.sh b/install.sh index 182e757..4526dd5 100755 --- a/install.sh +++ b/install.sh @@ -338,6 +338,7 @@ if [ "$DISCOVERY_CONFIG_FILE" != "" ]; then VAR_DISCOVERY_CONFIG_DIRECTORY="--volume $DISCOVERY_CONFIG_DIR/:$DISCOVERY_CONFIG_DIR/"; fi + # Run installer tool $SUDO_CMD docker run \ @@ -468,4 +469,12 @@ fi; rm $PWD/.init_services +echo "Would you like to install additional applications? (Y/n)"; +read -r ANSWER; +if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then + $SUDO_CMD chmod a+x $DISCOVERY_DIR/additional_install.sh + $DISCOVERY_DIR/additional_install.sh +fi + +