|
@@ -35,6 +35,8 @@ services:
|
|
|
- MYSQL_USER=${DBUSER}
|
|
|
- MYSQL_PASSWORD=${DBPASS}
|
|
|
- MYSQL_INITDB_SKIP_TZINFO=1
|
|
|
+ - DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
|
|
|
+ - REDIS_HOST=${REDIS_HOST:-redis-mailcow}
|
|
|
restart: always
|
|
|
ports:
|
|
|
- "${SQL_PORT:-127.0.0.1:13306}:3306"
|
|
@@ -79,6 +81,8 @@ services:
|
|
|
- DBNAME=${DBNAME}
|
|
|
- DBUSER=${DBUSER}
|
|
|
- DBPASS=${DBPASS}
|
|
|
+ - DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
|
|
|
+ - REDIS_HOST=${REDIS_HOST:-redis-mailcow}
|
|
|
- TZ=${TZ}
|
|
|
- SKIP_CLAMD=${SKIP_CLAMD:-n}
|
|
|
volumes:
|
|
@@ -108,6 +112,8 @@ services:
|
|
|
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
|
|
|
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
|
|
|
- REDISPASS=${REDISPASS}
|
|
|
+ - DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
|
|
|
+ - REDIS_HOST=${REDIS_HOST:-redis-mailcow}
|
|
|
- SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
|
|
|
volumes:
|
|
|
- ./data/hooks/rspamd:/hooks:Z
|
|
@@ -171,6 +177,8 @@ services:
|
|
|
- DBNAME=${DBNAME}
|
|
|
- DBUSER=${DBUSER}
|
|
|
- DBPASS=${DBPASS}
|
|
|
+ - DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
|
|
|
+ - REDIS_HOST=${REDIS_HOST:-redis-mailcow}
|
|
|
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
|
|
|
- MAILCOW_PASS_SCHEME=${MAILCOW_PASS_SCHEME:-BLF-CRYPT}
|
|
|
- IMAP_PORT=${IMAP_PORT:-143}
|
|
@@ -234,6 +242,7 @@ services:
|
|
|
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
|
|
|
- REDISPASS=${REDISPASS}
|
|
|
- DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
|
|
|
+ - REDIS_HOST=${REDIS_HOST:-redis-mailcow}
|
|
|
- SOGO_HOST=${SOGO_HOST:-172.22.1.248}
|
|
|
- DOVECOT_HOST=${DOVECOT_HOST:-172.22.1.250}
|
|
|
- POSTFIX_HOST=${POSTFIX_HOST:-172.22.1.253}
|
|
@@ -323,6 +332,8 @@ services:
|
|
|
- REDISPASS=${REDISPASS}
|
|
|
- COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-mailcow-dockerized}
|
|
|
- SOGO_HOST=${SOGO_HOST:-172.22.1.248}
|
|
|
+ - DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
|
|
|
+ - REDIS_HOST=${REDIS_HOST:-redis-mailcow}
|
|
|
ports:
|
|
|
- "${DOVEADM_PORT:-127.0.0.1:19991}:12345"
|
|
|
- "${IMAP_PORT:-143}:143"
|
|
@@ -372,7 +383,7 @@ services:
|
|
|
volumes:
|
|
|
- ./data/hooks/postfix:/hooks:Z
|
|
|
- ./data/conf/postfix:/service_config:z
|
|
|
- - ./data/conf/postfix:/opt/postfix/conf:z
|
|
|
+ - ./data/conf/postfix/postscreen_access.cidr:/opt/postfix/conf/postscreen_access.cidr:z
|
|
|
- ./data/assets/ssl:/etc/ssl/mail/:ro,z
|
|
|
- postfix-vol-1:/var/spool/postfix
|
|
|
- crypt-vol-1:/var/lib/zeyple
|
|
@@ -390,6 +401,8 @@ services:
|
|
|
- REDISPASS=${REDISPASS}
|
|
|
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
|
|
|
- SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
|
|
|
+ - DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
|
|
|
+ - REDIS_HOST=${REDIS_HOST:-redis-mailcow}
|
|
|
cap_add:
|
|
|
- NET_BIND_SERVICE
|
|
|
ports:
|
|
@@ -440,8 +453,9 @@ services:
|
|
|
- DISABLE_IPv6=${DISABLE_IPv6:-n}
|
|
|
- HTTP_REDIRECT=${HTTP_REDIRECT:-n}
|
|
|
- PHPFPM_HOST=${PHPFPM_HOST:-php-fpm-mailcow}
|
|
|
- - RSPAM_DHOST=${RSPAMD_HOST:-rspamd-mailcow}
|
|
|
+ - RSPAMD_HOST=${RSPAMD_HOST:-rspamd-mailcow}
|
|
|
- SOGO_HOST=${SOGO_HOST:-${IPV4_NETWORK:-172.22.1}.248}
|
|
|
+ - DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
|
|
|
- REDIS_HOST=${REDIS_HOST:-redis-mailcow}
|
|
|
- IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
|
|
|
- NGINX_USE_PROXY_PROTOCOL=${NGINX_USE_PROXY_PROTOCOL:-n}
|
|
@@ -606,7 +620,7 @@ services:
|
|
|
- watchdog
|
|
|
|
|
|
dockerapi-mailcow:
|
|
|
- image: ghcr.io/mailcow/dockerapi:2.11
|
|
|
+ image: ghcr.io/mailcow/dockerapi:nightly-19052025
|
|
|
security_opt:
|
|
|
- label=disable
|
|
|
restart: always
|
|
@@ -618,6 +632,8 @@ services:
|
|
|
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
|
|
|
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
|
|
|
- REDISPASS=${REDISPASS}
|
|
|
+ - DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
|
|
|
+ - REDIS_HOST=${REDIS_HOST:-redis-mailcow}
|
|
|
volumes:
|
|
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
|
|
networks:
|