Added generic start/stop for apps with only a docker-compose.yaml. Added "ignoreThisApp" file option for disabling an app

This commit is contained in:
SKP
2019-04-09 17:57:09 +02:00
committed by kexkey
parent a361fb2021
commit 347baa4cb9
6 changed files with 40 additions and 56 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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