edited

docker/PrivateBin/behind-proxy-with-db/compose.override.yml

@@ -14,9 +14,11 @@ services:
         depends_on:
             db:
                 condition: service_healthy
+        networks:
+            - ${PRIVATEBINDB_NETWORk_ID}
     db:
         image: ${PRIVATEBINDB_IMAGE}:${PRIVATEBINDB_TAG}
         container_name: ${PRIVATEBINDB_CONTAINER_NAME}
         restart: ${PRIVATEBINDB_RESTART_POLICY}
         networks:
-            - ${PRIVATEBIN_NETWORk_ID}
+            - ${PRIVATEBINDB_NETWORk_ID}

docker/PrivateBin/behind-proxy-with-db/compose.yaml

@@ -2,8 +2,8 @@ name: privatebin
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
+  - ../../compose/networks/${PRIVATEBIN_NETWORk_ID}.yaml
-  - ../../compose/networks/socket-proxy.yaml
+  - ../../compose/networks/${PRIVATEBINDB_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/postgres.yaml
   - ../../compose/privatebin.yaml

docker/PrivateBin/behind-proxy/compose.yaml

@@ -2,7 +2,6 @@ name: privatebin
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
+  - ../../compose/networks/${PRIVATEBIN_NETWORk_ID}.yaml
-  - ../../compose/networks/socket-proxy.yaml
 #################### SERVICES ####################
   - ../../compose/privatebin.yaml

docker/PrivateBin/compose.yaml

@@ -2,6 +2,6 @@ name: privatebin
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
+  - ../../compose/networks/${PRIVATEBIN_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/privatebin.yaml

docker/PrivateBin/with-db/compose.yml

@@ -2,8 +2,8 @@ name: privatebin
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
+  - ../../compose/networks/${PRIVATEBIN_NETWORk_ID}.yaml
-  - ../../compose/networks/socket-proxy.yaml
+  - ../../compose/networks/${PRIVATEBINDB_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/postgres.yaml
   - ../../compose/privatebin.yaml

docker/compose/flatnotes.yaml

@@ -1,4 +1,3 @@
-name: flatnotes
 services:
   flatnotes:
     image: ${FLATNOTES_IMAGE}:${FLATNOTES_TAG}

docker/env/privatebin-db.env

@@ -0,0 +1,7 @@
+PRIVATEBINDB_NETWORk_ID=backend
+
+##### Privatebin DB Container
+PRIVATEBINDB_CONTAINER_NAME=yeetfiledb
+PRIVATEBINDB_IMAGE=postgres
+PRIVATEBINDB_TAG=16-alpine
+PRIVATEBINDB_RESTART_POLICY=unless-stopped

docker/env/privatebin-stack.env

@@ -1,17 +1,9 @@
-COMPOSE_PROJECT_NAME=privatebin
-
 PRIVATEBIN_NETWORk_ID=proxy
 PRIVATEBIN_HOSTNAME=privatebin
 
-##### YeetFile Container
+##### Privatebin Container
 PRIVATEBIN_CONTAINER_NAME=privatebin
 PRIVATEBIN_IMAGE=privatebin/nginx-fpm-alpine
 #PRIVATEBIN_IMAGE=privatebin/pdo
 PRIVATEBIN_TAG=stable
 PRIVATEBIN_RESTART_POLICY=unless-stopped
-
-##### YeetFile DB Container
-PRIVATEBINDB_CONTAINER_NAME=yeetfiledb
-PRIVATEBINDB_IMAGE=postgres
-PRIVATEBINDB_TAG=16-alpine
-PRIVATEBINDB_RESTART_POLICY=unless-stopped

docker/flatnotes/behind-proxy/compose.yaml

@@ -1,3 +1,4 @@
+name: flatnotes
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################

docker/flatnotes/compose.yaml

@@ -1,3 +1,4 @@
+name: flatnotes
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################