From e7bf96f081c972bfea27b9b195fabc61fd6573bd Mon Sep 17 00:00:00 2001 From: Ruberoid Date: Mon, 21 Jul 2025 13:51:14 +0300 Subject: [PATCH] added healthchecks & changed dev dockercompose mariadb instances ports. --- CLAUDE.md | 2 +- docker-compose.yml | 31 +++++++++++++++++++++++-------- telegram-client | 2 +- telegram-listener | 2 +- text-matcher | 2 +- users | 2 +- 6 files changed, 28 insertions(+), 13 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 7db3a46..007b091 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -83,7 +83,7 @@ When running with docker-compose: - text-matcher: 5001 - users: 4998 - RabbitMQ: 5672 (AMQP), 15672 (Management UI) -- MariaDB: 3306 (text-matcher), 3307 (users) +- MariaDB: 3316 (text-matcher), 3326 (users) ## Key Technologies diff --git a/docker-compose.yml b/docker-compose.yml index 2976c7c..910e7e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,12 +12,12 @@ services: depends_on: nocr-rabbitmq: condition: service_healthy - #nocr-telegram-listener: - # condition: service_healthy - #nocr-users: - # condition: service_healthy - #nocr-text-matcher: - # condition: service_healthy + nocr-telegram-listener: + condition: service_healthy + nocr-users: + condition: service_healthy + nocr-text-matcher: + condition: service_healthy nocr-telegram-listener: container_name: nocr-telegram-listener @@ -35,6 +35,11 @@ services: depends_on: nocr-rabbitmq: condition: service_healthy + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8080/health"] + interval: 30s + timeout: 10s + retries: 3 nocr-text-matcher: container_name: nocr-text-matcher @@ -53,6 +58,11 @@ services: condition: service_healthy nocr-text-matcher-migrator: condition: service_completed_successfully + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8080/health"] + interval: 30s + timeout: 10s + retries: 3 nocr-text-matcher-migrator: build: @@ -81,6 +91,11 @@ services: condition: service_healthy nocr-users-migrator: condition: service_completed_successfully + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8080/health"] + interval: 30s + timeout: 10s + retries: 3 nocr-users-migrator: build: @@ -99,7 +114,7 @@ services: image: mariadb:latest restart: always ports: - - 3306:3306 + - 3316:3306 environment: MARIADB_ROOT_PASSWORD: toor MARIADB_DATABASE: nocr_text_matcher @@ -114,7 +129,7 @@ services: image: mariadb:latest restart: always ports: - - 3307:3306 + - 3326:3306 environment: MARIADB_ROOT_PASSWORD: toor MARIADB_DATABASE: nocr_users diff --git a/telegram-client b/telegram-client index dd7bfb1..66910ae 160000 --- a/telegram-client +++ b/telegram-client @@ -1 +1 @@ -Subproject commit dd7bfb1f87a9263a7019189f008a19249ffcba26 +Subproject commit 66910ae6fe02893120dc758035a8c545fb970392 diff --git a/telegram-listener b/telegram-listener index 4f00f64..6bf0b6e 160000 --- a/telegram-listener +++ b/telegram-listener @@ -1 +1 @@ -Subproject commit 4f00f647d82cc604189a1cdea82ab94fba8bf006 +Subproject commit 6bf0b6edcda70dbf417e764690306bfe07759fb1 diff --git a/text-matcher b/text-matcher index 56734b4..a35e616 160000 --- a/text-matcher +++ b/text-matcher @@ -1 +1 @@ -Subproject commit 56734b4f5212591e9ab436a1ccf0aa5ced1e8ed0 +Subproject commit a35e616753c4b1249efbce73131e45fd3e082cb2 diff --git a/users b/users index 751ff86..1170ebd 160000 --- a/users +++ b/users @@ -1 +1 @@ -Subproject commit 751ff86622f18f2b92f347ce2894a3b512ca0c6f +Subproject commit 1170ebdf078b340cbc9db6194d98ee9b9a7e5189