Merge branch 'main' of gitlab.sectorq.eu:home/docker-compose

This commit is contained in:
2025-05-19 10:11:35 +02:00
2 changed files with 73 additions and 73 deletions

View File

@ -20,10 +20,10 @@ networks:
services: services:
admin: admin:
depends_on: depends_on:
- redis - redis
- resolver - resolver
dns: dns:
- 192.168.205.254 - 192.168.205.254
env_file: stack.env env_file: stack.env
image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-2024.06} image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-2024.06}
labels: labels:
@ -31,17 +31,17 @@ services:
wud.watch.digest: true wud.watch.digest: true
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
volumes: volumes:
- /share/docker_data/mailu3/data:/data - /share/docker_data/mailu3/data:/data
- /share/docker_data/mailu3/dkim:/dkim - /share/docker_data/mailu3/dkim:/dkim
antispam: antispam:
depends_on: depends_on:
- front - front
- redis - redis
- oletools - oletools
- antivirus - antivirus
- resolver - resolver
dns: dns:
- 192.168.205.254 - 192.168.205.254
env_file: stack.env env_file: stack.env
hostname: antispam hostname: antispam
image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-2024.06} image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-2024.06}
@ -49,39 +49,39 @@ services:
wud.watch: true wud.watch: true
wud.watch.digest: true wud.watch.digest: true
networks: networks:
- default - default
- oletools - oletools
- clamav - clamav
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
volumes: volumes:
- /share/docker_data/mailu3/filter:/var/lib/rspamd - /share/docker_data/mailu3/filter:/var/lib/rspamd
- /share/docker_data/mailu3/overrides/rspamd:/overrides:ro - /share/docker_data/mailu3/overrides/rspamd:/overrides:ro
antivirus: antivirus:
healthcheck: healthcheck:
interval: 10s interval: 10s
retries: 3 retries: 3
start_period: 10s start_period: 10s
test: test:
- CMD-SHELL - CMD-SHELL
- kill -0 `cat /tmp/clamd.pid` && kill -0 `cat /tmp/freshclam.pid` - kill -0 `cat /tmp/clamd.pid` && kill -0 `cat /tmp/freshclam.pid`
timeout: 5s timeout: 5s
image: ${DOCKER_REGISTRY:-}clamav/clamav-debian:1.2.0-6 image: ${DOCKER_REGISTRY:-}clamav/clamav-debian:1.2.0-6
labels: labels:
wud.watch: true wud.watch: true
wud.watch.digest: true wud.watch.digest: true
networks: networks:
- clamav - clamav
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
volumes: volumes:
- /share/docker_data/mailu3/filter/clamav:/var/lib/clamav - /share/docker_data/mailu3/filter/clamav:/var/lib/clamav
fetchmail: fetchmail:
depends_on: depends_on:
- admin - admin
- smtp - smtp
- imap - imap
- resolver - resolver
dns: dns:
- 192.168.205.254 - 192.168.205.254
env_file: stack.env env_file: stack.env
image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-2024.06} image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-2024.06}
labels: labels:
@ -92,9 +92,9 @@ services:
- /share/docker_data/mailu3/data/fetchmail:/data - /share/docker_data/mailu3/data/fetchmail:/data
front: front:
depends_on: depends_on:
- resolver - resolver
dns: dns:
- 192.168.205.254 - 192.168.205.254
env_file: stack.env env_file: stack.env
extends: extends:
file: logging.yml file: logging.yml
@ -113,36 +113,36 @@ services:
homepage.weight: 1 homepage.weight: 1
networks: networks:
- default - default
- webmail - webmail
- radicale - radicale
ports: ports:
- 0.0.0.0:80:80 - 0.0.0.0:8880:80
- 0.0.0.0:443:443 - 0.0.0.0:8443:443
- 0.0.0.0:25:25 - 0.0.0.0:25:25
- 0.0.0.0:465:465 - 0.0.0.0:465:465
- 0.0.0.0:587:587 - 0.0.0.0:587:587
- 0.0.0.0:110:110 - 0.0.0.0:110:110
- 0.0.0.0:995:995 - 0.0.0.0:995:995
- 0.0.0.0:143:143 - 0.0.0.0:143:143
- 0.0.0.0:993:993 - 0.0.0.0:993:993
- 0.0.0.0:4190:4190 - 0.0.0.0:4190:4190
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
volumes: volumes:
- /share/docker_data/mailu3/certs:/certs - /share/docker_data/mailu3/certs:/certs
- /share/docker_data/mailu3/overrides/nginx:/overrides:ro - /share/docker_data/mailu3/overrides/nginx:/overrides:ro
fts_attachments: fts_attachments:
depends_on: depends_on:
- resolver - resolver
dns: dns:
- 192.168.205.254 - 192.168.205.254
healthcheck: healthcheck:
interval: 10s interval: 10s
retries: 3 retries: 3
start_period: 10s start_period: 10s
test: test:
- CMD-SHELL - CMD-SHELL
- wget -nv -t1 -O /dev/null http://127.0.0.1:9998/tika || exit 1 - wget -nv -t1 -O /dev/null http://127.0.0.1:9998/tika || exit 1
timeout: 5s timeout: 5s
hostname: tika hostname: tika
image: ${DOCKER_REGISTRY:-}apache/tika:2.9.2.1-full image: ${DOCKER_REGISTRY:-}apache/tika:2.9.2.1-full
@ -150,45 +150,45 @@ services:
wud.watch: true wud.watch: true
wud.watch.digest: true wud.watch.digest: true
networks: networks:
- fts_attachments - fts_attachments
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
imap: imap:
depends_on: depends_on:
- front - front
- fts_attachments - fts_attachments
- resolver - resolver
dns: dns:
- 192.168.205.254 - 192.168.205.254
env_file: stack.env env_file: stack.env
image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-2024.06} image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-2024.06}
labels: labels:
wud.watch: true wud.watch: true
wud.watch.digest: true wud.watch.digest: true
networks: networks:
- default - default
- fts_attachments - fts_attachments
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
volumes: volumes:
- /share/docker_data/mailu3/mail:/mail - /share/docker_data/mailu3/mail:/mail
- /share/docker_data/mailu3/overrides/dovecot:/overrides:ro - /share/docker_data/mailu3/overrides/dovecot:/overrides:ro
oletools: oletools:
depends_on: depends_on:
- resolver - resolver
dns: dns:
- 192.168.205.254 - 192.168.205.254
hostname: oletools hostname: oletools
image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}oletools:${MAILU_VERSION:-2024.06} image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}oletools:${MAILU_VERSION:-2024.06}
labels: labels:
wud.watch: true wud.watch: true
wud.watch.digest: true wud.watch.digest: true
networks: networks:
- oletools - oletools
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
redis: redis:
depends_on: depends_on:
- resolver - resolver
dns: dns:
- 192.168.205.254 - 192.168.205.254
image: ${DOCKER_REGISTRY:-}redis:alpine image: ${DOCKER_REGISTRY:-}redis:alpine
labels: labels:
wud.watch: true wud.watch: true
@ -208,10 +208,10 @@ services:
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
smtp: smtp:
depends_on: depends_on:
- front - front
- resolver - resolver
dns: dns:
- 192.168.205.254 - 192.168.205.254
env_file: stack.env env_file: stack.env
image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-2024.06} image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-2024.06}
labels: labels:
@ -219,29 +219,29 @@ services:
wud.watch.digest: true wud.watch.digest: true
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
volumes: volumes:
- /share/docker_data/mailu3/mailqueue:/queue - /share/docker_data/mailu3/mailqueue:/queue
- /share/docker_data/mailu3/overrides/postfix:/overrides:ro - /share/docker_data/mailu3/overrides/postfix:/overrides:ro
webdav: webdav:
image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-2024.06} image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-2024.06}
labels: labels:
wud.watch: true wud.watch: true
wud.watch.digest: true wud.watch.digest: true
networks: networks:
- radicale - radicale
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
volumes: volumes:
- /share/docker_data/mailu3/dav:/data - /share/docker_data/mailu3/dav:/data
webmail: webmail:
depends_on: depends_on:
- front - front
env_file: stack.env env_file: stack.env
image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}webmail:${MAILU_VERSION:-2024.06} image: ${DOCKER_REGISTRY:-}ghcr.io/mailu/${DOCKER_PREFIX:-}webmail:${MAILU_VERSION:-2024.06}
labels: labels:
wud.watch: true wud.watch: true
wud.watch.digest: true wud.watch.digest: true
networks: networks:
- webmail - webmail
restart: ${RESTART:-unless-stopped} restart: ${RESTART:-unless-stopped}
volumes: volumes:
- /share/docker_data/mailu3/webmail:/data - /share/docker_data/mailu3/webmail:/data
- /share/docker_data/mailu3/overrides/roundcube:/overrides:ro - /share/docker_data/mailu3/overrides/roundcube:/overrides:ro

View File

@ -24,8 +24,8 @@ HOSTNAMES=sectorq.eu,mail.sectorq.eu
POSTMASTER=admin POSTMASTER=admin
# Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt) # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
TLS_FLAVOR=cert #TLS_FLAVOR=cert
#TLS_FLAVOR=letsencrypt TLS_FLAVOR=letsencrypt
# Authentication rate limit per IP (per /24 on ipv4 and /48 on ipv6) # Authentication rate limit per IP (per /24 on ipv4 and /48 on ipv6)
AUTH_RATELIMIT_IP=5/hour AUTH_RATELIMIT_IP=5/hour