From 9a2d64c74e21fdb31a481a38e9da97b56c654cab Mon Sep 17 00:00:00 2001 From: SKP Date: Sun, 7 Apr 2019 13:46:52 +0200 Subject: [PATCH] moved stop_apps to correct place --- .../app/templates/installer/stop.sh | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/install/generator-cyphernode/generators/app/templates/installer/stop.sh b/install/generator-cyphernode/generators/app/templates/installer/stop.sh index 0c7e6d1..e9bbf26 100644 --- a/install/generator-cyphernode/generators/app/templates/installer/stop.sh +++ b/install/generator-cyphernode/generators/app/templates/installer/stop.sh @@ -2,15 +2,6 @@ current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)" -<% if (docker_mode == 'swarm') { %> -export USER=$(id -u):$(id -g) -export ARCH=$(uname -m) -docker stack rm cyphernode -<% } else if(docker_mode == 'compose') { %> -export USER=$(id -u):$(id -g) -export ARCH=$(uname -m) -docker-compose -f $current_path/docker-compose.yaml down -<% } %> # be aware that randomly downloaded cyphernode apps will have access to # your configuration and filesystem. @@ -24,7 +15,7 @@ stop_apps() { local APP_START_SCRIPT_PATH local APP_ID - for i in "$current_path/apps/*" + for i in $current_path/apps/* do APP_SCRIPT_PATH=$(echo $i) if [ -d $APP_SCRIPT_PATH ]; then @@ -39,4 +30,14 @@ stop_apps() { } . ./installer/config.sh -stop_apps \ No newline at end of file +stop_apps + +<% if (docker_mode == 'swarm') { %> +export USER=$(id -u):$(id -g) +export ARCH=$(uname -m) +docker stack rm cyphernode +<% } else if(docker_mode == 'compose') { %> +export USER=$(id -u):$(id -g) +export ARCH=$(uname -m) +docker-compose -f $current_path/docker-compose.yaml down +<% } %>