edited

docker/env/joplin-srv-stack.env

@@ -1,5 +1,3 @@
-COMPOSE_PROJECT_NAME=joplinserver
-
 JOPLIN_NETWORk_ID=proxy
 JOPLIN_HOSTNAME=joplin
 

docker/joplin-server/behind-proxy-with-db/compose.override.yaml

@@ -13,13 +13,15 @@ services:
         - "traefik.http.services.${JOPLIN_HOSTNAME}-svc.loadbalancer.server.port=22300"
     depends_on:
         - db    
+    networks:
+        - ${JOPLINDB_NETWORk_ID}
     env_file:
-        - path: ../../env/.env.joplin-srv.withdb
+        - path: ../../env/joplin-srv-withdb.env
   db:
     image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG}
     container_name: ${JOPLINDB_CONTAINER_NAME}
     restart: ${JOPLINDB_RESTART_POLICY}
     env_file:
-        - path: ../../env/.env.joplin-srv.db-cred       
+        - path: ../../env/joplin-srv-db-cred.env
     networks:
-        - ${JOPLIN_NETWORk_ID}
+        - ${JOPLINDB_NETWORk_ID}

docker/joplin-server/behind-proxy-with-db/compose.yaml

@@ -1,8 +1,9 @@
+name: joplinserver
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
-  - ../../compose/networks/socket-proxy.yaml
+  - ../../compose/networks/${JOPLIN_NETWORk_ID}.yaml
+  - ../../compose/networks/${JOPLINDB_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/postgres.yaml
   - ../../compose/joplin-server.yaml

docker/joplin-server/behind-proxy-with-db/dcc.sh

@@ -1 +0,0 @@
-docker compose --env-file ../../env/.env.stack.joplin-srv --env-file ../../env/.env.common config

docker/joplin-server/behind-proxy-with-db/deploy.sh

@@ -0,0 +1,6 @@
+docker compose \
+--env-file ../../env/joplin-srv-stack.env \
+--env-file ../../env/joplin-srv-db.env \
+--env-file ../../env/common.env \
+$1
+

docker/joplin-server/behind-proxy/compose.yaml

@@ -1,7 +1,7 @@
+name: joplinserver
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
-  - ../../compose/networks/socket-proxy.yaml
+  - ../../compose/networks/${JOPLIN_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/joplin-server.yaml

docker/joplin-server/behind-proxy/dcc.sh

@@ -1 +0,0 @@
-docker compose --env-file ../../env/.env.stack.joplin-srv --env-file ../../env/.env.common config

docker/joplin-server/behind-proxy/deploy.sh

@@ -0,0 +1,4 @@
+docker compose \
+--env-file ../../env/joplin-srv-stack.env \
+--env-file ../../env/common.env \
+$1

docker/joplin-server/compose.yaml

@@ -1,7 +1,7 @@
+name: joplinserver
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
-  - ../../compose/networks/socket-proxy.yaml
+  - ../../compose/networks/${JOPLIN_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/joplin-server.yaml

docker/joplin-server/dcc.sh

@@ -1 +0,0 @@
-docker compose --env-file ../env/.env.stack.joplin-srv --env-file ../env/.env.common config

docker/joplin-server/deploy.sh

@@ -0,0 +1,4 @@
+docker compose \
+--env-file ../env/joplin-srv-stack.env \
+--env-file ../env/common.env \
+$1

docker/joplin-server/with-db/compose.override.yaml

@@ -5,14 +5,16 @@ services:
 #    ports:
 #        - "22300:22300"
     env_file:
-        - path: ../../env/.env.joplin-srv.withdb
+        - path: ../../env/joplin-srv-withdb.env
+    networks:
+        - ${JOPLINDB_NETWORk_ID}
   db:
     image: ${JOPLINDB_IMAGE}:${JOPLINDB_TAG}
     container_name: ${JOPLINDB_CONTAINER_NAME}
     restart: ${JOPLINDB_RESTART_POLICY}
     env_file:
-        - path: ../../env/.env.joplin-srv.db-cred       
+        - path: ../../env/joplin-srv-db-cred.env
 #    ports:
 #        - "5432:5432"
     networks:
-        - ${JOPLIN_NETWORk_ID}
+        - ${JOPLINDB_NETWORk_ID}

docker/joplin-server/with-db/compose.yaml

@@ -1,8 +1,8 @@
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
-  - ../../compose/networks/socket-proxy.yaml
+  - ../../compose/networks/${JOPLIN_NETWORk_ID}.yaml
+  - ../../compose/networks/${JOPLINDB_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/postgres.yaml
   - ../../compose/joplin-server.yaml

docker/joplin-server/with-db/dcc.sh

@@ -1 +0,0 @@
-docker compose --env-file ../../env/.env.stack.joplin-srv --env-file ../../env/.env.common config

docker/joplin-server/with-db/deploy.sh

@@ -0,0 +1,5 @@
+docker compose \
+--env-file ../../env/joplin-srv-stack.env \
+--env-file ../../env/joplin-srv-db.env \
+--env-file ../../env/common.env \
+$1