scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-03 19:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #772 from dani909/fix-docker-prefix

Browse Source 
Add docker image prefix in tests and setup utility
This commit is contained in:
Tim Möhlmann
2018-12-31 18:07:33 +02:00
committed by GitHub
parent b91cfd3b41 16c47faf35
commit 0c0d56c545
9 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
setup/flavors/compose/docker-compose.yml
View File

@@ -16,7 +16,7 @@ services:
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
logging: logging:
@@ -36,7 +36,7 @@ services:
{% if resolver_enabled %} {% if resolver_enabled %}
resolver: resolver:
image: mailu/unbound:{{ version }} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
restart: always restart: always
networks: networks:
@@ -45,7 +45,7 @@ services:
{% endif %} {% endif %}
admin: admin:
image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
{% if not admin_enabled %} {% if not admin_enabled %}
@@ -59,7 +59,7 @@ services:
- redis - redis
imap: imap:
image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
@@ -69,7 +69,7 @@ services:
- front - front
smtp: smtp:
image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
@@ -83,7 +83,7 @@ services:
{% endif %} {% endif %}
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
@@ -101,7 +101,7 @@ services:
# Optional services # Optional services
{% if antivirus_enabled %} {% if antivirus_enabled %}
antivirus: antivirus:
image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
@@ -116,7 +116,7 @@ services:
{% if webdav_enabled %} {% if webdav_enabled %}
webdav: webdav:
image: ${DOCKER_ORG:-mailu}/radicale:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
@@ -125,7 +125,7 @@ services:
{% if fetchmail_enabled %} {% if fetchmail_enabled %}
fetchmail: fetchmail:
image: ${DOCKER_ORG:-mailu}/fetchmail:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
{% if resolver_enabled %} {% if resolver_enabled %}
@@ -139,7 +139,7 @@ services:
# Webmail # Webmail
{% if webmail_type != 'none' %} {% if webmail_type != 'none' %}
webmail: webmail:
image: ${DOCKER_ORG:-mailu}/{{ webmail_type }}:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}{{ webmail_type }}:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:

20
setup/flavors/stack/docker-compose.yml
View File

@@ -15,7 +15,7 @@ services:
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
logging: logging:
driver: {{ log_driver or 'json-file' }} driver: {{ log_driver or 'json-file' }}
@@ -33,7 +33,7 @@ services:
{% if resolver_enabled %} {% if resolver_enabled %}
resolver: resolver:
image: ${DOCKER_ORG:-mailu}/unbound:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
networks: networks:
default: default:
@@ -41,7 +41,7 @@ services:
{% endif %} {% endif %}
admin: admin:
image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
{% if not admin_enabled %} {% if not admin_enabled %}
ports: ports:
@@ -54,7 +54,7 @@ services:
replicas: {{ admin_replicas }} replicas: {{ admin_replicas }}
imap: imap:
image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/mail:/mail" - "{{ root }}/mail:/mail"
@@ -63,7 +63,7 @@ services:
replicas: {{ imap_replicas }} replicas: {{ imap_replicas }}
smtp: smtp:
image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/overrides:/overrides" - "{{ root }}/overrides:/overrides"
@@ -75,7 +75,7 @@ services:
{% endif %} {% endif %}
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/filter:/var/lib/rspamd" - "{{ root }}/filter:/var/lib/rspamd"
@@ -91,7 +91,7 @@ services:
# Optional services # Optional services
{% if antivirus_enabled %} {% if antivirus_enabled %}
antivirus: antivirus:
image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/filter:/data" - "{{ root }}/filter:/data"
@@ -105,7 +105,7 @@ services:
{% if webdav_enabled %} {% if webdav_enabled %}
webdav: webdav:
image: ${DOCKER_ORG:-mailu}/none:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/dav:/data" - "{{ root }}/dav:/data"
@@ -115,7 +115,7 @@ services:
{% if fetchmail_enabled %} {% if fetchmail_enabled %}
fetchmail: fetchmail:
image: ${DOCKER_ORG:-mailu}/fetchmail:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/data:/data" - "{{ root }}/data:/data"
@@ -129,7 +129,7 @@ services:
{% if webmail_type != 'none' %} {% if webmail_type != 'none' %}
webmail: webmail:
image: ${DOCKER_ORG:-mailu}/{{ webmail_type }}:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}{{ webmail_type }}:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/webmail:/data" - "{{ root }}/webmail:/data"

30
tests/build.yml
View File

@@ -3,65 +3,65 @@ version: '3'
services: services:
front: front:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}nginx:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-local}
build: ../core/nginx build: ../core/nginx
resolver: resolver:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}unbound:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-local}
build: ../services/unbound build: ../services/unbound
imap: imap:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}dovecot:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-local}
build: ../core/dovecot build: ../core/dovecot
smtp: smtp:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}postfix:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-local}
build: ../core/postfix build: ../core/postfix
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}rspamd:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-local}
build: ../services/rspamd build: ../services/rspamd
antivirus: antivirus:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}clamav:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-local}
build: ../optional/clamav build: ../optional/clamav
webdav: webdav:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}radicale:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-local}
build: ../optional/radicale build: ../optional/radicale
traefik-certdumper: traefik-certdumper:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}traefik-certdumper:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}traefik-certdumper:${MAILU_VERSION:-local}
build: ../optional/traefik-certdumper build: ../optional/traefik-certdumper
admin: admin:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}admin:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-local}
build: ../core/admin build: ../core/admin
roundcube: roundcube:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}roundcube:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-local}
build: ../webmails/roundcube build: ../webmails/roundcube
rainloop: rainloop:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}rainloop:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rainloop:${MAILU_VERSION:-local}
build: ../webmails/rainloop build: ../webmails/rainloop
fetchmail: fetchmail:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}fetchmail:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-local}
build: ../services/fetchmail build: ../services/fetchmail
none: none:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}none:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}none:${MAILU_VERSION:-local}
build: ../core/none build: ../core/none
docs: docs:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}docs:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}docs:${MAILU_VERSION:-local}
build: build:
context: ../docs context: ../docs
args: args:
version: ${MAILU_VERSION:-local} version: ${MAILU_VERSION:-local}
setup: setup:
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}setup:${MAILU_VERSION:-local} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}setup:${MAILU_VERSION:-local}
build: ../setup build: ../setup

10
tests/compose/core/docker-compose.yml
View File

@@ -15,7 +15,7 @@ services:
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
logging: logging:
@@ -34,7 +34,7 @@ services:
- "/mailu/certs:/certs" - "/mailu/certs:/certs"
admin: admin:
image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -44,7 +44,7 @@ services:
- redis - redis
imap: imap:
image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -54,7 +54,7 @@ services:
- front - front
smtp: smtp:
image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -63,7 +63,7 @@ services:
- front - front
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:

12
tests/compose/fetchmail/docker-compose.yml
View File

@@ -15,7 +15,7 @@ services:
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
logging: logging:
@@ -34,7 +34,7 @@ services:
- "/mailu/certs:/certs" - "/mailu/certs:/certs"
admin: admin:
image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -44,7 +44,7 @@ services:
- redis - redis
imap: imap:
image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -54,7 +54,7 @@ services:
- front - front
smtp: smtp:
image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -63,7 +63,7 @@ services:
- front - front
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -77,7 +77,7 @@ services:
fetchmail: fetchmail:
image: ${DOCKER_ORG:-mailu}/fetchmail:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env

12
tests/compose/filters/docker-compose.yml
View File

@@ -15,7 +15,7 @@ services:
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
logging: logging:
@@ -34,7 +34,7 @@ services:
- "/mailu/certs:/certs" - "/mailu/certs:/certs"
admin: admin:
image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -44,7 +44,7 @@ services:
- redis - redis
imap: imap:
image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -54,7 +54,7 @@ services:
- front - front
smtp: smtp:
image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -63,7 +63,7 @@ services:
- front - front
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -75,7 +75,7 @@ services:
# Optional services # Optional services
antivirus: antivirus:
image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:

12
tests/compose/rainloop/docker-compose.yml
View File

@@ -15,7 +15,7 @@ services:
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
logging: logging:
@@ -34,7 +34,7 @@ services:
- "/mailu/certs:/certs" - "/mailu/certs:/certs"
admin: admin:
image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -44,7 +44,7 @@ services:
- redis - redis
imap: imap:
image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -54,7 +54,7 @@ services:
- front - front
smtp: smtp:
image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -63,7 +63,7 @@ services:
- front - front
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -79,7 +79,7 @@ services:
# Webmail # Webmail
webmail: webmail:
image: ${DOCKER_ORG:-mailu}/rainloop:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rainloop:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:

12
tests/compose/roundcube/docker-compose.yml
View File

@@ -15,7 +15,7 @@ services:
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
logging: logging:
@@ -34,7 +34,7 @@ services:
- "/mailu/certs:/certs" - "/mailu/certs:/certs"
admin: admin:
image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -44,7 +44,7 @@ services:
- redis - redis
imap: imap:
image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -54,7 +54,7 @@ services:
- front - front
smtp: smtp:
image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -63,7 +63,7 @@ services:
- front - front
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -79,7 +79,7 @@ services:
# Webmail # Webmail
webmail: webmail:
image: ${DOCKER_ORG:-mailu}/roundcube:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:

12
tests/compose/webdav/docker-compose.yml
View File

@@ -15,7 +15,7 @@ services:
# Core services # Core services
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
logging: logging:
@@ -34,7 +34,7 @@ services:
- "/mailu/certs:/certs" - "/mailu/certs:/certs"
admin: admin:
image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -44,7 +44,7 @@ services:
- redis - redis
imap: imap:
image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -54,7 +54,7 @@ services:
- front - front
smtp: smtp:
image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -63,7 +63,7 @@ services:
- front - front
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes:
@@ -76,7 +76,7 @@ services:
# Optional services # Optional services
webdav: webdav:
image: ${DOCKER_ORG:-mailu}/radicale:${MAILU_VERSION:-master} image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-master}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
volumes: volumes: