From a5735302241133fb646a6059169cdde31d1a77a1 Mon Sep 17 00:00:00 2001 From: BHodl Date: Tue, 22 Mar 2022 23:15:49 -0400 Subject: [PATCH 1/2] docker compose stack name option --- .../templates/installer/docker/docker-compose.yaml | 3 --- cyphernodeconf_docker/templates/installer/start.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml index 57805ec..6250e32 100644 --- a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml +++ b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml @@ -1,7 +1,4 @@ version: "3" -<% if ( docker_mode !== 'swarm' ) { %> -name: cyphernode -<% } %> services: diff --git a/cyphernodeconf_docker/templates/installer/start.sh b/cyphernodeconf_docker/templates/installer/start.sh index 647cab4..d85d51c 100644 --- a/cyphernodeconf_docker/templates/installer/start.sh +++ b/cyphernodeconf_docker/templates/installer/start.sh @@ -66,7 +66,7 @@ docker run --rm -v cyphernode_container_monitor:/container_monitor alpine sh -c <% if (docker_mode == 'swarm') { %> docker stack deploy -c $current_path/docker-compose.yaml cyphernode <% } else if(docker_mode == 'compose') { %> -docker-compose -f $current_path/docker-compose.yaml up -d --remove-orphans +docker-compose -p cyphernode -f $current_path/docker-compose.yaml up -d --remove-orphans <% } %> start_apps From 516d3c785784d10c4f4173b68f922660437f8b0f Mon Sep 17 00:00:00 2001 From: BHodl Date: Wed, 23 Mar 2022 13:53:18 -0400 Subject: [PATCH 2/2] Fix docker-compose stack name --- cyphernodeconf_docker/templates/installer/start.sh | 2 +- cyphernodeconf_docker/templates/installer/stop.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cyphernodeconf_docker/templates/installer/start.sh b/cyphernodeconf_docker/templates/installer/start.sh index d85d51c..fa75c07 100644 --- a/cyphernodeconf_docker/templates/installer/start.sh +++ b/cyphernodeconf_docker/templates/installer/start.sh @@ -39,7 +39,7 @@ start_apps() { 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 + docker-compose -p $APP_ID -f $APP_SCRIPT_PATH/docker-compose.yaml up -d --remove-orphans fi fi fi diff --git a/cyphernodeconf_docker/templates/installer/stop.sh b/cyphernodeconf_docker/templates/installer/stop.sh index 6096e57..3e466d1 100644 --- a/cyphernodeconf_docker/templates/installer/stop.sh +++ b/cyphernodeconf_docker/templates/installer/stop.sh @@ -38,7 +38,7 @@ stop_apps() { 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 + docker-compose -p $APP_ID -f $APP_SCRIPT_PATH/docker-compose.yaml down fi fi @@ -54,5 +54,5 @@ export USER=$(id -u):$(id -g) <% if (docker_mode == 'swarm') { %> docker stack rm cyphernode <% } else if(docker_mode == 'compose') { %> -docker-compose -f $current_path/docker-compose.yaml down +docker-compose -p cyphernode -f $current_path/docker-compose.yaml down <% } %>