github/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-02-13 21:00:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into nightly

Browse Source
This commit is contained in:
FreddleSpl0it
2025-02-24 15:09:36 +01:00
parent 54728bf780 6ec5e88793
commit fcebe98557
26 changed files with 142 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docker-compose.yml
View File

@@ -17,7 +17,7 @@ services:
- unbound
mysql-mailcow:
image: mariadb:10.5
image: mariadb:10.11
depends_on:
- unbound-mailcow
- netfilter-mailcow
@@ -43,7 +43,7 @@ services:
redis-mailcow:
image: redis:7-alpine
entrypoint: /redis-conf.sh
entrypoint: ["/bin/sh","/redis-conf.sh"]
volumes:
- redis-vol-1:/data/
- ./data/conf/redis/redis-conf.sh:/redis-conf.sh:z
@@ -55,6 +55,7 @@ services:
environment:
- TZ=${TZ}
- REDISPASS=${REDISPASS}
- REDISMASTERPASS=${REDISMASTERPASS:-}
sysctls:
- net.core.somaxconn=4096
networks:
@@ -83,7 +84,7 @@ services:
- clamd
rspamd-mailcow:
image: mailcow/rspamd:1.99
image: mailcow/rspamd:2.0
stop_grace_period: 30s
depends_on:
- dovecot-mailcow
@@ -198,7 +199,7 @@ services:
- phpfpm
sogo-mailcow:
image: mailcow/sogo:nightly-20250115
image: mailcow/sogo:nightly-20250224
environment:
- DBNAME=${DBNAME}
- DBUSER=${DBUSER}
@@ -223,6 +224,9 @@ services:
- ./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
- ./data/conf/sogo/custom-shortlogo.svg:/usr/lib/GNUstep/SOGo/WebServerResources/img/sogo-compact.svg:z
- ./data/conf/sogo/custom-fulllogo.svg:/usr/lib/GNUstep/SOGo/WebServerResources/img/sogo-full.svg:z
- ./data/conf/sogo/custom-fulllogo.png:/usr/lib/GNUstep/SOGo/WebServerResources/img/sogo-logo.png:z
- ./data/conf/sogo/custom-theme.js:/usr/lib/GNUstep/SOGo/WebServerResources/js/theme.js:z
- ./data/conf/sogo/custom-sogo.js:/usr/lib/GNUstep/SOGo/WebServerResources/js/custom-sogo.js:z
- mysql-socket-vol-1:/var/run/mysqld/
@@ -246,7 +250,7 @@ services:
- sogo
dovecot-mailcow:
image: mailcow/dovecot:nightly-20250211
image: mailcow/dovecot:nightly-20250224
depends_on:
- mysql-mailcow
- netfilter-mailcow
@@ -333,7 +337,7 @@ services:
- dovecot
postfix-mailcow:
image: mailcow/postfix:1.79
image: mailcow/postfix:1.80
depends_on:
mysql-mailcow:
condition: service_started
@@ -389,7 +393,7 @@ services:
- php-fpm-mailcow
- sogo-mailcow
- rspamd-mailcow
image: mailcow/nginx:1.02
image: mailcow/nginx:1.03
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment:
@@ -407,6 +411,8 @@ services:
- RSPAMDHOST=${RSPAMDHOST:-}
- REDISHOST=${REDISHOST:-}
- IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
- NGINX_USE_PROXY_PROTOCOL=${NGINX_USE_PROXY_PROTOCOL:-n}
- TRUSTED_PROXIES=${TRUSTED_PROXIES:-}
volumes:
- ./data/web:/web:ro,z
- ./data/conf/rspamd/dynmaps:/dynmaps:ro,z
@@ -471,7 +477,7 @@ services:
- acme
netfilter-mailcow:
image: mailcow/netfilter:1.60
image: mailcow/netfilter:1.61
stop_grace_period: 30s
restart: always
privileged: true