From 3bd32072f1255af15d20efe5d0b6cd1c8696a1cd Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Fri, 20 Sep 2019 22:54:40 +0200
Subject: [PATCH] [Compose] UPDATE MARIADB TO 10.3 - Please check your
 installations after upgrading and WAIT a few minutes for the upgrade to
 complete! [Postfix] Remove old python lib [Compose] Add a grace period for
 MySQL when shutting down [Netfilter] It is okay to be number two :( (fixes
 chain order in ip6tables FORWARD chain)

---
 data/Dockerfiles/netfilter/server.py | 4 ++--
 docker-compose.yml                   | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/data/Dockerfiles/netfilter/server.py b/data/Dockerfiles/netfilter/server.py
index a50d0717..51d78a0a 100644
--- a/data/Dockerfiles/netfilter/server.py
+++ b/data/Dockerfiles/netfilter/server.py
@@ -107,8 +107,8 @@ def mailcowChainOrder():
           for position, item in enumerate(chain.rules):
             if item.target.name == 'MAILCOW':
               target_found = True
-              if position != 0:
-                logCrit('Error in %s chain order, restarting container' % (chain.name))
+              if position > 2:
+                logCrit('Error in %s chain order: MAILCOW on position %d, restarting container' % (chain.name, position))
                 quit_now = True
           if not target_found:
             logCrit('Error in %s chain: MAILCOW target not found, restarting container' % (chain.name))
diff --git a/docker-compose.yml b/docker-compose.yml
index 9846be1b..7601939d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,8 @@ services:
             - unbound
 
     mysql-mailcow:
-      image: mariadb:10.2
+      image: mariadb:10.3
+      stop_grace_period: 45s
       volumes:
         - mysql-vol-1:/var/lib/mysql/
         - mysql-socket-vol-1:/var/run/mysqld/
@@ -223,7 +224,7 @@ services:
             - dovecot
 
     postfix-mailcow:
-      image: mailcow/postfix:1.39
+      image: mailcow/postfix:1.40
       build: ./data/Dockerfiles/postfix
       volumes:
         - ./data/conf/postfix:/opt/postfix/conf
@@ -338,7 +339,7 @@ services:
             - acme
 
     netfilter-mailcow:
-      image: mailcow/netfilter:1.28
+      image: mailcow/netfilter:1.29
       build: ./data/Dockerfiles/netfilter
       stop_grace_period: 30s
       depends_on: