Adapted composer file for Mailu 2.0

This commit is contained in:
Kevin Veen-Birkenbach 2023-04-15 19:48:46 +02:00
parent dea7800c54
commit 3508baebac
2 changed files with 28 additions and 13 deletions

View File

@ -37,7 +37,7 @@ services:
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-{{mailu_version}}} image: ghcr.io/mailu/nginx:{{mailu_version}}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
logging: logging:
@ -52,13 +52,13 @@ services:
- "{{ ip4_address }}:143:143" - "{{ ip4_address }}:143:143"
- "{{ ip4_address }}:993:993" - "{{ ip4_address }}:993:993"
volumes: volumes:
- "/etc/mailu/overrides/nginx:/overrides" - "/etc/mailu/overrides/nginx:/overrides:ro"
- "/etc/mailu/certs:/certs" - "/etc/mailu/certs:/certs"
depends_on: depends_on:
database: database:
condition: service_healthy condition: service_healthy
admin: admin:
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{mailu_version}}} image: ghcr.io/mailu/admin:{{mailu_version}}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@ -70,37 +70,42 @@ services:
logging: logging:
driver: journald driver: journald
imap: imap:
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-{{mailu_version}}} image: ghcr.io/mailu/dovecot:{{mailu_version}}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
- "dovecot_mail:/mail" - "dovecot_mail:/mail"
- "/etc/mailu/overrides:/overrides" - "/etc/mailu/overrides:/overrides:ro"
depends_on: depends_on:
- front - front
logging: logging:
driver: journald driver: journald
smtp: smtp:
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-{{mailu_version}}} image: ghcr.io/mailu/postfix:{{mailu_version}}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
- "/etc/mailu/overrides:/overrides" - "/etc/mailu/overrides:/overrides:ro"
- "smtp_queue:/queue" - "smtp_queue:/queue"
depends_on: depends_on:
- front - front
logging: logging:
driver: journald driver: journald
oletools:
image: ghcr.io/mailu/oletools:{{mailu_version}}
hostname: oletools
restart: always
antispam: antispam:
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-{{mailu_version}}} image: ghcr.io/mailu/rspamd:{{mailu_version}}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
- "filter:/var/lib/rspamd" - "filter:/var/lib/rspamd"
- "dkim:/dkim" - "dkim:/dkim"
- "/etc/mailu/overrides/rspamd:/etc/rspamd/override.d" - "/etc/mailu/overrides/rspamd:/overrides:ro"
depends_on: depends_on:
- front - front
- redis - redis
@ -110,7 +115,7 @@ services:
# Optional services # Optional services
antivirus: antivirus:
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-{{mailu_version}}} image: ghcr.io/mailu/clamav:{{mailu_version}}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@ -119,7 +124,7 @@ services:
driver: journald driver: journald
webdav: webdav:
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-{{mailu_version}}} image: ghcr.io/mailu/radicale:{{mailu_version}}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@ -128,21 +133,28 @@ services:
driver: journald driver: journald
fetchmail: fetchmail:
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-{{mailu_version}}} image: ghcr.io/mailu/fetchmail:{{mailu_version}}
volumes:
- "admin_data:/data"
restart: always restart: always
env_file: mailu.env env_file: mailu.env
logging: logging:
driver: journald driver: journald
depends_on:
- admin
- smtp
- imap
# Webmail # Webmail
webmail: webmail:
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-{{mailu_version}}} image: ghcr.io/mailu/webmail:{{mailu_version}}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
- "webmail_data:/data" - "webmail_data:/data"
depends_on: depends_on:
- imap - imap
- front
logging: logging:
driver: journald driver: journald
volumes: volumes:

View File

@ -149,3 +149,6 @@ ROUNDCUBE_DB_USER=mailu
ROUNDCUBE_DB_PW={{mailu_database_password}} ROUNDCUBE_DB_PW={{mailu_database_password}}
ROUNDCUBE_DB_NAME=mailu ROUNDCUBE_DB_NAME=mailu
ROUNDCUBE_DB_HOST=database:3306 ROUNDCUBE_DB_HOST=database:3306
API_TOKEN={{mailu_api_token}}