From 13a2fbac1de85db334c0982c1050eb0bd3ce3bf5 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Wed, 4 Sep 2019 10:10:19 -0400
Subject: [PATCH] Replaced bitcoin_monitor container by healthcheck in bitcoin
 container

---
 .../installer/docker/docker-compose.yaml      | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml
index 3179b12..00dc6a5 100644
--- a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml
+++ b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml
@@ -2,19 +2,6 @@ version: "3"
 
 services:
 
-  bitcoin_monitor:
-    image: cyphernode/bitcoin:<%= bitcoin_version %>
-    command: 0:0 sh -c 'rm -f /bitcoin_monitor/up ; while true ; do [ "$$(bitcoin-cli echo &> /dev/null ; echo $$?)" -eq "0" ] && touch /bitcoin_monitor/up || rm -f /bitcoin_monitor/up ; sleep 10 ; done'
-    volumes:
-      - bitcoin_monitor:/bitcoin_monitor
-      - "<%= bitcoin_datapath %>/bitcoin-client.conf:/root/.bitcoin/bitcoin.conf"
-    networks:
-      - cyphernodenet
-    restart: always
-#    deploy:
-#      placement:
-#        constraints: [node.hostname==dev]
-
   <% if( bitcoin_mode === 'internal' ) { %>
   ##########################
   # BITCOIN                #
@@ -30,6 +17,12 @@ services:
     <% } %>
     volumes:
       - "<%= bitcoin_datapath %>:/.bitcoin"
+      - bitcoin_monitor:/bitcoin_monitor
+    healthcheck:
+      test: bitcoin-cli echo && touch /bitcoin_monitor/up || rm -f /bitcoin_monitor/up
+      interval: 10s
+      timeout: 5s
+      retries: 1
     networks:
       - cyphernodenet
     restart: always