From f72f046fa67d0cc887711b2aa17645353b00d064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pl=C3=B6tz?=
 <reneploetz@users.noreply.github.com>
Date: Tue, 22 Sep 2020 14:57:31 +0200
Subject: [PATCH] update docker-mailserver to 7.0.0 (#448)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update docker-mailserver to 7.0.0
  * updated docker-mailserver image to 7.0.0
  * added volume for mail logs
  * use SPAMASSASSIN_SPAM_TO_INBOX to deliver spam to INBOX, upstreams new default is bouncing:
    * https://github.com/tomav/docker-mailserver#spamassassin_spam_to_inbox
  * migrate REPORT_RECIPIENT to the new PFLOGSUMM_TRIGGER=logrotate
* update docker-mailserver image version to 7.0.1

Signed-off-by: René Plötz <reneploetz@users.noreply.github.com>
---
 docker-compose.mail.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker-compose.mail.yml b/docker-compose.mail.yml
index b4d6234..62dc836 100644
--- a/docker-compose.mail.yml
+++ b/docker-compose.mail.yml
@@ -2,7 +2,7 @@ version: "3.5"
 
 services:
   mail:
-    image: tvial/docker-mailserver:release-v6.2.0
+    image: tvial/docker-mailserver:release-v7.0.1
     restart: unless-stopped
     hostname: mail # hostname and domainname may need to be commented on some platforms (e.g. ChromeOS)
     domainname: ${LDAP_DOMAIN}
@@ -14,6 +14,7 @@ services:
     volumes:
       - maildata:/var/mail
       - mailstate:/var/mail-state
+      - maillogs:/var/log/mail
       - mtaconfig:/tmp/docker-mailserver/
     environment:
       - DMS_DEBUG=0
@@ -35,8 +36,8 @@ services:
       - ONE_DIR=1
       - PERMIT_DOCKER=connected-networks
       - POSTFIX_DAGENT=lmtp:kopano_dagent:2003
+      - PFLOGSUMM_TRIGGER=logrotate
       - POSTMASTER_ADDRESS=${POSTMASTER_ADDRESS}
-      - REPORT_RECIPIENT=1
       - SASLAUTHD_LDAP_BIND_DN=${LDAP_BIND_DN}
       - SASLAUTHD_LDAP_FILTER=${SASLAUTHD_LDAP_FILTER}
       - SASLAUTHD_LDAP_PASSWORD=${LDAP_BIND_PW}
@@ -45,6 +46,7 @@ services:
       - SASLAUTHD_MECHANISMS=rimap
       - SASLAUTHD_MECH_OPTIONS=kopano_gateway
       - SMTP_ONLY=1
+      - SPAMASSASSIN_SPAM_TO_INBOX=1
       - SSL_TYPE=self-signed
       - TZ=${TZ}
     env_file:
@@ -65,4 +67,5 @@ services:
 volumes:
   maildata:
   mailstate:
+  maillogs:
   mtaconfig: