diff --git a/docker-compose.yml b/docker-compose.yml index 8344a5a..590ec27 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -228,12 +228,17 @@ services: - /etc/localtime:/etc/localtime:ro environment: - ENABLE_SPAMASSASSIN=1 + - ENABLE_SPAMASSASSIN_KAM=1 + - SPAMASSASIN_SPAM_TO_INBOX=1 + - MOVE_SPAM_TO_JUNK=1 + - SA_SPAM_SUBJECT=1 - ENABLE_CLAMAV=1 - ENABLE_FAIL2BAN=1 - ENABLE_POSTGREY=0 - SPOOF_PROTECTION=1 - ONE_DIR=1 - DMS_DEBUG=0 + - LOG_LEVEL=warn - AMAVIS_LOGLEVEL=-1 # in theory these next 2 being empty disables them, but that does not seem to work - ENABLE_POP3 @@ -521,12 +526,14 @@ services: - '--storage.path=/alertmanager' cadvisor: -# image: google/cadvisor:latest +# image: secureimages/cadvisor:0.44.0-alpine-3.16.0 image: gcr.io/cadvisor/cadvisor:latest +# image: google/cadvisor:latest container_name: cadvisor privileged: true command: - '--disable_metrics=udp' + - '-v=2' - '--housekeeping_interval=30s' labels: - "com.centurylinklabs.watchtower.enable=true" @@ -634,7 +641,8 @@ services: bookdb_web: container_name: bookdb_web restart: always - build: '/home/ddp/src/pybook' + build: + context: '/home/ddp/src/pybook' depends_on: - bookdb - pihole