Merge branch 'master' into master

docker-compose.yml

@@ -40,7 +40,7 @@ services:
             - mysql
 
     redis-mailcow:
-      image: redis:4-alpine
+      image: redis:5-alpine
       volumes:
         - redis-vol-1:/data/
       restart: always
@@ -72,7 +72,7 @@ services:
             - clamd
 
     rspamd-mailcow:
-      image: mailcow/rspamd:1.32
+      image: mailcow/rspamd:1.33
       build: ./data/Dockerfiles/rspamd
       stop_grace_period: 30s
       depends_on:
@@ -95,7 +95,7 @@ services:
             - rspamd
 
     php-fpm-mailcow:
-      image: mailcow/phpfpm:1.26
+      image: mailcow/phpfpm:1.29
       build: ./data/Dockerfiles/phpfpm
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
@@ -138,7 +138,7 @@ services:
             - phpfpm
 
     sogo-mailcow:
-      image: mailcow/sogo:1.44
+      image: mailcow/sogo:1.49
       build: ./data/Dockerfiles/sogo
       environment:
         - DBNAME=${DBNAME}
@@ -163,7 +163,7 @@ services:
             - sogo
 
     dovecot-mailcow:
-      image: mailcow/dovecot:1.48
+      image: mailcow/dovecot:1.52
       build: ./data/Dockerfiles/dovecot
       cap_add:
         - NET_BIND_SERVICE
@@ -208,7 +208,7 @@ services:
             - dovecot
 
     postfix-mailcow:
-      image: mailcow/postfix:1.27
+      image: mailcow/postfix:1.29
       build: ./data/Dockerfiles/postfix
       volumes:
         - ./data/conf/postfix:/opt/postfix/conf
@@ -344,7 +344,7 @@ services:
         - /lib/modules:/lib/modules:ro
 
     watchdog-mailcow:
-      image: mailcow/watchdog:1.29
+      image: mailcow/watchdog:1.32
       # Debug
       #command: /watchdog.sh
       build: ./data/Dockerfiles/watchdog
@@ -393,6 +393,22 @@ services:
             - dockerapi
 
     ipv6nat:
+      depends_on:
+        - unbound-mailcow
+        - mysql-mailcow
+        - redis-mailcow
+        - clamd-mailcow
+        - rspamd-mailcow
+        - php-fpm-mailcow
+        - sogo-mailcow
+        - dovecot-mailcow
+        - postfix-mailcow
+        - memcached-mailcow
+        - nginx-mailcow
+        - acme-mailcow
+        - netfilter-mailcow
+        - watchdog-mailcow
+        - dockerapi-mailcow
       image: robbertkl/ipv6nat
       restart: always
       privileged: true