From 62e1a09ed949499f321a968f3f6faef33c10e2c2 Mon Sep 17 00:00:00 2001
From: simatec <nais@gmx.net>
Date: Thu, 13 Jun 2024 13:10:48 +0200
Subject: [PATCH] (simatec) network added

---
 config/piler-default.yml | 18 +++++++++++++-----
 config/piler-ssl.yml     | 29 +++++++++++++++++++----------
 install-piler.sh         |  8 ++++++++
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/config/piler-default.yml b/config/piler-default.yml
index cdd7e37..194ba13 100644
--- a/config/piler-default.yml
+++ b/config/piler-default.yml
@@ -1,10 +1,10 @@
-version: "3"
 services:
-
   mysql:
     image: mariadb:${MARIA_DB_VERSION}
     container_name: mysql_piler
     restart: unless-stopped
+    networks:
+      - pilernet
     cap_drop:
       - ALL
     cap_add:
@@ -17,7 +17,7 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
       - TZ="Europe/Berlin"
-      - MARIADB_AUTO_UPGRADE=TRUE
+      #- MARIADB_AUTO_UPGRADE=TRUE
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     healthcheck:
       test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
@@ -32,6 +32,8 @@ services:
     image: memcached:latest
     container_name: memcached_piler
     restart: unless-stopped
+    networks:
+      - pilernet
     cap_drop:
       - ALL
     command: -m 64
@@ -40,6 +42,8 @@ services:
     image: simatec/piler:${PILER_VERSION}
     container_name: piler
     restart: unless-stopped
+    networks:
+      - pilernet
     hostname: ${PILER_DOMAIN}
     init: true
     environment:
@@ -77,8 +81,12 @@ services:
         limits:
           memory: 512M
     depends_on:
-      - "memcached"
-      - "mysql"
+      - memcached
+      - mysql
+
+networks:
+  pilernet:
+    external: true
 
 volumes:
   db_data:
diff --git a/config/piler-ssl.yml b/config/piler-ssl.yml
index 07b5f57..d344930 100644
--- a/config/piler-ssl.yml
+++ b/config/piler-ssl.yml
@@ -1,9 +1,10 @@
-version: "3"
 services:
   nginx-proxy:
     image: jwilder/nginx-proxy
     container_name: nginx-proxy
-    restart: always
+    restart: unless-stopped
+    networks:
+      - pilernet
     ports:
       - "80:80"
       - "443:443"
@@ -12,20 +13,26 @@ services:
       - ./nginx-data/vhost.d:/etc/nginx/vhost.d
       - ./nginx-data/html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
+
   nginx-letsencrypt:
     image: jrcs/letsencrypt-nginx-proxy-companion
     container_name: nginx-letsencrypt
-    restart: always
+    restart: unless-stopped
+    networks:
+      - pilernet
     volumes_from:
       - nginx-proxy
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
       - DEFAULT_EMAIL=${LETSENCRYPT_EMAIL}
+
   mysql:
     image: mariadb:${MARIA_DB_VERSION}
     container_name: mysql_piler
     restart: unless-stopped
+    networks:
+      - pilernet
     cap_drop:
       - ALL
     cap_add:
@@ -38,7 +45,7 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
       - TZ="Europe/Berlin"
-      - MARIADB_AUTO_UPGRADE=TRUE
+      #- MARIADB_AUTO_UPGRADE=TRUE
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     healthcheck:
       test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
@@ -53,6 +60,8 @@ services:
     image: memcached:latest
     container_name: memcached_piler
     restart: unless-stopped
+    networks:
+      - pilernet
     cap_drop:
       - ALL
     command: -m 64
@@ -61,6 +70,8 @@ services:
     image: simatec/piler:${PILER_VERSION}
     container_name: piler
     restart: unless-stopped
+    networks:
+      - pilernet
     expose:
       - "80"
     hostname: ${PILER_DOMAIN}
@@ -99,15 +110,13 @@ services:
           memory: 512M
         limits:
           memory: 512M
-
     depends_on:
-      - "memcached"
-      - "mysql"
+      - memcached
+      - mysql
 
 networks:
-  default:
-    external:
-      name: nginx-proxy
+  pilernet:
+    external: true
 
 volumes:
   db_data:
diff --git a/install-piler.sh b/install-piler.sh
index 6c55625..e06bd5c 100644
--- a/install-piler.sh
+++ b/install-piler.sh
@@ -299,6 +299,14 @@ if [ ! -f $installPth/.env ]; then
     ln -s ./piler.conf .env
 fi
 
+# create Network
+if docker network inspect pilernet > /dev/null 2>&1; then
+    echo "Network pilernet is available"
+else
+    docker network create pilernet
+    echo "Network pilernet created"
+fi
+
 # Build Piler
 #cd $buildPth
 #echo "${greenBold}Start Piler-Build...${normal}" && \