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

Merge remote-tracking branch 'origin/staging' into nightly

Browse Source
This commit is contained in:
FreddleSpl0it
2024-07-31 10:35:44 +02:00
parent f7ae2a6162 03fccb28e9
commit 57bc03b878
91 changed files with 3112 additions and 1413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.yml
+16 -15
View File
@@ -1,8 +1,7 @@
version: '2.1'
services:
unbound-mailcow:
image: mailcow/unbound:1.21
image: mailcow/unbound:1.22
environment:
- TZ=${TZ}
- SKIP_UNBOUND_HEALTHCHECK=${SKIP_UNBOUND_HEALTHCHECK:-n}
@@ -62,7 +61,7 @@ services:
- redis
clamd-mailcow:
image: mailcow/clamd:1.64
image: mailcow/clamd:1.66
restart: always
depends_on:
unbound-mailcow:
@@ -81,7 +80,7 @@ services:
- clamd
rspamd-mailcow:
image: mailcow/rspamd:1.95
image: mailcow/rspamd:1.96
stop_grace_period: 30s
depends_on:
- dovecot-mailcow
@@ -190,7 +189,7 @@ services:
- phpfpm
sogo-mailcow:
image: mailcow/sogo:nightly-20240603
image: mailcow/sogo:nightly-20240731
environment:
- DBNAME=${DBNAME}
- DBUSER=${DBUSER}
@@ -237,7 +236,7 @@ services:
- sogo
dovecot-mailcow:
image: mailcow/dovecot:nightly-20240226
image: mailcow/dovecot:nightly-20240731
depends_on:
- mysql-mailcow
- netfilter-mailcow
@@ -280,6 +279,7 @@ services:
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-mailcow-dockerized}
- FLATCURVE_EXPERIMENTAL=${FLATCURVE_EXPERIMENTAL:-n}
ports:
- "${DOVEADM_PORT:-127.0.0.1:19991}:12345"
- "${IMAP_PORT:-143}:143"
@@ -305,7 +305,7 @@ services:
ofelia.job-exec.dovecot_sarules.schedule: "@every 24h"
ofelia.job-exec.dovecot_sarules.command: "/bin/bash -c \"/usr/local/bin/sa-rules.sh\""
ofelia.job-exec.dovecot_fts.schedule: "@every 24h"
ofelia.job-exec.dovecot_fts.command: "/usr/bin/curl http://solr:8983/solr/dovecot-fts/update?optimize=true"
ofelia.job-exec.dovecot_fts.command: "/bin/bash -c \"/usr/local/bin/gosu vmail /usr/local/bin/optimize-fts.sh\""
ofelia.job-exec.dovecot_repl_health.schedule: "@every 5m"
ofelia.job-exec.dovecot_repl_health.command: "/bin/bash -c \"/usr/local/bin/gosu vmail /usr/local/bin/repl_health.sh\""
ulimits:
@@ -320,7 +320,7 @@ services:
- dovecot
postfix-mailcow:
image: mailcow/postfix:1.74
image: mailcow/postfix:1.75
depends_on:
mysql-mailcow:
condition: service_started
@@ -424,13 +424,14 @@ services:
condition: service_started
unbound-mailcow:
condition: service_healthy
image: mailcow/acme:1.87
image: mailcow/acme:1.88
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment:
- LOG_LINES=${LOG_LINES:-9999}
- ACME_CONTACT=${ACME_CONTACT:-}
- ADDITIONAL_SAN=${ADDITIONAL_SAN}
- AUTODISCOVER_SAN=${AUTODISCOVER_SAN:-y}
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
- DBNAME=${DBNAME}
- DBUSER=${DBUSER}
@@ -460,7 +461,7 @@ services:
- acme
netfilter-mailcow:
image: mailcow/netfilter:1.57
image: mailcow/netfilter:1.59
stop_grace_period: 30s
restart: always
privileged: true
@@ -479,7 +480,7 @@ services:
- /lib/modules:/lib/modules:ro
watchdog-mailcow:
image: mailcow/watchdog:2.02
image: mailcow/watchdog:2.03
dns:
- ${IPV4_NETWORK:-172.22.1}.254
tmpfs:
@@ -496,7 +497,6 @@ services:
- mysql-mailcow
- acme-mailcow
- redis-mailcow
environment:
- IPV6_NETWORK=${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
- LOG_LINES=${LOG_LINES:-9999}
@@ -551,7 +551,7 @@ services:
- watchdog
dockerapi-mailcow:
image: mailcow/dockerapi:2.07
image: mailcow/dockerapi:2.08
security_opt:
- label=disable
restart: always
@@ -572,7 +572,7 @@ services:
##### Will be removed soon #####
solr-mailcow:
image: mailcow/solr:nightly-20231011
image: mailcow/solr:1.8.3
restart: always
depends_on:
- netfilter-mailcow
@@ -584,6 +584,7 @@ services:
- TZ=${TZ}
- SOLR_HEAP=${SOLR_HEAP:-1024}
- SKIP_SOLR=${SKIP_SOLR:-y}
- FLATCURVE_EXPERIMENTAL=${FLATCURVE_EXPERIMENTAL:-n}
networks:
mailcow-network:
aliases:
@@ -591,7 +592,7 @@ services:
################################
olefy-mailcow:
image: mailcow/olefy:nightly-20231011
image: mailcow/olefy:1.13
restart: always
environment:
- TZ=${TZ}