nico/mailcow
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'staging' into nightly

Browse Source
This commit is contained in:
DerLinkman
2024-08-07 14:21:23 +02:00
parent 9b86ff764e 76194be7dd
commit 772d5c51fd
31 changed files with 831 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.yml
+5 -4
View File
@@ -80,7 +80,7 @@ services:
- clamd
rspamd-mailcow:
image: mailcow/rspamd:1.96
image: mailcow/rspamd:1.97
stop_grace_period: 30s
depends_on:
- dovecot-mailcow
@@ -90,6 +90,7 @@ services:
- IPV6_NETWORK=${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
volumes:
- ./data/hooks/rspamd:/hooks:Z
- ./data/conf/rspamd/custom/:/etc/rspamd/custom:z
@@ -110,7 +111,7 @@ services:
- rspamd
php-fpm-mailcow:
image: mailcow/phpfpm:1.87
image: mailcow/phpfpm:1.88
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
depends_on:
- redis-mailcow
@@ -236,7 +237,7 @@ services:
- sogo
dovecot-mailcow:
image: mailcow/dovecot:nightly-20240731
image: mailcow/dovecot:nightly-20240807
depends_on:
- mysql-mailcow
- netfilter-mailcow
@@ -424,7 +425,7 @@ services:
condition: service_started
unbound-mailcow:
condition: service_healthy
image: mailcow/acme:1.88
image: mailcow/acme:1.89
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment: