git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "32243e56"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "e2b4b6f6"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I51e2016ef5ab88a8b0bdc08551b18f48ceef0aa5
diff --git a/mailcow/src/mailcow-dockerized/docker-compose.yml b/mailcow/src/mailcow-dockerized/docker-compose.yml
index f945814..20d182c 100644
--- a/mailcow/src/mailcow-dockerized/docker-compose.yml
+++ b/mailcow/src/mailcow-dockerized/docker-compose.yml
@@ -2,7 +2,7 @@
services:
unbound-mailcow:
- image: mailcow/unbound:1.13
+ image: mailcow/unbound:1.14
environment:
- TZ=${TZ}
volumes:
@@ -58,7 +58,7 @@
- redis
clamd-mailcow:
- image: mailcow/clamd:1.40
+ image: mailcow/clamd:1.42
restart: always
dns:
- ${IPV4_NETWORK:-172.22.1}.254
@@ -73,7 +73,7 @@
- clamd
rspamd-mailcow:
- image: mailcow/rspamd:1.77
+ image: mailcow/rspamd:1.79
stop_grace_period: 30s
depends_on:
- dovecot-mailcow
@@ -103,7 +103,7 @@
- rspamd
php-fpm-mailcow:
- image: mailcow/phpfpm:1.76
+ image: mailcow/phpfpm:1.78
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
depends_on:
- redis-mailcow
@@ -156,6 +156,7 @@
- SKIP_SOGO=${SKIP_SOGO:-n}
- ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n}
- MASTER=${MASTER:-y}
+ - DEV_MODE=${DEV_MODE:-n}
restart: always
networks:
mailcow-network:
@@ -163,7 +164,7 @@
- phpfpm
sogo-mailcow:
- image: mailcow/sogo:1.101
+ image: mailcow/sogo:1.104
environment:
- DBNAME=${DBNAME}
- DBUSER=${DBUSER}
@@ -210,7 +211,7 @@
- sogo
dovecot-mailcow:
- image: mailcow/dovecot:1.155
+ image: mailcow/dovecot:1.158
depends_on:
- mysql-mailcow
dns:
@@ -242,7 +243,7 @@
- MAILCOW_PASS_SCHEME=${MAILCOW_PASS_SCHEME:-BLF-CRYPT}
- IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
- ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n}
- - MAILDIR_GC_TIME=${MAILDIR_GC_TIME:-1440}
+ - MAILDIR_GC_TIME=${MAILDIR_GC_TIME:-7200}
- ACL_ANYONE=${ACL_ANYONE:-disallow}
- SKIP_SOLR=${SKIP_SOLR:-y}
- MAILDIR_SUB=${MAILDIR_SUB:-}
@@ -290,7 +291,7 @@
- dovecot
postfix-mailcow:
- image: mailcow/postfix:1.65
+ image: mailcow/postfix:1.66
depends_on:
- mysql-mailcow
volumes:
@@ -340,7 +341,7 @@
- sogo-mailcow
- php-fpm-mailcow
- redis-mailcow
- image: nginx:1.19-alpine
+ image: nginx:mainline-alpine
dns:
- ${IPV4_NETWORK:-172.22.1}.254
command: /bin/sh -c "envsubst < /etc/nginx/conf.d/templates/listen_plain.template > /etc/nginx/conf.d/listen_plain.active &&
@@ -383,7 +384,7 @@
acme-mailcow:
depends_on:
- nginx-mailcow
- image: mailcow/acme:1.79
+ image: mailcow/acme:1.80
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment:
@@ -419,7 +420,7 @@
- acme
netfilter-mailcow:
- image: mailcow/netfilter:1.43
+ image: mailcow/netfilter:1.45
stop_grace_period: 30s
depends_on:
- dovecot-mailcow
@@ -442,9 +443,7 @@
- /lib/modules:/lib/modules:ro
watchdog-mailcow:
- image: mailcow/watchdog:1.92
- # Debug
- #command: /watchdog.sh
+ image: mailcow/watchdog:1.95
dns:
- ${IPV4_NETWORK:-172.22.1}.254
tmpfs:
@@ -469,6 +468,7 @@
- WATCHDOG_SUBJECT=${WATCHDOG_SUBJECT:-Watchdog ALERT}
- WATCHDOG_EXTERNAL_CHECKS=${WATCHDOG_EXTERNAL_CHECKS:-n}
- WATCHDOG_MYSQL_REPLICATION_CHECKS=${WATCHDOG_MYSQL_REPLICATION_CHECKS:-n}
+ - WATCHDOG_VERBOSE=${WATCHDOG_VERBOSE:-n}
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
- COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-mailcow-dockerized}
- IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
@@ -505,7 +505,7 @@
- watchdog
dockerapi-mailcow:
- image: mailcow/dockerapi:1.38
+ image: mailcow/dockerapi:1.40
security_opt:
- label=disable
restart: always
@@ -523,7 +523,7 @@
- dockerapi
solr-mailcow:
- image: mailcow/solr:1.7
+ image: mailcow/solr:1.8
restart: always
volumes:
- solr-vol-1:/opt/solr/server/solr/dovecot-fts/data:Z
@@ -539,7 +539,7 @@
- solr
olefy-mailcow:
- image: mailcow/olefy:1.7
+ image: mailcow/olefy:1.8
restart: always
environment:
- TZ=${TZ}
@@ -566,6 +566,8 @@
- dovecot-mailcow
labels:
ofelia.enabled: "true"
+ security_opt:
+ - label=disable
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
networks:
@@ -573,12 +575,42 @@
aliases:
- ofelia
+ ipv6nat-mailcow:
+ 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
+ - solr-mailcow
+ environment:
+ - TZ=${TZ}
+ image: robbertkl/ipv6nat
+ security_opt:
+ - label=disable
+ restart: always
+ privileged: true
+ network_mode: "host"
+ volumes:
+ - /var/run/docker.sock:/var/run/docker.sock:ro
+ - /lib/modules:/lib/modules:ro
+
networks:
mailcow-network:
driver: bridge
driver_opts:
com.docker.network.bridge.name: br-mailcow
- enable_ipv6: false
+ enable_ipv6: true
ipam:
driver: default
config: