Merge branch 'main' of gitea.mikemcfetridge.com:miker/Docker-02

Patchmon/.env

@@ -18,7 +18,7 @@
 # Example: 
 #CORS_ORIGIN=https://patchmon.domain.tld,http://patchmon.local:3000
 
-CORS_ORIGIN=https://patch.mikemcfetridge.com,http://192.168.2.3:3000,http://localhost:3000
+CORS_ORIGIN=https://patch.mikemcfetridge.com,http://192.168.2.14:3000,http://localhost:3000
 JWT_SECRET=b552dcd09a958144ee3e436acd09767574fba73d2f4237496c97e6d2d59d2b6d4575d0148a3869276130d505492e73c023d40c090c42780fb611d0be9c29f4dc
 
 # ==============================================================================

Patchmon/docker-compose.yml

@@ -26,7 +26,8 @@ services:
     ports:
       - "3000:3000"
     networks:
-      - patchmon-internal
+      - internal
+      - external
     depends_on:
       database:
         condition: service_healthy
@@ -47,7 +48,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     networks:
-      - patchmon-internal
+      - internal
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 3s
@@ -67,7 +68,7 @@ services:
     volumes:
       - redis_data:/data
     networks:
-      - patchmon-internal
+      - internal
     healthcheck:
       test: ["CMD", "redis-cli", "--no-auth-warning", "-a", "${REDIS_PASSWORD}", "ping"]
       interval: 3s
@@ -92,7 +93,8 @@ services:
     mem_limit: 512m
     cpus: '1.0'
     networks:
-      - patchmon-internal
+      - internal
+      - external
     healthcheck:
       test: ["CMD-SHELL", "nc -z localhost 4822 || exit 1"]
       interval: 10s
@@ -110,5 +112,7 @@ volumes:
   redis_data:
 
 networks:
-  patchmon-internal:
-    driver: bridge
+  internal:
+    external: true    # Tells Compose not to create this network
+  external:
+    external: true    # Tells Compose not to create this network