From c0972face65dcc04c822a2f374ecb0131b6e3733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Thu, 6 Dec 2018 16:44:12 +0200 Subject: [PATCH] Correct subnetting functionality for the tests and setup --- setup/flavors/compose/docker-compose.yml | 4 +--- setup/flavors/compose/mailu.env | 2 +- tests/compose/core/docker-compose.yml | 9 +++++++++ tests/compose/fetchmail/docker-compose.yml | 9 +++++++++ tests/compose/fetchmail/mailu.env | 3 +++ tests/compose/filters/docker-compose.yml | 9 +++++++++ tests/compose/filters/mailu.env | 3 +++ tests/compose/rainloop/docker-compose.yml | 9 +++++++++ tests/compose/rainloop/mailu.env | 3 +++ tests/compose/roundcube/docker-compose.yml | 9 +++++++++ tests/compose/roundcube/mailu.env | 3 +++ tests/compose/webdav/docker-compose.yml | 9 +++++++++ tests/compose/webdav/mailu.env | 3 +++ 13 files changed, 71 insertions(+), 4 deletions(-) diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml index cc45ca99..38322cd3 100644 --- a/setup/flavors/compose/docker-compose.yml +++ b/setup/flavors/compose/docker-compose.yml @@ -146,8 +146,7 @@ services: depends_on: - imap {% endif %} - -{% if resolver_enabled %} + networks: default: driver: bridge @@ -155,4 +154,3 @@ networks: driver: default config: - subnet: {{ subnet }} -{% endif %} diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env index d8a99aa6..9f3a2555 100644 --- a/setup/flavors/compose/mailu.env +++ b/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 }} diff --git a/tests/compose/core/docker-compose.yml b/tests/compose/core/docker-compose.yml index 397000a6..a7c803b7 100644 --- a/tests/compose/core/docker-compose.yml +++ b/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 diff --git a/tests/compose/fetchmail/docker-compose.yml b/tests/compose/fetchmail/docker-compose.yml index 6b1be40e..505fe21b 100644 --- a/tests/compose/fetchmail/docker-compose.yml +++ b/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 diff --git a/tests/compose/fetchmail/mailu.env b/tests/compose/fetchmail/mailu.env index 996dbb73..c91a6deb 100644 --- a/tests/compose/fetchmail/mailu.env +++ b/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 diff --git a/tests/compose/filters/docker-compose.yml b/tests/compose/filters/docker-compose.yml index 4fbda49a..463a4384 100644 --- a/tests/compose/filters/docker-compose.yml +++ b/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 diff --git a/tests/compose/filters/mailu.env b/tests/compose/filters/mailu.env index c8c99d26..25c7c133 100644 --- a/tests/compose/filters/mailu.env +++ b/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 diff --git a/tests/compose/rainloop/docker-compose.yml b/tests/compose/rainloop/docker-compose.yml index c91a92ed..e7cd577c 100644 --- a/tests/compose/rainloop/docker-compose.yml +++ b/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 diff --git a/tests/compose/rainloop/mailu.env b/tests/compose/rainloop/mailu.env index bc9cebbb..65fef5c8 100644 --- a/tests/compose/rainloop/mailu.env +++ b/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 diff --git a/tests/compose/roundcube/docker-compose.yml b/tests/compose/roundcube/docker-compose.yml index 567c1c69..8c34a68b 100644 --- a/tests/compose/roundcube/docker-compose.yml +++ b/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 diff --git a/tests/compose/roundcube/mailu.env b/tests/compose/roundcube/mailu.env index 6eac05ed..cadaa84a 100644 --- a/tests/compose/roundcube/mailu.env +++ b/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 diff --git a/tests/compose/webdav/docker-compose.yml b/tests/compose/webdav/docker-compose.yml index 8e0db6e3..e0d5f385 100644 --- a/tests/compose/webdav/docker-compose.yml +++ b/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 diff --git a/tests/compose/webdav/mailu.env b/tests/compose/webdav/mailu.env index 96c2b6e9..7141bf1f 100644 --- a/tests/compose/webdav/mailu.env +++ b/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