Moved postgresql image in optional

master
Ionut Filip 6 years ago
parent dd16ed4cba
commit 7809d1373a

@ -14,16 +14,6 @@ services:
volumes: volumes:
- "{{ root }}/redis:/data" - "{{ root }}/redis:/data"
{% if db_flavor == 'postgresql' and postgresql == 'internal' %}
database:
image: ${DOCKER_ORG:-mailu}/postgresql:${MAILU_VERSION:-{{ version }}}
restart: always
env_file: {{ env }}
volumes:
- "{{ root }}/data/psql_db:/data"
- "{{ root }}/data/psql_backup:/backup"
{% endif %}
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}}
@ -157,6 +147,16 @@ services:
- imap - imap
{% endif %} {% endif %}
{% if db_flavor == 'postgresql' and postgresql == 'internal' %}
database:
image: ${DOCKER_ORG:-mailu}/postgresql:${MAILU_VERSION:-{{ version }}}
restart: always
env_file: {{ env }}
volumes:
- "{{ root }}/data/psql_db:/data"
- "{{ root }}/data/psql_backup:/backup"
{% endif %}
{% if resolver_enabled or db_flavor == 'postgresql' %} {% if resolver_enabled or db_flavor == 'postgresql' %}
networks: networks:
default: default:

@ -13,12 +13,6 @@ services:
volumes: volumes:
- "{{ root }}/redis:/data" - "{{ root }}/redis:/data"
{% if db_flavor == 'postgresql' and postgresql == 'internal' %}
database:
image: ${DOCKER_ORG:-mailu}/postgresql:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }}
{% endif %}
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}}
@ -149,6 +143,14 @@ services:
replicas: 1 replicas: 1
{% endif %} {% endif %}
{% if db_flavor == 'postgresql' and postgresql == 'internal' %}
database:
image: ${DOCKER_ORG:-mailu}/postgresql:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }}
volumes:
- "{{ root }}/data/psql_backup:/backup"
{% endif %}
networks: networks:
default: default:
driver: overlay driver: overlay

Loading…
Cancel
Save