removed additional docker network

Cielquan · Nov 24, 2019 · 4beb000 · 4beb000
1 parent b3d83bc
commit 4beb000
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 26 deletions.
diff --git a/docker-compose.nginx.yaml b/docker-compose.nginx.yaml
@@ -21,8 +21,8 @@ services:
       - "443:443"
       - "853:853"
     networks:
-      dns_network0:
-        ipv4_address: 172.16.1.2
+      dns_network:
+        ipv4_address: 172.16.1.249
     restart: always
     command: >-
       /bin/bash -c

diff --git a/docker-compose.traefik.yaml b/docker-compose.traefik.yaml
@@ -74,12 +74,12 @@ services:
       - "853:853"
       - "8080:8080"
     networks:
-      traefik_proxy:
-        ipv4_address: 172.16.0.250
+      dns_network:
+        ipv4_address: 172.16.1.250
     restart: always
     labels:
       - traefik.enable=true
-      - traefik.docker.network=traefik_proxy
+      - traefik.docker.network=dns_network
   ##### https
     ### middleware
       # dashboard auth
@@ -94,17 +94,4 @@ services:
       - traefik.http.routers.rou_Traefik.tls=true
       - traefik.http.routers.rou_Traefik.tls.options=default
       - traefik.http.routers.rou_Traefik.middlewares=mdw_TraefikChain${TRAEFIK_AUTH:-NoAuth}
-      - traefik.http.routers.rou_Traefik.service=api@internal
-
-
-networks:
-  # Bridge network for træfik's communication
-  traefik_proxy:
-    name: traefik_proxy
-    driver: bridge
-    driver_opts:
-      encrypted: "true"
-    ipam:
-      config:
-        - subnet: 172.16.0.0/24
-    attachable: false
+      - traefik.http.routers.rou_Traefik.service=api@internal
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -13,12 +13,12 @@ services:
     expose:
       - "8053"
     networks:
-      dns_network0:
+      dns_network:
         ipv4_address: 172.16.1.3
     restart: always
     labels:
       - traefik.enable=true
-      - traefik.docker.network=${TRAEFIK_NETWORK:-traefik_proxy}
+      - traefik.docker.network=${TRAEFIK_NETWORK:-dns_network}
   ##### http
     ### services
       # backend port
@@ -57,14 +57,14 @@ services:
     expose:
       - "80"
     networks:
-      dns_network0:
+      dns_network:
         ipv4_address: 172.16.1.4
     dns:
       - 127.0.0.1
     restart: always
     labels:
       - traefik.enable=true
-      - traefik.docker.network=${TRAEFIK_NETWORK:-traefik_proxy}
+      - traefik.docker.network=${TRAEFIK_NETWORK:-dns_network}
   ##### http
     ### services
       # backend port
@@ -113,7 +113,7 @@ services:
     expose:
       - "53"
     networks:
-      dns_network0:
+      dns_network:
         ipv4_address: 172.16.1.5
     restart: always
     labels:
@@ -122,8 +122,8 @@ services:
 
 networks:
   # Bridge network for internal communication
-  dns_network0:
-    name: dns_network0
+  dns_network:
+    name: dns_network
     driver: bridge
     driver_opts:
       encrypted: "true"