doh

3 years ago · 8595893af9
parent f4cb9de460
commit 8595893af9
5 changed files with 52 additions and 3 deletions
--- a/tests/compose/fetchmail/docker-compose.yml
+++ b/tests/compose/fetchmail/docker-compose.yml
@ -42,6 +42,9 @@ services:
      - "/mailu/dkim:/dkim"
    depends_on:
      - redis
+      - resolver
+    dns:
+      - 192.168.203.254

  imap:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${PINNED_MAILU_VERSION:-local}
@ -81,6 +84,15 @@ services:
    restart: always
    env_file: mailu.env

+  resolver:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-local}
+    env_file: mailu.env
+    restart: always
+    networks:
+      default:
+        ipv4_address: 192.168.203.254
+
+
  # Webmail


--- a/tests/compose/filters/docker-compose.yml
+++ b/tests/compose/filters/docker-compose.yml
@ -40,8 +40,11 @@ services:
    volumes:
      - "/mailu/data:/data"
      - "/mailu/dkim:/dkim"
+    dns:
+      - 192.168.203.254
    depends_on:
      - redis
+      - resolver

  imap:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${PINNED_MAILU_VERSION:-local}
@ -81,7 +84,13 @@ services:
    volumes:
      - "/mailu/filter:/data"

-
+  resolver:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-local}
+    env_file: mailu.env
+    restart: always
+    networks:
+      default:
+        ipv4_address: 192.168.203.254

  # Webmail

--- a/tests/compose/rainloop/docker-compose.yml
+++ b/tests/compose/rainloop/docker-compose.yml
@ -42,6 +42,9 @@ services:
      - "/mailu/dkim:/dkim"
    depends_on:
      - redis
+      - resolver
+    dns:
+      - 192.168.203.254

  imap:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${PINNED_MAILU_VERSION:-local}
@ -75,7 +78,13 @@ services:

  # Optional services

-
+  resolver:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-local}
+    env_file: mailu.env
+    restart: always
+    networks:
+      default:
+        ipv4_address: 192.168.203.254

  # Webmail
  webmail:
--- a/tests/compose/roundcube/docker-compose.yml
+++ b/tests/compose/roundcube/docker-compose.yml
@ -42,6 +42,9 @@ services:
      - "/mailu/dkim:/dkim"
    depends_on:
      - redis
+      - resolver
+    dns:
+      - 192.168.203.254

  imap:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${PINNED_MAILU_VERSION:-local}
@ -75,7 +78,13 @@ services:

  # Optional services

-
+  resolver:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-local}
+    env_file: mailu.env
+    restart: always
+    networks:
+      default:
+        ipv4_address: 192.168.203.254

  # Webmail
  webmail:
--- a/tests/compose/webdav/docker-compose.yml
+++ b/tests/compose/webdav/docker-compose.yml
@ -40,8 +40,11 @@ services:
    volumes:
      - "/mailu/data:/data"
      - "/mailu/dkim:/dkim"
+    dns:
+      - 192.168.203.254
    depends_on:
      - redis
+      - resolver

  imap:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${PINNED_MAILU_VERSION:-local}
@ -82,6 +85,13 @@ services:
    volumes:
      - "/mailu/dav:/data"

+  resolver:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-local}
+    env_file: mailu.env
+    restart: always
+    networks:
+      default:
+        ipv4_address: 192.168.203.254

  # Webmail