Browse Source

BREAKING: use default docker network: web, fix #59

Guilhem Saurel 6 years ago
parent
commit
9d812e4762

+ 2 - 4
cloud/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 version: '3'
 
 
 networks:
 networks:
-  proxytanet:
+  web:
     external: true
     external: true
 
 
 services:
 services:
@@ -32,9 +32,7 @@ services:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/nextcloud/app:/var/www/html:ro
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/nextcloud/app:/var/www/html:ro
     labels:
     labels:
       traefik.enable: "true"
       traefik.enable: "true"
-      traefik.backend: "nextcloud"
       traefik.frontend.rule: "Host: cloud.${CHATONS_DOMAIN:-local}, www.cloud.${CHATONS_DOMAIN:-local}"
       traefik.frontend.rule: "Host: cloud.${CHATONS_DOMAIN:-local}, www.cloud.${CHATONS_DOMAIN:-local}"
-      traefik.docker.network: "proxytanet"
     networks:
     networks:
-      - proxytanet
+      - web
       - default
       - default

+ 2 - 3
homepage/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 version: '3'
 
 
 networks:
 networks:
-  proxytanet:
+  web:
     external: true
     external: true
 
 
 services:
 services:
@@ -10,7 +10,6 @@ services:
     restart: unless-stopped
     restart: unless-stopped
     labels:
     labels:
       traefik.enable: "true"
       traefik.enable: "true"
-      traefik.backend: "homepage"
       traefik.frontend.rule: "Host: ${CHATONS_DOMAIN:-local}, www.${CHATONS_DOMAIN:-local}"
       traefik.frontend.rule: "Host: ${CHATONS_DOMAIN:-local}, www.${CHATONS_DOMAIN:-local}"
     networks:
     networks:
-      - proxytanet
+      - web

+ 1 - 1
install.md

@@ -34,7 +34,7 @@ cd docker-atelier
 
 
 ## Deploy the proxy
 ## Deploy the proxy
 ```
 ```
-docker network create proxytanet
+docker network create web
 ```
 ```
 
 
 And then you can go in the `proxy/` folder and in the environment you want:
 And then you can go in the `proxy/` folder and in the environment you want:

+ 3 - 4
matrix/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 version: "3"
 
 
 networks:
 networks:
-  proxytanet:
+  web:
     external: true
     external: true
 
 
 services:
 services:
@@ -15,9 +15,8 @@ services:
     labels:
     labels:
       traefik.enable: "true"
       traefik.enable: "true"
       traefik.frontend.rule: "Host: matrix.${CHATONS_DOMAIN:-local}, www.matrix.${CHATONS_DOMAIN:-local}"
       traefik.frontend.rule: "Host: matrix.${CHATONS_DOMAIN:-local}, www.matrix.${CHATONS_DOMAIN:-local}"
-      traefik.docker.network: "proxytanet"
     networks:
     networks:
-      - proxytanet
+      - web
       - default
       - default
     volumes:
     volumes:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/matrix/data:/data
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/matrix/data:/data
@@ -45,4 +44,4 @@ services:
       traefik.enable: "true"
       traefik.enable: "true"
       traefik.frontend.rule: "Host: riot.${CHATONS_DOMAIN:-local}, www.riot.${CHATONS_DOMAIN:-local}"
       traefik.frontend.rule: "Host: riot.${CHATONS_DOMAIN:-local}, www.riot.${CHATONS_DOMAIN:-local}"
     networks:
     networks:
-      - proxytanet
+      - web

+ 3 - 5
pad/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 version: '3'
 
 
 networks:
 networks:
-  proxytanet:
+  web:
     external: true
     external: true
 
 
 services:
 services:
@@ -20,11 +20,9 @@ services:
       - .env
       - .env
     labels:
     labels:
       traefik.enable: "true"
       traefik.enable: "true"
-      traefik.backend: "etherpad"
-      traefik.frontend.rule: "Host: pad.${CHATONS_DOMAIN:-local}, www.pad.${CHATONS_DOMAIN:-local}"
-      traefik.docker.network: "proxytanet"
+      traefik.frontend.rule: "Host: pad.${CHATONS_DOMAIN:-localhost}, www.pad.${CHATONS_DOMAIN:-localhost}"
     networks:
     networks:
       - default
       - default
-      - proxytanet
+      - web
     volumes:
     volumes:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/etherpad/app:/opt/etherpad-lite/var
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/etherpad/app:/opt/etherpad-lite/var

+ 2 - 3
peertube/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 version: "3"
 
 
 networks:
 networks:
-  proxytanet:
+  web:
     external: true
     external: true
 
 
 services:
 services:
@@ -15,9 +15,8 @@ services:
     labels:
     labels:
       traefik.enable: "true"
       traefik.enable: "true"
       traefik.frontend.rule: "Host: peertube.${CHATONS_DOMAIN:-local}, www.peertube.${CHATONS_DOMAIN:-local}"
       traefik.frontend.rule: "Host: peertube.${CHATONS_DOMAIN:-local}, www.peertube.${CHATONS_DOMAIN:-local}"
-      traefik.docker.network: "proxytanet"
     networks:
     networks:
-      - proxytanet
+      - web
       - default
       - default
     volumes:
     volumes:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/peertube/data:/data
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/peertube/data:/data

+ 1 - 1
proxy

@@ -1 +1 @@
-Subproject commit a1faa26f2168b1e4f22ae77f6aecaf60b7219315
+Subproject commit 63f78f3f7703d58bf1edf4874706d160421d47e6