From a81cbb3e721603f1912fe0426dca99706a283f97 Mon Sep 17 00:00:00 2001 From: kexkey Date: Wed, 1 Dec 2021 11:40:17 -0500 Subject: [PATCH] Better postgres and proxy readyness check by deleting _ready file first --- .../templates/installer/docker/docker-compose.yaml | 3 ++- proxy_docker/app/script/startproxy.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml index 752a97e..210a6c1 100644 --- a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml +++ b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml @@ -9,7 +9,8 @@ services: postgres: image: postgres:<%= postgres_version %> user: $USER - command: -c logging_collector=true -c log_directory=/cnlogs/ + 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 %>" diff --git a/proxy_docker/app/script/startproxy.sh b/proxy_docker/app/script/startproxy.sh index 3d2f995..6d25b87 100644 --- a/proxy_docker/app/script/startproxy.sh +++ b/proxy_docker/app/script/startproxy.sh @@ -66,6 +66,8 @@ if [ "${returncode}" -ne "0" ]; then exit ${returncode} fi +rm -f /container_monitor/proxy_ready + chmod 0600 $DB_FILE createCurlConfig ${WATCHER_BTC_NODE_RPC_CFG} ${WATCHER_BTC_NODE_RPC_USER}