From a6a416077e5f05a9adc8ebb6eadc6a5396617498 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 20 Jan 2022 12:57:23 +0100 Subject: [PATCH] health checks depends on blocker when it is available --- docker-compose.abuse.yml | 4 ++-- docker-compose.blocker.yml | 5 +++++ docker-compose.malware-scanner.yml | 7 +++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml index 21adfb9b..b7d0d022 100644 --- a/docker-compose.abuse.yml +++ b/docker-compose.abuse.yml @@ -21,8 +21,8 @@ services: - ABUSE_MAILADDRESS=${ABUSE_MAILADDRESS} - ABUSE_MAILBOX=${ABUSE_MAILBOX} - ABUSE_SPONSOR=${ABUSE_SPONSOR} - - BLOCKER_HOST=${BLOCKER_HOST} - - BLOCKER_PORT=${BLOCKER_PORT} + - BLOCKER_HOST=10.10.10.110 + - BLOCKER_PORT=4000 - BLOCKER_AUTH_HEADER=${BLOCKER_AUTH_HEADER} - EMAIL_SERVER=${EMAIL_SERVER} - EMAIL_USERNAME=${EMAIL_USERNAME} diff --git a/docker-compose.blocker.yml b/docker-compose.blocker.yml index 925c1828..845bdc6a 100644 --- a/docker-compose.blocker.yml +++ b/docker-compose.blocker.yml @@ -7,6 +7,11 @@ x-logging: &default-logging max-file: "3" services: + health-check: + environment: + - BLOCKER_HOST=10.10.10.110 + - BLOCKER_PORT=4000 + blocker: build: context: ./docker/blocker diff --git a/docker-compose.malware-scanner.yml b/docker-compose.malware-scanner.yml index 0931f70a..946e8c5c 100644 --- a/docker-compose.malware-scanner.yml +++ b/docker-compose.malware-scanner.yml @@ -7,7 +7,6 @@ x-logging: &default-logging max-file: "3" services: - clamav: image: clamav/clamav:stable_base container_name: clamav @@ -21,7 +20,7 @@ services: deploy: resources: limits: - cpus: '${CLAMAV_CPU:-0.50}' + cpus: "${CLAMAV_CPU:-0.50}" networks: shared: ipv4_address: 10.10.10.100 @@ -40,8 +39,8 @@ services: environment: - CLAMAV_IP=${CLAMAV_IP:-10.10.10.100} - CLAMAV_PORT=${CLAMAV_PORT:-3310} - - BLOCKER_IP=${BLOCKER_IP:-10.10.10.110} - - BLOCKER_PORT=${BLOCKER_PORT:-4000} + - BLOCKER_IP=10.10.10.110 + - BLOCKER_PORT=4000 expose: - 4000 networks: