diff --git a/test/docker_mail/templates/docker-compose.yml b/test/docker_mail/templates/docker-compose.yml index d1ed434c4fec6f9b2350ca43e02f192eb3801acb..1283971b104bbabcfe294ebb50eff73d78f4e8a3 100644 --- a/test/docker_mail/templates/docker-compose.yml +++ b/test/docker_mail/templates/docker-compose.yml @@ -56,7 +56,6 @@ services: - "traefik.http.services.{{ servicename }}.loadbalancer.server.port=80" networks: - default - - webmail - web volumes: - "{{ basedir }}/mailu/certs:/certs" @@ -175,8 +174,6 @@ services: volumes: - "{{ basedir }}/mailu/webmail:/data" - "{{ basedir }}/mailu/overrides/roundcube:/overrides:ro" - networks: - - webmail depends_on: - front @@ -199,8 +196,6 @@ services: - MAILMAN_REST_PASSWORD={{ mailman_restapi_pass }} - HYPERKITTY_URL=http://mailman-web:8000/hyperkitty - HYPERKITTY_API_KEY={{ hyperkitty_api_key }} - networks: - - default mailman-web: image: maxking/mailman-web:0.4 @@ -217,8 +212,6 @@ services: - MAILMAN_REST_URL=http://mailman-core:8001 - MAILMAN_REST_USER=mailman - MAILMAN_REST_PASSWORD={{ mailman_restapi_pass }} - networks: - - default mailman-db: container_name: mailman-db @@ -230,8 +223,6 @@ services: - POSTGRES_DB=mailmandb - POSTGRES_USER=mailman - POSTGRES_PASSWORD={{ mailman_db_pass }} - networks: - - default mailman-db: image: mariadb:10.5 @@ -243,8 +234,6 @@ services: - MYSQL_USER=mailman - MYSQL_PASSWORD={{ mailman_db_pass }} - MYSQL_ROOT_PASSWORD={{ mysql_root_pass }} - networks: - - default mailman-nginx: container_name: mailman-nginx @@ -261,7 +250,7 @@ services: - traefik.http.routers.{{ servicename }}-mailman.entrypoints=websecure - traefik.http.services.{{ servicename }}-mailman.loadbalancer.server.port=80 networks: - - mailman + - default - web networks: @@ -271,8 +260,6 @@ networks: driver: default config: - subnet: 192.168.203.0/24 - webmail: - driver: bridge noinet: driver: bridge internal: true