From 729bef034a9387cdcd8ba6e86caa8ecaf17a1374 Mon Sep 17 00:00:00 2001 From: SKP Date: Sun, 7 Apr 2019 13:45:36 +0200 Subject: [PATCH] Some cleanup in welcome app starting. --- dist/apps/welcome/start.sh | 11 ++++------- dist/apps/welcome/stop.sh | 12 ++++++------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dist/apps/welcome/start.sh b/dist/apps/welcome/start.sh index 058328e..76a6fad 100644 --- a/dist/apps/welcome/start.sh +++ b/dist/apps/welcome/start.sh @@ -1,16 +1,13 @@ - -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" +# 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 cn_welcome + 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 index 3edb586..a5a3b6b 100644 --- a/dist/apps/welcome/stop.sh +++ b/dist/apps/welcome/stop.sh @@ -1,12 +1,12 @@ -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" +#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 cn_welcome + docker stack rm $APP_ID elif [ "$DOCKER_MODE" = "compose" ]; then docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml down fi