Merge pull request #1573 from SkynetLabs/blocker-health-check-failing

health checks depends on blocker when it is available
This commit is contained in:
Karol Wypchło 2022-01-21 13:25:08 +01:00 committed by GitHub
commit 08c050694e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions

View File

@ -21,8 +21,8 @@ services:
- ABUSE_MAILADDRESS=${ABUSE_MAILADDRESS} - ABUSE_MAILADDRESS=${ABUSE_MAILADDRESS}
- ABUSE_MAILBOX=${ABUSE_MAILBOX} - ABUSE_MAILBOX=${ABUSE_MAILBOX}
- ABUSE_SPONSOR=${ABUSE_SPONSOR} - ABUSE_SPONSOR=${ABUSE_SPONSOR}
- BLOCKER_HOST=${BLOCKER_HOST} - BLOCKER_HOST=10.10.10.110
- BLOCKER_PORT=${BLOCKER_PORT} - BLOCKER_PORT=4000
- BLOCKER_AUTH_HEADER=${BLOCKER_AUTH_HEADER} - BLOCKER_AUTH_HEADER=${BLOCKER_AUTH_HEADER}
- EMAIL_SERVER=${EMAIL_SERVER} - EMAIL_SERVER=${EMAIL_SERVER}
- EMAIL_USERNAME=${EMAIL_USERNAME} - EMAIL_USERNAME=${EMAIL_USERNAME}

View File

@ -7,6 +7,11 @@ x-logging: &default-logging
max-file: "3" max-file: "3"
services: services:
health-check:
environment:
- BLOCKER_HOST=10.10.10.110
- BLOCKER_PORT=4000
blocker: blocker:
build: build:
context: ./docker/blocker context: ./docker/blocker

View File

@ -7,7 +7,6 @@ x-logging: &default-logging
max-file: "3" max-file: "3"
services: services:
clamav: clamav:
image: clamav/clamav:stable_base image: clamav/clamav:stable_base
container_name: clamav container_name: clamav
@ -21,7 +20,7 @@ services:
deploy: deploy:
resources: resources:
limits: limits:
cpus: '${CLAMAV_CPU:-0.50}' cpus: "${CLAMAV_CPU:-0.50}"
networks: networks:
shared: shared:
ipv4_address: 10.10.10.100 ipv4_address: 10.10.10.100
@ -40,8 +39,8 @@ services:
environment: environment:
- CLAMAV_IP=${CLAMAV_IP:-10.10.10.100} - CLAMAV_IP=${CLAMAV_IP:-10.10.10.100}
- CLAMAV_PORT=${CLAMAV_PORT:-3310} - CLAMAV_PORT=${CLAMAV_PORT:-3310}
- BLOCKER_IP=${BLOCKER_IP:-10.10.10.110} - BLOCKER_IP=10.10.10.110
- BLOCKER_PORT=${BLOCKER_PORT:-4000} - BLOCKER_PORT=4000
expose: expose:
- 4000 - 4000
networks: networks: