From 2b1cf9f406b1ce35878d5d90e3bef028245c09fe Mon Sep 17 00:00:00 2001 From: Nicolas Cantu Date: Sun, 21 Sep 2025 22:28:31 +0000 Subject: [PATCH] update submodule --- docker-compose.yml | 26 +++++++++++++++++++++++++- scripts/start-with-progress.sh | 10 +++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index dbf7593..d7468b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,8 @@ services: image: git.4nkweb.com/4nk/bitcoin:latest container_name: bitcoin-signet depends_on: - - tor + tor: + condition: service_healthy volumes: - bitcoin_data:/home/bitcoin/.bitcoin - ./conf/bitcoin/bitcoin.conf:/etc/bitcoin/bitcoin.conf:ro @@ -184,6 +185,12 @@ services: depends_on: lecoffre-back: condition: service_healthy + ihm_client: + condition: service_healthy + sdk_storage: + condition: service_healthy + sdk_signer: + condition: service_healthy user: lecoffreuser command: ["node", "server.js"] healthcheck: @@ -217,6 +224,10 @@ services: depends_on: sdk_relay: condition: service_healthy + sdk_storage: + condition: service_healthy + sdk_signer: + condition: service_healthy user: root command: ["npm", "start"] healthcheck: @@ -241,6 +252,11 @@ services: aliases: - sdk_signer user: appuser + depends_on: + sdk_relay: + condition: service_healthy + sdk_storage: + condition: service_healthy command: ["node", "/app/dist/index.js"] healthcheck: test: ["CMD", "sh", "-c", "if curl -f http://localhost:9090/ >/dev/null 2>&1; then echo 'SDK Signer ready: WebSocket server responding'; exit 0; else echo 'SDK Signer starting: WebSocket server not yet ready'; exit 1; fi"] @@ -332,6 +348,11 @@ services: btcnet: aliases: - grafana + depends_on: + loki: + condition: service_healthy + promtail: + condition: service_healthy healthcheck: test: ["CMD", "sh", "-c", "if curl -f http://localhost:3000/api/health >/dev/null 2>&1; then echo 'Grafana ready: Dashboard service responding'; exit 0; else echo 'Grafana starting: Dashboard service not yet ready'; exit 1; fi"] interval: 30s @@ -374,6 +395,9 @@ services: btcnet: aliases: - promtail + depends_on: + loki: + condition: service_healthy healthcheck: test: ["CMD", "sh", "-c", "if curl -f http://localhost:9080/ready >/dev/null 2>&1; then echo 'Promtail ready: Log collection service responding'; exit 0; else echo 'Promtail starting: Log collection service not yet ready'; exit 1; fi"] interval: 30s diff --git a/scripts/start-with-progress.sh b/scripts/start-with-progress.sh index 59116bd..15a34e1 100755 --- a/scripts/start-with-progress.sh +++ b/scripts/start-with-progress.sh @@ -165,11 +165,19 @@ main() { start_service "lecoffre-front" wait_for_service "LeCoffre Frontend" "lecoffre-front" 120 - # 10. Services de monitoring + # 10. Services de monitoring (ordre correct) start_service "loki" + wait_for_service "Loki" "loki" 120 + start_service "promtail" + wait_for_service "Promtail" "promtail" 60 + start_service "grafana" + wait_for_service "Grafana" "grafana" 120 + start_service "status-api" + wait_for_service "Status API" "status-api" 60 + start_service "watchtower" echo