From 4ae421f80aabbb4d5c30aa36971454b87db6837f Mon Sep 17 00:00:00 2001 From: kexkey Date: Wed, 1 Dec 2021 13:14:26 -0500 Subject: [PATCH] Delete _ready files before starting CN --- .../templates/installer/docker/docker-compose.yaml | 3 +-- cyphernodeconf_docker/templates/installer/start.sh | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml index 210a6c1..a7e657d 100644 --- a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml +++ b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml @@ -10,7 +10,6 @@ services: image: postgres:<%= postgres_version %> user: $USER entrypoint: sh -c 'rm -f /container_monitor/postgres_ready ; docker-entrypoint.sh -c logging_collector=true -c log_directory=/cnlogs/' - # command: -c logging_collector=true -c log_directory=/cnlogs/ environment: - "POSTGRES_USER=cyphernode" - "POSTGRES_PASSWORD=<%= postgres_password %>" @@ -25,7 +24,7 @@ services: interval: 30s timeout: 10s retries: 10 - stop_grace_period: 30s + stop_grace_period: 90s networks: - cyphernodenet <% if ( docker_mode === 'swarm' ) { %> diff --git a/cyphernodeconf_docker/templates/installer/start.sh b/cyphernodeconf_docker/templates/installer/start.sh index 30e0122..aed65c6 100644 --- a/cyphernodeconf_docker/templates/installer/start.sh +++ b/cyphernodeconf_docker/templates/installer/start.sh @@ -60,6 +60,9 @@ export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>) current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)" +# Let's make sure the container readyness files are deleted before starting the stack +docker run --rm -v cyphernode_container_monitor:/container_monitor alpine sh -c 'rm -f /container_monitor/*_ready' + <% if (docker_mode == 'swarm') { %> docker stack deploy -c $current_path/docker-compose.yaml cyphernode <% } else if(docker_mode == 'compose') { %>