From 347baa4cb9570157cb0621a3f2f94f4343d01bb7 Mon Sep 17 00:00:00 2001 From: SKP Date: Tue, 9 Apr 2019 17:57:09 +0200 Subject: [PATCH] Added generic start/stop for apps with only a docker-compose.yaml. Added "ignoreThisApp" file option for disabling an app --- dist/apps/sparkwallet/start.sh | 10 ------- dist/apps/sparkwallet/stop.sh | 10 ------- dist/apps/welcome/start.sh | 13 --------- dist/apps/welcome/stop.sh | 12 -------- .../app/templates/installer/start.sh | 28 ++++++++++++++----- .../app/templates/installer/stop.sh | 23 ++++++++++++--- 6 files changed, 40 insertions(+), 56 deletions(-) delete mode 100644 dist/apps/sparkwallet/start.sh delete mode 100644 dist/apps/sparkwallet/stop.sh delete mode 100644 dist/apps/welcome/start.sh delete mode 100644 dist/apps/welcome/stop.sh diff --git a/dist/apps/sparkwallet/start.sh b/dist/apps/sparkwallet/start.sh deleted file mode 100644 index ab2bc70..0000000 --- a/dist/apps/sparkwallet/start.sh +++ /dev/null @@ -1,10 +0,0 @@ -export SHARED_HTPASSWD_PATH -export GATEKEEPER_DATAPATH -export LIGHTNING_DATAPATH -export APP_SCRIPT_PATH - -if [ "$DOCKER_MODE" = "swarm" ]; then - docker stack deploy -c $APP_SCRIPT_PATH/docker-compose.yaml $APP_ID -elif [ "$DOCKER_MODE" = "compose" ]; then - docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml up -d --remove-orphans -fi diff --git a/dist/apps/sparkwallet/stop.sh b/dist/apps/sparkwallet/stop.sh deleted file mode 100644 index 378ff39..0000000 --- a/dist/apps/sparkwallet/stop.sh +++ /dev/null @@ -1,10 +0,0 @@ -export SHARED_HTPASSWD_PATH -export GATEKEEPER_DATAPATH -export LIGHTNING_DATAPATH -export APP_SCRIPT_PATH - -if [ "$DOCKER_MODE" = "swarm" ]; then - docker stack rm $APP_ID -elif [ "$DOCKER_MODE" = "compose" ]; then - docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml down -fi diff --git a/dist/apps/welcome/start.sh b/dist/apps/welcome/start.sh deleted file mode 100644 index 76a6fad..0000000 --- a/dist/apps/welcome/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -# APP_SCRIPT_PATH -# APP_START_SCRIPT_PATH -# APP_ID - -export SHARED_HTPASSWD_PATH -export GATEKEEPER_DATAPATH -export APP_SCRIPT_PATH - -if [ "$DOCKER_MODE" = "swarm" ]; then - docker stack deploy -c $APP_SCRIPT_PATH/docker-compose.yaml $APP_ID -elif [ "$DOCKER_MODE" = "compose" ]; then - docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml up -d --remove-orphans -fi diff --git a/dist/apps/welcome/stop.sh b/dist/apps/welcome/stop.sh deleted file mode 100644 index a5a3b6b..0000000 --- a/dist/apps/welcome/stop.sh +++ /dev/null @@ -1,12 +0,0 @@ - -#echo "SCRIPT_NAME: $SCRIPT_NAME" -#echo "SHARED_HTPASSWD_PATH: $SHARED_HTPASSWD_PATH" -#echo "APP_SCRIPT_PATH: $APP_SCRIPT_PATH" -#echo "APP_START_SCRIPT_PATH: $APP_START_SCRIPT_PATH" -#echo "GATEKEEPER_DATAPATH: $GATEKEEPER_DATAPATH" - -if [ "$DOCKER_MODE" = "swarm" ]; then - docker stack rm $APP_ID -elif [ "$DOCKER_MODE" = "compose" ]; then - docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml down -fi diff --git a/install/generator-cyphernode/generators/app/templates/installer/start.sh b/install/generator-cyphernode/generators/app/templates/installer/start.sh index 55b60b6..5ac9c51 100644 --- a/install/generator-cyphernode/generators/app/templates/installer/start.sh +++ b/install/generator-cyphernode/generators/app/templates/installer/start.sh @@ -17,12 +17,26 @@ start_apps() { for i in $current_path/apps/* do APP_SCRIPT_PATH=$(echo $i) - if [ -d $APP_SCRIPT_PATH ]; then + if [ -d "$APP_SCRIPT_PATH" ] && [ ! -f "$APP_SCRIPT_PATH/ignoreThisApp" ]; then APP_START_SCRIPT_PATH="$APP_SCRIPT_PATH/$SCRIPT_NAME" - if [ -f $APP_START_SCRIPT_PATH ]; then + if [ -f "$APP_START_SCRIPT_PATH" ]; then APP_ID=$(basename $APP_SCRIPT_PATH) . $APP_START_SCRIPT_PATH + elif [ -f "$APP_SCRIPT_PATH/docker-compose.yaml" ]; then + export SHARED_HTPASSWD_PATH + export GATEKEEPER_DATAPATH + export LIGHTNING_DATAPATH + export BITCOIN_DATAPATH + export APP_SCRIPT_PATH + export APP_ID + export DOCKER_MODE + + if [ "$DOCKER_MODE" = "swarm" ]; then + docker stack deploy -c $APP_SCRIPT_PATH/docker-compose.yaml $APP_ID + elif [ "$DOCKER_MODE" = "compose" ]; then + docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml up -d --remove-orphans + fi fi fi done @@ -38,13 +52,13 @@ test_apps() { for i in $current_path/apps/* do APP_SCRIPT_PATH=$(echo $i) - if [ -d $APP_SCRIPT_PATH ]; then - APP_START_SCRIPT_PATH="$APP_SCRIPT_PATH/$SCRIPT_NAME" + if [ -d "$APP_SCRIPT_PATH" ]; then + APP_TEST_SCRIPT_PATH="$APP_SCRIPT_PATH/$SCRIPT_NAME" - if [ -f $APP_START_SCRIPT_PATH ]; then - APP_ID=$(basename $APP_SCRIPT_PATH) + if [ -f "$APP_TEST_SCRIPT_PATH" ] && [ ! -f "$APP_SCRIPT_PATH/ignoreThisApp" ]; then + APP_ID=$(basename "$APP_SCRIPT_PATH") printf "\r\n\e[1;36mTesting $APP_ID... \e[1;0m" - . $APP_START_SCRIPT_PATH + . $APP_TEST_SCRIPT_PATH local rc=$? if [ ""$rc -eq "0" ]; then diff --git a/install/generator-cyphernode/generators/app/templates/installer/stop.sh b/install/generator-cyphernode/generators/app/templates/installer/stop.sh index e9bbf26..247f7b7 100644 --- a/install/generator-cyphernode/generators/app/templates/installer/stop.sh +++ b/install/generator-cyphernode/generators/app/templates/installer/stop.sh @@ -18,12 +18,27 @@ stop_apps() { for i in $current_path/apps/* do APP_SCRIPT_PATH=$(echo $i) - if [ -d $APP_SCRIPT_PATH ]; then - APP_START_SCRIPT_PATH="$APP_SCRIPT_PATH/$SCRIPT_NAME" + if [ -d "$APP_SCRIPT_PATH" ] && [ ! -f "$APP_SCRIPT_PATH/ignoreThisApp" ]; then + APP_STOP_SCRIPT_PATH="$APP_SCRIPT_PATH/$SCRIPT_NAME" - if [ -f $APP_START_SCRIPT_PATH ]; then + if [ -f "$APP_STOP_SCRIPT_PATH" ]; then APP_ID=$(basename $APP_SCRIPT_PATH) - . $APP_START_SCRIPT_PATH + . $APP_STOP_SCRIPT_PATH + elif [ -f "$APP_SCRIPT_PATH/docker-compose.yaml" ]; then + export SHARED_HTPASSWD_PATH + export GATEKEEPER_DATAPATH + export LIGHTNING_DATAPATH + export BITCOIN_DATAPATH + export APP_SCRIPT_PATH + export APP_ID + export DOCKER_MODE + + if [ "$DOCKER_MODE" = "swarm" ]; then + docker stack rm $APP_ID + elif [ "$DOCKER_MODE" = "compose" ]; then + docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml down + fi + fi fi done