From b3b483afab860eb852d40786f0467878f25ca0f0 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Sat, 25 Jun 2022 10:48:10 +1000
Subject: [PATCH] minor tweak of pybook to same format for building as PA,
 switched to newer cadvisor which seems to work better with newer U22.04 for
 mara stats, added new ENV vars with newer mail-server

---
 docker-compose.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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