summaryrefslogtreecommitdiffstats
path: root/mailcow/docker-compose.yml
diff options
context:
space:
mode:
Diffstat (limited to 'mailcow/docker-compose.yml')
-rw-r--r--mailcow/docker-compose.yml81
1 files changed, 20 insertions, 61 deletions
diff --git a/mailcow/docker-compose.yml b/mailcow/docker-compose.yml
index 3d747c5..b1396c0 100644
--- a/mailcow/docker-compose.yml
+++ b/mailcow/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2.1'
services:
unbound-mailcow:
- image: mailcow/unbound:1.13
+ image: mailcow/unbound:1.14
environment:
- TZ=${TZ}
volumes:
@@ -41,7 +41,7 @@ services:
- mysql
redis-mailcow:
- image: redis:5-alpine
+ image: redis:6-alpine
volumes:
- redis-vol-1:/data/:Z
restart: always
@@ -49,6 +49,8 @@ services:
- "${REDIS_PORT:-127.0.0.1:7654}:6379"
environment:
- TZ=${TZ}
+ sysctls:
+ - net.core.somaxconn=4096
networks:
mailcow-network:
ipv4_address: ${IPV4_NETWORK:-172.22.1}.249
@@ -56,7 +58,7 @@ services:
- redis
clamd-mailcow:
- image: mailcow/clamd:1.40
+ image: mailcow/clamd:1.41
restart: always
dns:
- ${IPV4_NETWORK:-172.22.1}.254
@@ -71,7 +73,7 @@ services:
- clamd
rspamd-mailcow:
- image: mailcow/rspamd:1.76
+ image: mailcow/rspamd:1.79
stop_grace_period: 30s
depends_on:
- dovecot-mailcow
@@ -101,7 +103,7 @@ services:
- rspamd
php-fpm-mailcow:
- image: mailcow/phpfpm:1.75
+ image: mailcow/phpfpm:1.76
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
depends_on:
- redis-mailcow
@@ -122,7 +124,6 @@ services:
- ./data/conf/dovecot/global_sieve_before:/global_sieve/before:z
- ./data/conf/dovecot/global_sieve_after:/global_sieve/after:z
- ./data/assets/templates:/tpls:z
- - ./data/conf/ejabberd/autogen:/ejabberd/:z
- ./data/conf/nginx/:/etc/nginx/conf.d/:z
dns:
- ${IPV4_NETWORK:-172.22.1}.254
@@ -146,8 +147,6 @@ services:
- SUBMISSION_PORT=${SUBMISSION_PORT:-587}
- SMTPS_PORT=${SMTPS_PORT:-465}
- SMTP_PORT=${SMTP_PORT:-25}
- - XMPP_C2S_PORT=${XMPP_C2S_PORT:-5222}
- - XMPP_S2S_PORT=${XMPP_S2S_PORT:-5269}
- API_KEY=${API_KEY:-invalid}
- API_KEY_READ_ONLY=${API_KEY_READ_ONLY:-invalid}
- API_ALLOW_FROM=${API_ALLOW_FROM:-invalid}
@@ -164,7 +163,7 @@ services:
- phpfpm
sogo-mailcow:
- image: mailcow/sogo:1.99
+ image: mailcow/sogo:1.101
environment:
- DBNAME=${DBNAME}
- DBUSER=${DBUSER}
@@ -184,6 +183,7 @@ services:
dns:
- ${IPV4_NETWORK:-172.22.1}.254
volumes:
+ - ./data/hooks/sogo:/hooks:Z
- ./data/conf/sogo/:/etc/sogo/:z
- ./data/web/inc/init_db.inc.php:/init_db.inc.php:Z
- ./data/conf/sogo/custom-favicon.ico:/usr/lib/GNUstep/SOGo/WebServerResources/img/sogo.ico:z
@@ -212,7 +212,7 @@ services:
- sogo
dovecot-mailcow:
- image: mailcow/dovecot:1.145
+ image: mailcow/dovecot:1.156
depends_on:
- mysql-mailcow
dns:
@@ -244,7 +244,7 @@ services:
- 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:-}
@@ -292,7 +292,7 @@ services:
- dovecot
postfix-mailcow:
- image: mailcow/postfix:1.61
+ image: mailcow/postfix:1.66
depends_on:
- mysql-mailcow
volumes:
@@ -323,6 +323,7 @@ services:
- ${IPV4_NETWORK:-172.22.1}.254
networks:
mailcow-network:
+ ipv4_address: ${IPV4_NETWORK:-172.22.1}.253
aliases:
- postfix
@@ -347,7 +348,6 @@ services:
command: /bin/sh -c "envsubst < /etc/nginx/conf.d/templates/listen_plain.template > /etc/nginx/conf.d/listen_plain.active &&
envsubst < /etc/nginx/conf.d/templates/listen_ssl.template > /etc/nginx/conf.d/listen_ssl.active &&
envsubst < /etc/nginx/conf.d/templates/sogo.template > /etc/nginx/conf.d/sogo.active &&
- . /etc/nginx/conf.d/templates/sogo.auth_request.template.sh > /etc/nginx/conf.d/sogo_proxy_auth.active &&
. /etc/nginx/conf.d/templates/server_name.template.sh > /etc/nginx/conf.d/server_name.active &&
. /etc/nginx/conf.d/templates/sites.template.sh > /etc/nginx/conf.d/sites.active &&
. /etc/nginx/conf.d/templates/sogo_eas.template.sh > /etc/nginx/conf.d/sogo_eas.active &&
@@ -356,7 +356,6 @@ services:
until ping sogo -c1 > /dev/null; do sleep 1; done &&
until ping redis -c1 > /dev/null; do sleep 1; done &&
until ping rspamd -c1 > /dev/null; do sleep 1; done &&
- until ping ejabberd -c1 > /dev/null; do sleep 1; done &&
exec nginx -g 'daemon off;'"
environment:
- HTTPS_PORT=${HTTPS_PORT:-443}
@@ -387,7 +386,7 @@ services:
acme-mailcow:
depends_on:
- nginx-mailcow
- image: mailcow/acme:1.79
+ image: mailcow/acme:1.80
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment:
@@ -423,7 +422,7 @@ services:
- acme
netfilter-mailcow:
- image: mailcow/netfilter:1.43
+ image: mailcow/netfilter:1.44
stop_grace_period: 30s
depends_on:
- dovecot-mailcow
@@ -446,7 +445,7 @@ services:
- /lib/modules:/lib/modules:ro
watchdog-mailcow:
- image: mailcow/watchdog:1.91
+ image: mailcow/watchdog:1.94
# Debug
#command: /watchdog.sh
dns:
@@ -499,7 +498,6 @@ services:
- RATELIMIT_THRESHOLD=${RATELIMIT_THRESHOLD:-1}
- FAIL2BAN_THRESHOLD=${FAIL2BAN_THRESHOLD:-1}
- ACME_THRESHOLD=${ACME_THRESHOLD:-1}
- - IPV6NAT_THRESHOLD=${IPV6NAT_THRESHOLD:-1}
- RSPAMD_THRESHOLD=${RSPAMD_THRESHOLD:-5}
- OLEFY_THRESHOLD=${OLEFY_THRESHOLD:-5}
- MAILQ_THRESHOLD=${MAILQ_THRESHOLD:-20}
@@ -510,7 +508,7 @@ services:
- watchdog
dockerapi-mailcow:
- image: mailcow/dockerapi:1.38
+ image: mailcow/dockerapi:1.39
security_opt:
- label=disable
restart: always
@@ -544,7 +542,7 @@ services:
- solr
olefy-mailcow:
- image: mailcow/olefy:1.7
+ image: mailcow/olefy:1.8
restart: always
environment:
- TZ=${TZ}
@@ -561,44 +559,6 @@ services:
aliases:
- olefy
- ejabberd-mailcow:
- image: mailcow/ejabberd:1.6
- volumes:
- - ./data/conf/ejabberd/ejabberd.yml:/home/ejabberd/conf/ejabberd.yml:z
- - xmpp-vol-1:/home/ejabberd/database:z
- - xmpp-upload-vol-1:/var/www/upload:z
- - ./data/assets/ejabberd/sqlite:/sqlite:z
- - ./data/conf/ejabberd/autogen:/ejabberd/:z
- - mysql-socket-vol-1:/var/run/mysqld/:z
- - ./data/assets/ssl:/ssl:ro,z
- restart: always
- dns:
- - ${IPV4_NETWORK:-172.22.1}.254
- hostname: ejabberd.mailcow.local
- labels:
- ofelia.enabled: "true"
- ofelia.job-exec.ejabberd_certs.schedule: "@every 168h"
- ofelia.job-exec.ejabberd_certs.command: "/sbin/su-exec ejabberd /home/ejabberd/bin/ejabberdctl --node ejabberd@$${MAILCOW_HOSTNAME} request-certificate all"
- extra_hosts:
- - "${MAILCOW_HOSTNAME}:127.0.0.1"
- environment:
- - TZ=${TZ}
- - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
- - MASTER=${MASTER:-y}
- - IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
- - XMPP_HTTPS_PORT=${XMPP_HTTPS_PORT:-5443}
- - DBNAME=${DBNAME}
- - DBUSER=${DBUSER}
- - DBPASS=${DBPASS}
- ports:
- - "${XMPP_C2S_PORT:-5222}:5222"
- - "${XMPP_S2S_PORT:-5269}:5269"
- - "${XMPP_HTTPS_PORT:-5443}:5443"
- networks:
- mailcow-network:
- aliases:
- - ejabberd
-
ofelia-mailcow:
image: mcuadros/ofelia:latest
restart: always
@@ -607,9 +567,10 @@ services:
depends_on:
- sogo-mailcow
- dovecot-mailcow
- - ejabberd-mailcow
labels:
ofelia.enabled: "true"
+ security_opt:
+ - label=disable
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
networks:
@@ -671,5 +632,3 @@ volumes:
crypt-vol-1:
sogo-web-vol-1:
sogo-userdata-backup-vol-1:
- xmpp-vol-1:
- xmpp-upload-vol-1: