|
|
@@ -72,7 +72,7 @@ services:
|
|
|
- clamd
|
|
|
|
|
|
rspamd-mailcow:
|
|
|
- image: mailcow/rspamd:1.29
|
|
|
+ image: mailcow/rspamd:1.30
|
|
|
build: ./data/Dockerfiles/rspamd
|
|
|
stop_grace_period: 30s
|
|
|
depends_on:
|
|
|
@@ -105,6 +105,7 @@ services:
|
|
|
- ./data/conf/rspamd/dynmaps:/dynmaps:ro
|
|
|
- rspamd-vol-1:/var/lib/rspamd
|
|
|
- mysql-socket-vol-1:/var/run/mysqld/
|
|
|
+ - ./data/conf/sogo/:/etc/sogo/
|
|
|
- ./data/conf/rspamd/meta_exporter:/meta_exporter:ro
|
|
|
- ./data/conf/phpfpm/php-fpm.d/pools.conf:/usr/local/etc/php-fpm.d/z-pools.conf
|
|
|
- ./data/conf/phpfpm/php-conf.d/opcache-recommended.ini:/usr/local/etc/php/conf.d/opcache-recommended.ini
|
|
|
@@ -137,7 +138,7 @@ services:
|
|
|
- phpfpm
|
|
|
|
|
|
sogo-mailcow:
|
|
|
- image: mailcow/sogo:1.41
|
|
|
+ image: mailcow/sogo:1.42
|
|
|
build: ./data/Dockerfiles/sogo
|
|
|
environment:
|
|
|
- DBNAME=${DBNAME}
|
|
|
@@ -148,6 +149,7 @@ services:
|
|
|
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
|
|
|
volumes:
|
|
|
- ./data/conf/sogo/:/etc/sogo/
|
|
|
+ - ./data/conf/sogo/custom-sogo.js:/usr/lib/GNUstep/SOGo/WebServerResources/js/custom-sogo.js
|
|
|
- mysql-socket-vol-1:/var/run/mysqld/
|
|
|
restart: always
|
|
|
dns:
|
|
|
@@ -159,7 +161,7 @@ services:
|
|
|
- sogo
|
|
|
|
|
|
dovecot-mailcow:
|
|
|
- image: mailcow/dovecot:1.42
|
|
|
+ image: mailcow/dovecot:1.44
|
|
|
build: ./data/Dockerfiles/dovecot
|
|
|
cap_add:
|
|
|
- NET_BIND_SERVICE
|
|
|
@@ -168,6 +170,8 @@ services:
|
|
|
- ./data/assets/ssl:/etc/ssl/mail/:ro
|
|
|
- ./data/conf/sogo/:/etc/sogo/
|
|
|
- vmail-vol-1:/var/vmail
|
|
|
+ - vmail-attachments-vol-1:/var/attachments
|
|
|
+ - vmail-index-vol-1:/var/indexes
|
|
|
- crypt-vol-1:/mail_crypt/
|
|
|
- ./data/conf/rspamd/custom/:/etc/rspamd/custom
|
|
|
- rspamd-vol-1:/var/lib/rspamd
|
|
|
@@ -187,6 +191,7 @@ services:
|
|
|
- "${POPS_PORT:-995}:995"
|
|
|
- "${SIEVE_PORT:-4190}:4190"
|
|
|
restart: always
|
|
|
+ tty: true
|
|
|
ulimits:
|
|
|
nproc: 65535
|
|
|
nofile:
|
|
|
@@ -201,7 +206,7 @@ services:
|
|
|
- dovecot
|
|
|
|
|
|
postfix-mailcow:
|
|
|
- image: mailcow/postfix:1.25
|
|
|
+ image: mailcow/postfix:1.26
|
|
|
build: ./data/Dockerfiles/postfix
|
|
|
volumes:
|
|
|
- ./data/conf/postfix:/opt/postfix/conf
|
|
|
@@ -286,7 +291,7 @@ services:
|
|
|
acme-mailcow:
|
|
|
depends_on:
|
|
|
- nginx-mailcow
|
|
|
- image: mailcow/acme:1.44
|
|
|
+ image: mailcow/acme:1.45
|
|
|
build: ./data/Dockerfiles/acme
|
|
|
dns:
|
|
|
- ${IPV4_NETWORK:-172.22.1}.254
|
|
|
@@ -404,7 +409,12 @@ networks:
|
|
|
- subnet: ${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
|
|
|
|
|
|
volumes:
|
|
|
+ # Storage for email files
|
|
|
vmail-vol-1:
|
|
|
+ # Storage for attachments (deduplicated)
|
|
|
+ vmail-attachments-vol-1:
|
|
|
+ # Storage for index files
|
|
|
+ vmail-index-vol-1:
|
|
|
mysql-vol-1:
|
|
|
mysql-socket-vol-1:
|
|
|
redis-vol-1:
|
andryyy