wip #7363 @1

diff --git a/resources/tools/dockerwebcontainer/base b/resources/tools/dockerwebcontainer/base
index 310d1a07a32403332a97463072682b903017d3ab..739beb9f0610d18c5c9e6e536afe9385d2d34971 100644 (file)
--- a/resources/tools/dockerwebcontainer/base
+++ b/resources/tools/dockerwebcontainer/base
@@ -13,4 +13,5 @@ services:
             LETSENCRYPT_HOST: $domain
         networks:
             - $name
+            - nginxproxy
         restart: unless-stopped

diff --git a/resources/tools/dockerwebcontainer/matomo b/resources/tools/dockerwebcontainer/matomo
index eaba7e5ddf5a98ddb9bbe80f23a31dee89099691..16ae7678561e8d306a3f61dfc9599a509cd85c20 100644 (file)
--- a/resources/tools/dockerwebcontainer/matomo
+++ b/resources/tools/dockerwebcontainer/matomo
@@ -31,6 +31,7 @@
       restart: unless-stopped
       networks:
         - $name
+        - nginxproxy
 
     matomo-mysqlbackup:
       image: selim13/automysqlbackup

diff --git a/resources/tools/dockerwebcontainer/mysql b/resources/tools/dockerwebcontainer/mysql
index 9598e21b5b474e0eb0c970aad39228da06a1ffff..4f8b7747db957d13f2e4848af2d4db1733de7955 100644 (file)
--- a/resources/tools/dockerwebcontainer/mysql
+++ b/resources/tools/dockerwebcontainer/mysql
@@ -10,6 +10,7 @@
         LETSENCRYPT_HOST: adminer.$domain
       networks:
         - $name
+        - nginxproxy
 
     mariadb:
         container_name: $name-mariadb

diff --git a/resources/tools/dockerwebcontainer/network b/resources/tools/dockerwebcontainer/network
index 3104a0ad7c782bf059cb445531e2b46398f69d62..37d0551c9efb1c904cab30bd96376a3b8e9eabe4 100644 (file)
--- a/resources/tools/dockerwebcontainer/network
+++ b/resources/tools/dockerwebcontainer/network
@@ -1,4 +1,9 @@
 networks:
   $name:
-    external:
-      name: $name
+    name: $name
+    external: true
+  nginxproxy:
+    name: nginxproxy
+    external: true
+
+

diff --git a/resources/tools/dockerwebcontainer/s3 b/resources/tools/dockerwebcontainer/s3
index b15f2ab3fb50f4356c29502d7d8b1d1629669a8e..5527dfedffa4806846c9b46fe1124852cc9df62f 100644 (file)
--- a/resources/tools/dockerwebcontainer/s3
+++ b/resources/tools/dockerwebcontainer/s3
@@ -17,4 +17,5 @@
     command: 'minio server /data/minio --console-address ":8900"'
     networks:
       - $name
+      - nginxproxy
     restart: unless-stopped