[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)
master
andryyy 2019-09-20 22:54:40 +02:00
parent 1d45c563b7
commit 3bd32072f1
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
2 changed files with 6 additions and 5 deletions

View File

@ -107,8 +107,8 @@ def mailcowChainOrder():
for position, item in enumerate(chain.rules): for position, item in enumerate(chain.rules):
if item.target.name == 'MAILCOW': if item.target.name == 'MAILCOW':
target_found = True target_found = True
if position != 0: if position > 2:
logCrit('Error in %s chain order, restarting container' % (chain.name)) logCrit('Error in %s chain order: MAILCOW on position %d, restarting container' % (chain.name, position))
quit_now = True quit_now = True
if not target_found: if not target_found:
logCrit('Error in %s chain: MAILCOW target not found, restarting container' % (chain.name)) logCrit('Error in %s chain: MAILCOW target not found, restarting container' % (chain.name))

View File

@ -18,7 +18,8 @@ services:
- unbound - unbound
mysql-mailcow: mysql-mailcow:
image: mariadb:10.2 image: mariadb:10.3
stop_grace_period: 45s
volumes: volumes:
- mysql-vol-1:/var/lib/mysql/ - mysql-vol-1:/var/lib/mysql/
- mysql-socket-vol-1:/var/run/mysqld/ - mysql-socket-vol-1:/var/run/mysqld/
@ -223,7 +224,7 @@ services:
- dovecot - dovecot
postfix-mailcow: postfix-mailcow:
image: mailcow/postfix:1.39 image: mailcow/postfix:1.40
build: ./data/Dockerfiles/postfix build: ./data/Dockerfiles/postfix
volumes: volumes:
- ./data/conf/postfix:/opt/postfix/conf - ./data/conf/postfix:/opt/postfix/conf
@ -338,7 +339,7 @@ services:
- acme - acme
netfilter-mailcow: netfilter-mailcow:
image: mailcow/netfilter:1.28 image: mailcow/netfilter:1.29
build: ./data/Dockerfiles/netfilter build: ./data/Dockerfiles/netfilter
stop_grace_period: 30s stop_grace_period: 30s
depends_on: depends_on: