1
0
mirror of https://github.com/Mailu/Mailu.git synced 2025-03-17 20:57:54 +02:00

Merge remote-tracking branch 'origin/fix-setup-bugs' into setup-deploy

This commit is contained in:
Tim Möhlmann 2018-12-16 16:27:11 +02:00
commit 3655c7c902
No known key found for this signature in database
GPG Key ID: 8677988D8072E8DE

View File

@ -33,7 +33,7 @@ services:
{% if resolver_enabled %}
resolver:
image: mailu/unbound:{{ version }}
image: ${DOCKER_ORG:-mailu}/unbound:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }}
networks:
default:
@ -56,7 +56,6 @@ services:
imap:
image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }}
environment:
volumes:
- "{{ root }}/mail:/mail"
- "{{ root }}/overrides:/overrides"
@ -130,7 +129,7 @@ services:
{% if webmail_type != 'none' %}
webmail:
image: ${DOCKER_ORG:-mailu}/roundcube:${MAILU_VERSION:-{{ version }}}
image: ${DOCKER_ORG:-mailu}/{{ webmail_type }}:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }}
volumes:
- "{{ root }}/webmail:/data"