Add DOCKER_PREFIX in tests and setup files

6 years ago · d357ed67f5
parent 27f13c1ba3
commit d357ed67f5
9 changed files with 69 additions and 69 deletions
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@ -16,7 +16,7 @@ services:

  # Core services
  front:
-    image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-{{ version }}}
    restart: always
    env_file: {{ env }}
    logging:
@ -36,7 +36,7 @@ services:

  {% if resolver_enabled %}
  resolver:
-    image: mailu/unbound:{{ version }}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    restart: always
    networks:
@ -45,7 +45,7 @@ services:
  {% endif %}

  admin:
-    image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{ version }}}
    restart: always
    env_file: {{ env }}
    {% if not admin_enabled %}
@ -59,7 +59,7 @@ services:
      - redis

  imap:
-    image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-{{ version }}}
    restart: always
    env_file: {{ env }}
    volumes:
@ -69,7 +69,7 @@ services:
      - front

  smtp:
-    image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-{{ version }}}
    restart: always
    env_file: {{ env }}
    volumes:
@ -83,7 +83,7 @@ services:
    {% endif %}

  antispam:
-    image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-{{ version }}}
    restart: always
    env_file: {{ env }}
    volumes:
@ -101,7 +101,7 @@ services:
  # Optional services
  {% if antivirus_enabled %}
  antivirus:
-    image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-{{ version }}}
    restart: always
    env_file: {{ env }}
    volumes:
@ -116,7 +116,7 @@ services:

  {% if webdav_enabled %}
  webdav:
-    image: ${DOCKER_ORG:-mailu}/radicale:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-{{ version }}}
    restart: always
    env_file: {{ env }}
    volumes:
@ -125,7 +125,7 @@ services:

  {% if fetchmail_enabled %}
  fetchmail:
-    image: ${DOCKER_ORG:-mailu}/fetchmail:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-{{ version }}}
    restart: always
    env_file: {{ env }}
    {% if resolver_enabled %}
@ -139,7 +139,7 @@ services:
  # Webmail
  {% if webmail_type != 'none' %}
  webmail:
-    image: ${DOCKER_ORG:-mailu}/{{ webmail_type }}:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}{{ webmail_type }}:${MAILU_VERSION:-{{ version }}}
    restart: always
    env_file: {{ env }}
    volumes:
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@ -15,7 +15,7 @@ services:

 # Core services
  front:
-    image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    logging:
      driver: {{ log_driver or 'json-file' }}
@ -33,7 +33,7 @@ services:

  {% if resolver_enabled %}
  resolver:
-    image: ${DOCKER_ORG:-mailu}/unbound:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    networks:
      default:
@ -41,7 +41,7 @@ services:
  {% endif %}

  admin:
-    image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    {% if not admin_enabled %}
    ports:
@ -54,7 +54,7 @@ services:
      replicas: {{ admin_replicas }}

  imap:
-    image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    volumes:
      - "{{ root }}/mail:/mail"
@ -63,7 +63,7 @@ services:
      replicas: {{ imap_replicas }}

  smtp:
-    image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    volumes:
      - "{{ root }}/overrides:/overrides"
@ -75,7 +75,7 @@ services:
    {% endif %}

  antispam:
-    image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    volumes:
      - "{{ root }}/filter:/var/lib/rspamd"
@ -91,7 +91,7 @@ services:
  # Optional services
  {% if antivirus_enabled %}
  antivirus:
-    image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    volumes:
      - "{{ root }}/filter:/data"
@ -105,7 +105,7 @@ services:

  {% if webdav_enabled %}
  webdav:
-    image: ${DOCKER_ORG:-mailu}/none:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}none:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    volumes:
      - "{{ root }}/dav:/data"
@ -115,7 +115,7 @@ services:

  {% if fetchmail_enabled %}
  fetchmail:
-    image: ${DOCKER_ORG:-mailu}/fetchmail:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    volumes:
      - "{{ root }}/data:/data"
@ -129,7 +129,7 @@ services:

  {% if webmail_type != 'none' %}
  webmail:
-    image: ${DOCKER_ORG:-mailu}/{{ webmail_type }}:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}{{ webmail_type }}:${MAILU_VERSION:-{{ version }}}
    env_file: {{ env }}
    volumes:
      - "{{ root }}/webmail:/data"
--- a/tests/build.yml
+++ b/tests/build.yml
@ -3,61 +3,61 @@ version: '3'
 services:

  front:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}nginx:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-local}
    build: ../core/nginx

  resolver:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}unbound:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-local}
    build: ../services/unbound

  imap:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}dovecot:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-local}
    build: ../core/dovecot

  smtp:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}postfix:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-local}
    build: ../core/postfix

  antispam:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}rspamd:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-local}
    build: ../services/rspamd

  antivirus:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}clamav:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-local}
    build: ../optional/clamav

  webdav:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}radicale:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-local}
    build: ../optional/radicale

  admin:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}admin:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-local}
    build: ../core/admin

  roundcube:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}roundcube:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-local}
    build: ../webmails/roundcube

  rainloop:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}rainloop:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rainloop:${MAILU_VERSION:-local}
    build: ../webmails/rainloop

  fetchmail:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}fetchmail:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-local}
    build: ../services/fetchmail

  none:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}none:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}none:${MAILU_VERSION:-local}
    build: ../core/none

  docs:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}docs:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}docs:${MAILU_VERSION:-local}
    build:
      context: ../docs
      args:
        version: ${MAILU_VERSION:-local}

  setup:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}setup:${MAILU_VERSION:-local}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}setup:${MAILU_VERSION:-local}
    build: ../setup

--- a/tests/compose/core/docker-compose.yml
+++ b/tests/compose/core/docker-compose.yml
@ -15,7 +15,7 @@ services:

  # Core services
  front:
-    image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    logging:
@ -34,7 +34,7 @@ services:
      - "/mailu/certs:/certs"

  admin:
-    image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -44,7 +44,7 @@ services:
      - redis

  imap:
-    image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -54,7 +54,7 @@ services:
      - front

  smtp:
-    image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -63,7 +63,7 @@ services:
      - front

  antispam:
-    image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
--- a/tests/compose/fetchmail/docker-compose.yml
+++ b/tests/compose/fetchmail/docker-compose.yml
@ -15,7 +15,7 @@ services:

  # Core services
  front:
-    image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    logging:
@ -34,7 +34,7 @@ services:
      - "/mailu/certs:/certs"

  admin:
-    image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -44,7 +44,7 @@ services:
      - redis

  imap:
-    image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -54,7 +54,7 @@ services:
      - front

  smtp:
-    image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -63,7 +63,7 @@ services:
      - front

  antispam:
-    image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -77,7 +77,7 @@ services:


  fetchmail:
-    image: ${DOCKER_ORG:-mailu}/fetchmail:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env

--- a/tests/compose/filters/docker-compose.yml
+++ b/tests/compose/filters/docker-compose.yml
@ -15,7 +15,7 @@ services:

  # Core services
  front:
-    image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    logging:
@ -34,7 +34,7 @@ services:
      - "/mailu/certs:/certs"

  admin:
-    image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -44,7 +44,7 @@ services:
      - redis

  imap:
-    image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -54,7 +54,7 @@ services:
      - front

  smtp:
-    image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -63,7 +63,7 @@ services:
      - front

  antispam:
-    image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -75,7 +75,7 @@ services:

  # Optional services
  antivirus:
-    image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
--- a/tests/compose/rainloop/docker-compose.yml
+++ b/tests/compose/rainloop/docker-compose.yml
@ -15,7 +15,7 @@ services:

  # Core services
  front:
-    image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    logging:
@ -34,7 +34,7 @@ services:
      - "/mailu/certs:/certs"

  admin:
-    image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -44,7 +44,7 @@ services:
      - redis

  imap:
-    image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -54,7 +54,7 @@ services:
      - front

  smtp:
-    image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -63,7 +63,7 @@ services:
      - front

  antispam:
-    image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -79,7 +79,7 @@ services:

  # Webmail
  webmail:
-    image: ${DOCKER_ORG:-mailu}/rainloop:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rainloop:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
--- a/tests/compose/roundcube/docker-compose.yml
+++ b/tests/compose/roundcube/docker-compose.yml
@ -15,7 +15,7 @@ services:

  # Core services
  front:
-    image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    logging:
@ -34,7 +34,7 @@ services:
      - "/mailu/certs:/certs"

  admin:
-    image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -44,7 +44,7 @@ services:
      - redis

  imap:
-    image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -54,7 +54,7 @@ services:
      - front

  smtp:
-    image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -63,7 +63,7 @@ services:
      - front

  antispam:
-    image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -79,7 +79,7 @@ services:

  # Webmail
  webmail:
-    image: ${DOCKER_ORG:-mailu}/roundcube:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
--- a/tests/compose/webdav/docker-compose.yml
+++ b/tests/compose/webdav/docker-compose.yml
@ -15,7 +15,7 @@ services:

  # Core services
  front:
-    image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    logging:
@ -34,7 +34,7 @@ services:
      - "/mailu/certs:/certs"

  admin:
-    image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -44,7 +44,7 @@ services:
      - redis

  imap:
-    image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -54,7 +54,7 @@ services:
      - front

  smtp:
-    image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -63,7 +63,7 @@ services:
      - front

  antispam:
-    image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes:
@ -76,7 +76,7 @@ services:
  # Optional services

  webdav:
-    image: ${DOCKER_ORG:-mailu}/radicale:${MAILU_VERSION:-master}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-master}
    restart: always
    env_file: mailu.env
    volumes: