From 2ee314b9d4ae80e9858d995ed59f59af2cbdc04c Mon Sep 17 00:00:00 2001
From: gregory hendrickson <greg@hndrx.co>
Date: Mon, 4 Dec 2023 10:55:33 -0800
Subject: [PATCH] modify networks: db, traefik, wireguard

---
 ghost-blog/docker-compose.yml |  6 ++++--
 nextcloud/Dockerfile          | 15 ++++++++++-----
 nextcloud/docker-compose.yml  |  4 +++-
 wireguard/docker-compose.yml  |  5 +++++
 wordpress/docker-compose.yml  | 11 ++++++++---
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/ghost-blog/docker-compose.yml b/ghost-blog/docker-compose.yml
index ad4b9a5..afdb928 100644
--- a/ghost-blog/docker-compose.yml
+++ b/ghost-blog/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - /opt/storagemysql-ghost:/var/lib/mysql # Mount MySQL data directory
     hostname: mysql-ghost # Set hostname for MySQL container
     networks:
-      - traefik # Use external network named "traefik"
+      - db # Use external network named "traefik"
 
   # Ghost service
   ghost:
@@ -43,4 +43,6 @@ services:
 #This specifies external network traefik - docker network create traefik is required (managed outside of docker-compose)
 networks:
   traefik:
-    external: true # Use external network named "traefik"
\ No newline at end of file
+    external: true # Use external network named "traefik"
+  db:
+    external: true # Use external network named "db"
\ No newline at end of file
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 3143fad..41d938f 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -54,11 +54,15 @@ RUN mkdir -p \
 ;
 
 # Install additional dependencies
-RUN apt-get update && \
+RUN set -ex; \
+    \
+    apt-get update && \
+    \
     apt-get install -y build-essential wget cmake libx11-dev libopenblas-dev git 
 
 # Install dlib
-RUN git clone https://github.com/davisking/dlib.git && \
+RUN set -ex; \
+    git clone https://github.com/davisking/dlib.git && \
     cd dlib/dlib && \
     mkdir build && \
     cd build && \
@@ -67,7 +71,8 @@ RUN git clone https://github.com/davisking/dlib.git && \
     make install
 
 # Install pdlib
-RUN git clone https://github.com/goodspb/pdlib.git && \
+RUN set -ex; \
+    git clone https://github.com/goodspb/pdlib.git && \
     cd pdlib && \
     phpize && \
     ./configure --enable-debug && \
@@ -75,9 +80,9 @@ RUN git clone https://github.com/goodspb/pdlib.git && \
     make install
 
 # Enable pdlib in PHP ###zzz ensures it will load last and override any other settings
-RUN echo 'extension="pdlib.so"' >> /usr/local/etc/php/conf.d/zzz-php.ini
+RUN echo 'extension="pdlib.so"' >> /usr/local/etc/php/conf.d/zzz-php.ini \
 # Explicitly Increase memory limit in PHP
-RUN echo 'memory_limit = 9600M' >> /usr/local/etc/php/conf.d/zzz-php.ini
+    echo 'memory_limit = 9600M' >> /usr/local/etc/php/conf.d/zzz-php.ini
 
 COPY supervisord.conf /
 
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index cc2ddcd..90cbdb1 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     volumes:
       - /opt/storagemysql-nextcloud:/var/lib/mysql # Mount MySQL data directory
     networks:
-      - traefik # Use external network named "traefik"
+      - db # Use external network named "traefik"
 
   # Nextcloud service
   nextcloud:
@@ -71,5 +71,7 @@ services:
 networks:
   traefik:
     external: true # Use external network named "traefik"
+  db:
+    external: true # Use external network named "db"
 
 
diff --git a/wireguard/docker-compose.yml b/wireguard/docker-compose.yml
index 664539f..dab56ed 100644
--- a/wireguard/docker-compose.yml
+++ b/wireguard/docker-compose.yml
@@ -25,3 +25,8 @@ services:
     sysctls:
       - net.ipv4.conf.all.src_valid_mark=1
     restart: unless-stopped
+
+networks:
+  wireguard:
+    external: true
+      
\ No newline at end of file
diff --git a/wordpress/docker-compose.yml b/wordpress/docker-compose.yml
index 7705a50..7cab9ef 100644
--- a/wordpress/docker-compose.yml
+++ b/wordpress/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       MYSQL_DATABASE: ${MYSQL_DATABASE}
       MYSQL_USER: ${MYSQL_USER}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      network: db
 
   wordpress:
     depends_on:
@@ -32,8 +33,12 @@ services:
       - "traefik.http.services.wordpress.loadbalancer.server.port=80"
     volumes:
       - ${WORDPRESS_VOLUME}:/var/www/html
+    networks: 
+      - traefik
 
 networks:
-  default:
-    external:
-      name: traefik
+  traefik:
+    external: true # Use external network named "traefik"
+  db:
+    external: true # Use external network named "db"
+