Correct subnetting functionality for the tests and setup

setup/flavors/compose/docker-compose.yml

@@ -147,7 +147,6 @@ services:
       - imap
   {% endif %}
 
-{% if resolver_enabled %}
 networks:
   default:
     driver: bridge
@@ -155,4 +154,3 @@ networks:
       driver: default
       config:
         - subnet: {{ subnet }}
-{% endif %}

setup/flavors/compose/mailu.env

@@ -26,7 +26,7 @@ SECRET_KEY={{ secret(16) }}
 # PUBLIC_IPV6= {{ bind6 }} (default: ::1)
 
 # Subnet of the docker network. This should not conflict with any networks to which your system is connected. (Internal and external!)
-SUBNET=192.168.203.0/24
+SUBNET={{ subnet }}
 
 # Main mail domain
 DOMAIN={{ domain }}

tests/compose/core/docker-compose.yml

@@ -78,3 +78,12 @@ services:
 
 
   # Webmail
+
+
+networks:
+  default:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 192.168.203.0/24

tests/compose/fetchmail/docker-compose.yml

@@ -82,3 +82,12 @@ services:
     env_file: mailu.env
 
   # Webmail
+
+
+networks:
+  default:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 192.168.203.0/24

tests/compose/fetchmail/mailu.env

@@ -25,6 +25,9 @@ SECRET_KEY=JS48Q9KE3B6T97E6
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
 # PUBLIC_IPV6=  (default: ::1)
 
+# Subnet of the docker network. This should not conflict with any networks to which your system is connected. (Internal and external!)
+SUBNET=192.168.203.0/24
+
 # Main mail domain
 DOMAIN=mailu.io
 

tests/compose/filters/docker-compose.yml

@@ -84,3 +84,12 @@ services:
 
 
   # Webmail
+
+
+networks:
+  default:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 192.168.203.0/24

tests/compose/filters/mailu.env

@@ -25,6 +25,9 @@ SECRET_KEY=11H6XURLGE7GW3U1
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
 # PUBLIC_IPV6=  (default: ::1)
 
+# Subnet of the docker network. This should not conflict with any networks to which your system is connected. (Internal and external!)
+SUBNET=192.168.203.0/24
+
 # Main mail domain
 DOMAIN=mailu.io
 

tests/compose/rainloop/docker-compose.yml

@@ -86,3 +86,12 @@ services:
       - "/mailu/webmail:/data"
     depends_on:
       - imap
+
+
+networks:
+  default:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 192.168.203.0/24

tests/compose/rainloop/mailu.env

@@ -25,6 +25,9 @@ SECRET_KEY=V5J4SHRYVW9PZIQU
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
 # PUBLIC_IPV6=  (default: ::1)
 
+# Subnet of the docker network. This should not conflict with any networks to which your system is connected. (Internal and external!)
+SUBNET=192.168.203.0/24
+
 # Main mail domain
 DOMAIN=mailu.io
 

tests/compose/roundcube/docker-compose.yml

@@ -86,3 +86,12 @@ services:
       - "/mailu/webmail:/data"
     depends_on:
       - imap
+
+
+networks:
+  default:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 192.168.203.0/24

tests/compose/roundcube/mailu.env

@@ -25,6 +25,9 @@ SECRET_KEY=PGGO2JRQ59QV3DW7
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
 # PUBLIC_IPV6=  (default: ::1)
 
+# Subnet of the docker network. This should not conflict with any networks to which your system is connected. (Internal and external!)
+SUBNET=192.168.203.0/24
+
 # Main mail domain
 DOMAIN=mailu.io
 

tests/compose/webdav/docker-compose.yml

@@ -84,3 +84,12 @@ services:
 
 
   # Webmail
+
+
+networks:
+  default:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 192.168.203.0/24

tests/compose/webdav/mailu.env

@@ -25,6 +25,9 @@ SECRET_KEY=XVDDSWOAGVF5J9QJ
 # PUBLIC_IPV4= 127.0.0.1 (default: 127.0.0.1)
 # PUBLIC_IPV6=  (default: ::1)
 
+# Subnet of the docker network. This should not conflict with any networks to which your system is connected. (Internal and external!)
+SUBNET=192.168.203.0/24
+
 # Main mail domain
 DOMAIN=mailu.io