wip #7255 @0.5

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 3bbd1171a0294054ecdbb4a79633451e2624f0f4..9571f3771b8aa08f77dd40260ec519d856727d40 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -145,6 +145,7 @@ services:
       - "/home/toolbox/www/.docker/config/mariadb:/etc/mysql/conf.d:z"
     networks:
       - fluidbook-toolbox
+      - extranet
 
   redis:
     container_name: fluidbook-toolbox-redis
@@ -181,6 +182,9 @@ networks:
   nginxproxy:
     external:
       name: nginxproxy
+  extranet:
+    external:
+      name: extranet
 
 volumes:
   usstorage:

diff --git a/.docker/fluidbook-workshop/docker-compose.yml b/.docker/fluidbook-workshop/docker-compose.yml
index 521053fd77b37cb449ff9cfd25d0e0399d82504a..be05ee6da0a080420b935e802870a3eb2df33690 100644 (file)
--- a/.docker/fluidbook-workshop/docker-compose.yml
+++ b/.docker/fluidbook-workshop/docker-compose.yml
@@ -9,10 +9,10 @@ services:
       VIRTUAL_HOST: workshop.fluidbook.com,exe.workshop.fluidbook.com,ws.fluidbook.com
       LETSENCRYPT_HOST: workshop.fluidbook.com,exe.workshop.fluidbook.com,ws.fluidbook.com
     networks:
-      - fluidbook-workshop
+      - nginxproxy
     restart: unless-stopped
 
 networks:
-  fluidbook-workshop:
+  nginxproxy:
     external:
-      name: fluidbook-workshop
+      name: nginxproxy