👍 via @tmackness removed unneeded traefik config

BretFisher · Feb 4, 2019 · a3620fd · a3620fd
1 parent f93c4cf
commit a3620fd
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 16 deletions.
diff --git a/ghost.dockerapp b/ghost.dockerapp
@@ -38,7 +38,6 @@ services:
       replicas: 1
       labels:
         - traefik.port=2368
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:ghost.dogvs.cat
     # logging:
     #   driver: "gelf"

diff --git a/menu.dockerapp b/menu.dockerapp
@@ -26,7 +26,6 @@ services:
       replicas: 3
       labels:
         - traefik.port=80
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:www.dogvs.cat,dogvs.cat
     # logging:
     #   driver: "gelf"

diff --git a/stack-elk.yml b/stack-elk.yml
@@ -56,7 +56,6 @@ services:
       replicas: 1
       labels:
         - traefik.port=5601
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:kibana.dogvs.cat
         - traefik.frontend.auth.basic=${KIBANA_USER:-admin}:${KIBANA_PASSWORD:-$2y$05$oZcj4FgdSFEYNCH0EH/3Vu7Hp72gkvEadHzMsDhGFkbvS/ZrKMKfK}
       # TODO: make secrets secret

diff --git a/stack-ghost.yml b/stack-ghost.yml
@@ -19,7 +19,6 @@ services:
       replicas: 1
       labels:
         - traefik.port=2368
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:ghost.dogvs.cat
     # logging:
     #   driver: "gelf"

diff --git a/stack-menu.yml b/stack-menu.yml
@@ -10,7 +10,6 @@ services:
       replicas: 3
       labels:
         - traefik.port=80
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:www.dogvs.cat,dogvs.cat
     # logging:
     #   driver: "gelf"

diff --git a/stack-portainer.yml b/stack-portainer.yml
@@ -11,7 +11,6 @@ services:
         # place on managers when not using agent, place on workers if using agent
       labels:
         - traefik.port=9000
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:portainer.dogvs.cat
     networks:
       - proxy

diff --git a/stack-proxy-global.yml b/stack-proxy-global.yml
@@ -43,6 +43,7 @@ services:
       - --docker.endPoint=http://dockersocket:2375
       - --docker.swarmMode
       - --docker.domain=traefik
+      - --docker.network=proxy
       - --docker.watch
       - --consul
       - --consul.endpoint=consul:8500
@@ -133,7 +134,7 @@ services:
 volumes:
   consul:
     driver: ${DOCKER_VOL_DRIVER:-local}
-    # for example set DOCKER_VOL_DRIVER="rexray/dobs"
+    # for example export DOCKER_VOL_DRIVER="rexray/dobs"
     driver_opts:
       size: 1
 

diff --git a/stack-proxy.yml b/stack-proxy.yml
@@ -22,6 +22,7 @@ services:
       - --docker
       - --docker.swarmMode
       - --docker.domain=traefik
+      - --docker.network=proxy
       - --docker.watch
       - --api
       - --defaultentrypoints=http,https

diff --git a/stack-sqlite-ghost.yml b/stack-sqlite-ghost.yml
@@ -22,7 +22,6 @@ services:
       replicas: 1
       labels:
         - traefik.port=2368
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:ghost.dogvs.cat
     # logging:
     #   driver: "gelf"

diff --git a/stack-swarmprom.yml b/stack-swarmprom.yml
@@ -95,7 +95,6 @@ services:
       replicas: 1
       labels:
         - traefik.port=3000
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:grafana.dogvs.cat
       placement:
         constraints:
@@ -129,7 +128,6 @@ services:
       replicas: 1
       labels:
         - traefik.port=9093
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:alertmanager.dogvs.cat
         - traefik.frontend.auth.basic=${AM_USER:-admin}:${AM_PASSWORD:-$2y$05$oZcj4FgdSFEYNCH0EH/3Vu7Hp72gkvEadHzMsDhGFkbvS/ZrKMKfK}
       placement:
@@ -157,7 +155,6 @@ services:
       replicas: 1
       labels:
         - traefik.port=9094
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:unsee.dogvs.cat
         - traefik.frontend.auth.basic=${UNSEE_USER:-admin}:${UNSEE_PASSWORD:-$2y$05$oZcj4FgdSFEYNCH0EH/3Vu7Hp72gkvEadHzMsDhGFkbvS/ZrKMKfK}
         # - com.df.users=${ADMIN_USER:-admin}:${ADMIN_PASSWORD:-admin}
@@ -219,7 +216,6 @@ services:
       replicas: 1
       labels:
         - traefik.port=9090
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:prom.dogvs.cat
         - traefik.frontend.auth.basic=${KIBANA_USER:-admin}:${KIBANA_PASSWORD:-$2y$05$oZcj4FgdSFEYNCH0EH/3Vu7Hp72gkvEadHzMsDhGFkbvS/ZrKMKfK} 
       placement:

diff --git a/stack-voting.yml b/stack-voting.yml
@@ -42,7 +42,6 @@ services:
       replicas: 2
       labels:
         - traefik.port=80
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:vote.dogvs.cat
 
   result:
@@ -55,7 +54,6 @@ services:
       replicas: 2
       labels:
         - traefik.port=80
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:result.dogvs.cat
         - traefik.backend.loadbalancer.stickiness=true
 

diff --git a/voting.dockerapp b/voting.dockerapp
@@ -54,7 +54,6 @@ services:
       replicas: 2
       labels:
         - traefik.port=80
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:vote.dogvs.cat
     # logging:
     #   driver: "gelf"
@@ -70,7 +69,6 @@ services:
       replicas: 2
       labels:
         - traefik.port=80
-        - traefik.docker.network=proxy
         - traefik.frontend.rule=Host:result.dogvs.cat
         - traefik.backend.loadbalancer.stickiness=true
     # logging: