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

master
Tim Möhlmann 6 years ago
commit 3655c7c902
No known key found for this signature in database
GPG Key ID: 8677988D8072E8DE

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

Loading…
Cancel
Save