public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-10-07 18:12:36 +00:00
Code Issues Releases Wiki Activity

migrate from redis to valkey

Browse Source
This commit is contained in:
FreddleSpl0it
2025-02-28 15:36:19 +01:00
parent 35a6f81d0d
commit c27000215e
80 changed files with 754 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.yml
+54 -53
View File
@@ -41,28 +41,29 @@ services:
aliases:
- mysql
redis-mailcow:
image: redis:7.4.2-alpine
entrypoint: ["/bin/sh","/redis-conf.sh"]
valkey-mailcow:
image: valkey/valkey:7.2.8-alpine
entrypoint: ["/bin/sh","/valkey-conf.sh"]
command: ["valkey-server", "/valkey.conf"]
volumes:
- redis-vol-1:/data/
- ./data/conf/redis/redis-conf.sh:/redis-conf.sh:z
- valkey-vol-1:/data/
- ./data/conf/valkey/valkey-conf.sh:/valkey-conf.sh:z
restart: always
depends_on:
- netfilter-mailcow
ports:
- "${REDIS_PORT:-127.0.0.1:7654}:6379"
- "${VALKEY_PORT:-127.0.0.1:7654}:6379"
environment:
- TZ=${TZ}
- REDISPASS=${REDISPASS}
- REDISMASTERPASS=${REDISMASTERPASS:-}
- VALKEYPASS=${VALKEYPASS}
- VALKEYMASTERPASS=${VALKEYMASTERPASS:-}
sysctls:
- net.core.somaxconn=4096
networks:
mailcow-network:
ipv4_address: ${IPV4_NETWORK:-172.22.1}.249
aliases:
- redis
- valkey
clamd-mailcow:
image: ghcr.io/mailcow/clamd:1.70
@@ -84,7 +85,7 @@ services:
- clamd
rspamd-mailcow:
image: ghcr.io/mailcow/rspamd:2.0
image: ghcr.io/mailcow/rspamd:2.01
stop_grace_period: 30s
depends_on:
- dovecot-mailcow
@@ -93,9 +94,9 @@ services:
- TZ=${TZ}
- IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
- IPV6_NETWORK=${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS}
- VALKEY_SLAVEOF_IP=${VALKEY_SLAVEOF_IP:-}
- VALKEY_SLAVEOF_PORT=${VALKEY_SLAVEOF_PORT:-}
- VALKEYPASS=${VALKEYPASS}
- SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
volumes:
- ./data/hooks/rspamd:/hooks:Z
@@ -117,10 +118,10 @@ services:
- rspamd
php-fpm-mailcow:
image: ghcr.io/mailcow/phpfpm:1.92
image: ghcr.io/mailcow/phpfpm:1.93
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
depends_on:
- redis-mailcow
- valkey-mailcow
volumes:
- ./data/hooks/phpfpm:/hooks:Z
- ./data/web:/web:z
@@ -142,9 +143,9 @@ services:
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment:
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS}
- VALKEY_SLAVEOF_IP=${VALKEY_SLAVEOF_IP:-}
- VALKEY_SLAVEOF_PORT=${VALKEY_SLAVEOF_PORT:-}
- VALKEYPASS=${VALKEYPASS}
- LOG_LINES=${LOG_LINES:-9999}
- TZ=${TZ}
- DBNAME=${DBNAME}
@@ -183,7 +184,7 @@ services:
- phpfpm
sogo-mailcow:
image: ghcr.io/mailcow/sogo:1.129
image: ghcr.io/mailcow/sogo:1.130
environment:
- DBNAME=${DBNAME}
- DBUSER=${DBUSER}
@@ -198,9 +199,9 @@ services:
- SOGO_EXPIRE_SESSION=${SOGO_EXPIRE_SESSION:-480}
- SKIP_SOGO=${SKIP_SOGO:-n}
- MASTER=${MASTER:-y}
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS}
- VALKEY_SLAVEOF_IP=${VALKEY_SLAVEOF_IP:-}
- VALKEY_SLAVEOF_PORT=${VALKEY_SLAVEOF_PORT:-}
- VALKEYPASS=${VALKEYPASS}
dns:
- ${IPV4_NETWORK:-172.22.1}.254
volumes:
@@ -234,11 +235,11 @@ services:
- sogo
dovecot-mailcow:
image: ghcr.io/mailcow/dovecot:2.31
image: ghcr.io/mailcow/dovecot:2.32
depends_on:
- mysql-mailcow
- netfilter-mailcow
- redis-mailcow
- valkey-mailcow
dns:
- ${IPV4_NETWORK:-172.22.1}.254
cap_add:
@@ -277,9 +278,9 @@ services:
- FTS_PROCS=${FTS_PROCS:-3}
- MAILDIR_SUB=${MAILDIR_SUB:-}
- MASTER=${MASTER:-y}
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS}
- VALKEY_SLAVEOF_IP=${VALKEY_SLAVEOF_IP:-}
- VALKEY_SLAVEOF_PORT=${VALKEY_SLAVEOF_PORT:-}
- VALKEYPASS=${VALKEYPASS}
- COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-mailcow-dockerized}
ports:
- "${DOVEADM_PORT:-127.0.0.1:19991}:12345"
@@ -321,7 +322,7 @@ services:
- dovecot
postfix-mailcow:
image: ghcr.io/mailcow/postfix:1.80
image: ghcr.io/mailcow/postfix:1.81
depends_on:
mysql-mailcow:
condition: service_started
@@ -341,9 +342,9 @@ services:
- DBNAME=${DBNAME}
- DBUSER=${DBUSER}
- DBPASS=${DBPASS}
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS}
- VALKEY_SLAVEOF_IP=${VALKEY_SLAVEOF_IP:-}
- VALKEY_SLAVEOF_PORT=${VALKEY_SLAVEOF_PORT:-}
- VALKEYPASS=${VALKEYPASS}
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
- SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
cap_add:
@@ -373,7 +374,7 @@ services:
nginx-mailcow:
depends_on:
- redis-mailcow
- valkey-mailcow
- php-fpm-mailcow
- sogo-mailcow
- rspamd-mailcow
@@ -393,7 +394,7 @@ services:
- PHPFPMHOST=${PHPFPMHOST:-}
- SOGOHOST=${SOGOHOST:-}
- RSPAMDHOST=${RSPAMDHOST:-}
- REDISHOST=${REDISHOST:-}
- VALKEYHOST=${VALKEYHOST:-}
- IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
- NGINX_USE_PROXY_PROTOCOL=${NGINX_USE_PROXY_PROTOCOL:-n}
- TRUSTED_PROXIES=${TRUSTED_PROXIES:-}
@@ -419,7 +420,7 @@ services:
condition: service_started
unbound-mailcow:
condition: service_healthy
image: ghcr.io/mailcow/acme:1.91
image: ghcr.io/mailcow/acme:1.92
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment:
@@ -440,9 +441,9 @@ services:
- ONLY_MAILCOW_HOSTNAME=${ONLY_MAILCOW_HOSTNAME:-n}
- LE_STAGING=${LE_STAGING:-n}
- TZ=${TZ}
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS}
- VALKEY_SLAVEOF_IP=${VALKEY_SLAVEOF_IP:-}
- VALKEY_SLAVEOF_PORT=${VALKEY_SLAVEOF_PORT:-}
- VALKEYPASS=${VALKEYPASS}
- SNAT_TO_SOURCE=${SNAT_TO_SOURCE:-n}
- SNAT6_TO_SOURCE=${SNAT6_TO_SOURCE:-n}
volumes:
@@ -457,7 +458,7 @@ services:
- acme
netfilter-mailcow:
image: ghcr.io/mailcow/netfilter:1.61
image: ghcr.io/mailcow/netfilter:1.62
stop_grace_period: 30s
restart: always
privileged: true
@@ -467,9 +468,9 @@ services:
- IPV6_NETWORK=${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
- SNAT_TO_SOURCE=${SNAT_TO_SOURCE:-n}
- SNAT6_TO_SOURCE=${SNAT6_TO_SOURCE:-n}
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS}
- VALKEY_SLAVEOF_IP=${VALKEY_SLAVEOF_IP:-}
- VALKEY_SLAVEOF_PORT=${VALKEY_SLAVEOF_PORT:-}
- VALKEYPASS=${VALKEYPASS}
- MAILCOW_REPLICA_IP=${MAILCOW_REPLICA_IP:-}
- DISABLE_NETFILTER_ISOLATION_RULE=${DISABLE_NETFILTER_ISOLATION_RULE:-n}
network_mode: "host"
@@ -477,7 +478,7 @@ services:
- /lib/modules:/lib/modules:ro
watchdog-mailcow:
image: ghcr.io/mailcow/watchdog:2.06
image: ghcr.io/mailcow/watchdog:2.07
dns:
- ${IPV4_NETWORK:-172.22.1}.254
tmpfs:
@@ -493,7 +494,7 @@ services:
- dovecot-mailcow
- mysql-mailcow
- acme-mailcow
- redis-mailcow
- valkey-mailcow
environment:
- IPV6_NETWORK=${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
- LOG_LINES=${LOG_LINES:-9999}
@@ -521,13 +522,13 @@ services:
- SKIP_LETS_ENCRYPT=${SKIP_LETS_ENCRYPT:-n}
- SKIP_SOGO=${SKIP_SOGO:-n}
- HTTPS_PORT=${HTTPS_PORT:-443}
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS}
- VALKEY_SLAVEOF_IP=${VALKEY_SLAVEOF_IP:-}
- VALKEY_SLAVEOF_PORT=${VALKEY_SLAVEOF_PORT:-}
- VALKEYPASS=${VALKEYPASS}
- EXTERNAL_CHECKS_THRESHOLD=${EXTERNAL_CHECKS_THRESHOLD:-1}
- NGINX_THRESHOLD=${NGINX_THRESHOLD:-5}
- UNBOUND_THRESHOLD=${UNBOUND_THRESHOLD:-5}
- REDIS_THRESHOLD=${REDIS_THRESHOLD:-5}
- VALKEY_THRESHOLD=${VALKEY_THRESHOLD:-5}
- MYSQL_THRESHOLD=${MYSQL_THRESHOLD:-5}
- MYSQL_REPLICATION_THRESHOLD=${MYSQL_REPLICATION_THRESHOLD:-1}
- SOGO_THRESHOLD=${SOGO_THRESHOLD:-3}
@@ -549,7 +550,7 @@ services:
- watchdog
dockerapi-mailcow:
image: ghcr.io/mailcow/dockerapi:2.10
image: ghcr.io/mailcow/dockerapi:2.11
security_opt:
- label=disable
restart: always
@@ -558,9 +559,9 @@ services:
environment:
- DBROOT=${DBROOT}
- TZ=${TZ}
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS}
- VALKEY_SLAVEOF_IP=${VALKEY_SLAVEOF_IP:-}
- VALKEY_SLAVEOF_PORT=${VALKEY_SLAVEOF_PORT:-}
- VALKEYPASS=${VALKEYPASS}
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
networks:
@@ -611,7 +612,7 @@ services:
depends_on:
- unbound-mailcow
- mysql-mailcow
- redis-mailcow
- valkey-mailcow
- clamd-mailcow
- rspamd-mailcow
- php-fpm-mailcow
@@ -653,7 +654,7 @@ volumes:
vmail-index-vol-1:
mysql-vol-1:
mysql-socket-vol-1:
redis-vol-1:
valkey-vol-1:
rspamd-vol-1:
postfix-vol-1:
crypt-vol-1: