Some cleanup in welcome app starting.

This commit is contained in:
SKP
2019-04-07 13:45:36 +02:00
committed by kexkey
parent 8b334d7260
commit 729bef034a
2 changed files with 10 additions and 13 deletions

View File

@@ -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

View File

@@ -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