Remove services from warden network across all compose templates

wardenenv · Mar 2, 2020 · 36cb017 · 36cb017
1 parent 7f434bb
commit 36cb017
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 96 deletions.
diff --git a/environments/laravel.base.yml b/environments/laravel.base.yml
@@ -16,9 +16,6 @@ services:
       - traefik.http.routers.${WARDEN_ENV_NAME}-nginx.priority=1
       - traefik.http.routers.${WARDEN_ENV_NAME}-nginx.rule=HostRegexp(`{subdomain:.+}.${TRAEFIK_DOMAIN}`)
       - traefik.http.services.${WARDEN_ENV_NAME}-nginx.loadbalancer.server.port=80
-    networks:
-      - warden
-      - default
 
   php-fpm:
     hostname: "${WARDEN_ENV_NAME}-php-fpm"
@@ -35,9 +32,6 @@ services:
       - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
       - ~/.composer:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
-    networks:
-      - default
-      - warden
 
   php-debug:
     hostname: "${WARDEN_ENV_NAME}-php-debug"
@@ -55,9 +49,6 @@ services:
       - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
       - ~/.composer:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
-    networks:
-      - default
-      - warden
 
   db:
     hostname: "${WARDEN_ENV_NAME}-mariadb"
@@ -69,9 +60,6 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD:-laravel}
     volumes:
       - dbdata:/var/lib/mysql
-    networks:
-      - warden
-      - default
 
   redis:
     hostname: "${WARDEN_ENV_NAME}-redis"
@@ -85,13 +73,6 @@ services:
       - traefik.http.routers.${WARDEN_ENV_NAME}-mailhog.tls=true
       - traefik.http.routers.${WARDEN_ENV_NAME}-mailhog.rule=Host(`mailhog.${TRAEFIK_DOMAIN}`)
       - traefik.http.services.${WARDEN_ENV_NAME}-mailhog.loadbalancer.server.port=8025
-    networks:
-      - warden
-      - default
 
 volumes:
   dbdata:
-
-networks:
-  warden:
-    external: true
diff --git a/environments/local.base.yml b/environments/local.base.yml
@@ -1,4 +1 @@
 version: "3.5"
-networks:
-  warden:
-    external: true
diff --git a/environments/magento1.base.yml b/environments/magento1.base.yml
@@ -15,9 +15,6 @@ services:
       - traefik.http.routers.${WARDEN_ENV_NAME}-nginx.priority=1
       - traefik.http.routers.${WARDEN_ENV_NAME}-nginx.rule=HostRegexp(`{subdomain:.+}.${TRAEFIK_DOMAIN}`)
       - traefik.http.services.${WARDEN_ENV_NAME}-nginx.loadbalancer.server.port=80
-    networks:
-      - warden
-      - default
 
   php-fpm:
     hostname: "${WARDEN_ENV_NAME}-php-fpm"
@@ -34,9 +31,6 @@ services:
       - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
       - ~/.composer:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
-    networks:
-      - default
-      - warden
 
   php-debug:
     hostname: "${WARDEN_ENV_NAME}-php-debug"
@@ -54,9 +48,6 @@ services:
       - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
       - ~/.composer:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
-    networks:
-      - default
-      - warden
 
   db:
     hostname: "${WARDEN_ENV_NAME}-mariadb"
@@ -71,9 +62,6 @@ services:
       - --max_allowed_packet=1024M
     volumes:
       - dbdata:/var/lib/mysql
-    networks:
-      - warden
-      - default
 
   redis:
     hostname: "${WARDEN_ENV_NAME}-redis"
@@ -87,13 +75,6 @@ services:
       - traefik.http.routers.${WARDEN_ENV_NAME}-mailhog.tls=true
       - traefik.http.routers.${WARDEN_ENV_NAME}-mailhog.rule=Host(`mailhog.${TRAEFIK_DOMAIN}`)
       - traefik.http.services.${WARDEN_ENV_NAME}-mailhog.loadbalancer.server.port=8025
-    networks:
-      - warden
-      - default
 
 volumes:
   dbdata:
-
-networks:
-  warden:
-    external: true
diff --git a/environments/magento1.blackfire.base.yml b/environments/magento1.blackfire.base.yml
@@ -9,9 +9,6 @@ services:
       - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
       - ~/.composer:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
-    networks:
-      - warden
-      - default
 
   blackfire-agent:
     hostname: "${WARDEN_ENV_NAME}-blackfire-agent"
@@ -21,6 +18,3 @@ services:
       - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
       - BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID}
       - BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN}
-    networks:
-      - warden
-      - default
diff --git a/environments/magento2.base.yml b/environments/magento2.base.yml
@@ -14,9 +14,6 @@ services:
       - traefik.http.routers.${WARDEN_ENV_NAME}-nginx.priority=2
       - traefik.http.routers.${WARDEN_ENV_NAME}-nginx.rule=HostRegexp(`{subdomain:.+}.${TRAEFIK_DOMAIN}`)
       - traefik.http.services.${WARDEN_ENV_NAME}-nginx.loadbalancer.server.port=80
-    networks:
-      - warden
-      - default
 
   varnish:
     hostname: "${WARDEN_ENV_NAME}-varnish"
@@ -29,9 +26,6 @@ services:
       - traefik.http.routers.${WARDEN_ENV_NAME}-varnish.priority=1
       - traefik.http.routers.${WARDEN_ENV_NAME}-varnish.rule=HostRegexp(`{subdomain:.+}.${TRAEFIK_DOMAIN}`)
       - traefik.http.services.${WARDEN_ENV_NAME}-varnish.loadbalancer.server.port=80
-    networks:
-      - warden
-      - default
 
   php-fpm:
     hostname: "${WARDEN_ENV_NAME}-php-fpm"
@@ -53,9 +47,6 @@ services:
             && (Path(`/livereload.js`) || Path(`/livereload`))
       - traefik.http.routers.${WARDEN_ENV_NAME}-livereload.service=${WARDEN_ENV_NAME}-livereload
       - traefik.http.services.${WARDEN_ENV_NAME}-livereload.loadbalancer.server.port=35729
-    networks:
-      - default
-      - warden
 
   php-debug:
     hostname: "${WARDEN_ENV_NAME}-php-debug"
@@ -69,9 +60,6 @@ services:
       - ${TRAEFIK_SUBDOMAIN:-app}.${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
     depends_on:
       - db
-    networks:
-      - default
-      - warden
 
   db:
     hostname: "${WARDEN_ENV_NAME}-mariadb"
@@ -87,9 +75,6 @@ services:
       - --explicit_defaults_for_timestamp=on
     volumes:
       - dbdata:/var/lib/mysql
-    networks:
-      - warden
-      - default
 
   elasticsearch:
     hostname: "${WARDEN_ENV_NAME}-elasticsearch"
@@ -105,9 +90,6 @@ services:
       - "ES_JAVA_OPTS=-Xms64m -Xmx512m"
     volumes:
       - esdata:/usr/share/elasticsearch/data
-    networks:
-      - warden
-      - default
 
   redis:
     hostname: "${WARDEN_ENV_NAME}-redis"
@@ -121,9 +103,6 @@ services:
       - traefik.http.routers.${WARDEN_ENV_NAME}-rabbitmq.tls=true
       - traefik.http.routers.${WARDEN_ENV_NAME}-rabbitmq.rule=Host(`rabbitmq.${TRAEFIK_DOMAIN}`)
       - traefik.http.services.${WARDEN_ENV_NAME}-rabbitmq.loadbalancer.server.port=15672
-    networks:
-      - warden
-      - default
 
   mailhog:
     hostname: "${WARDEN_ENV_NAME}-mailhog"
@@ -133,14 +112,7 @@ services:
       - traefik.http.routers.${WARDEN_ENV_NAME}-mailhog.tls=true
       - traefik.http.routers.${WARDEN_ENV_NAME}-mailhog.rule=Host(`mailhog.${TRAEFIK_DOMAIN}`)
       - traefik.http.services.${WARDEN_ENV_NAME}-mailhog.loadbalancer.server.port=8025
-    networks:
-      - warden
-      - default
 
 volumes:
   dbdata:
   esdata:
-
-networks:
-  warden:
-    external: true
diff --git a/environments/magento2.blackfire.base.yml b/environments/magento2.blackfire.base.yml
@@ -5,9 +5,6 @@ services:
     image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}-magento2-blackfire
     depends_on:
       - db
-    networks:
-      - warden
-      - default
 
   blackfire-agent:
     hostname: "${WARDEN_ENV_NAME}-blackfire-agent"
@@ -17,6 +14,3 @@ services:
       - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
       - BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID}
       - BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN}
-    networks:
-      - warden
-      - default
diff --git a/environments/magento2.selenium.base.yml b/environments/magento2.selenium.base.yml
@@ -7,9 +7,6 @@ services:
     environment:
       GRID_TIMEOUT: 0
       GRID_BROWSER_TIMEOUT: 0
-    networks:
-      - warden
-      - default
   selenium-chrome:
     hostname: ${WARDEN_ENV_NAME}_selenium-chrome
     image: selenium/node-chrome${WARDEN_SELENIUM_DEBUG:-}:3.8.1
@@ -21,9 +18,6 @@ services:
       - HUB_HOST=selenium-hub
       - HUB_PORT=4444
       - START_XVFB=false
-    networks:
-      - warden
-      - default
 
   allure:
     hostname: "${WARDEN_ENV_NAME}-allure"
@@ -42,6 +36,3 @@ services:
     environment:
       CHECK_RESULTS_EVERY_SECONDS: 60
       KEEP_HISTORY: "TRUE"
-    networks:
-      - warden
-      - default
diff --git a/environments/magento2.splitdb.checkout.yml b/environments/magento2.splitdb.checkout.yml
@@ -21,9 +21,6 @@ services:
       - --max_allowed_packet=1024M
     volumes:
       - checkoutdbdata:/var/lib/mysql
-    networks:
-      - warden
-      - default
 
 volumes:
   checkoutdbdata:
diff --git a/environments/magento2.splitdb.sales.yml b/environments/magento2.splitdb.sales.yml
@@ -21,9 +21,6 @@ services:
       - --max_allowed_packet=1024M
     volumes:
       - salesdbdata:/var/lib/mysql
-    networks:
-      - warden
-      - default
 
 volumes:
   salesdbdata: