edited

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

@@ -14,6 +14,8 @@ services:
         ## HTTP Services
         - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.service=${YEETFILE_HOSTNAME}-svc"
         - "traefik.http.services.${YEETFILE_HOSTNAME}-svc.loadbalancer.server.port=8090"
+        networks:            
+         - ${YEETFILEDB_NETWORk_ID}
         depends_on:
             db:
                 condition: service_healthy
@@ -32,4 +34,4 @@ services:
          test: [ "CMD-SHELL", "pg_isready -U postgres" ]
          interval: 3s
         networks:            
-            - ${YEETFILE_NETWORk_ID}
+            - ${YEETFILEDB_NETWORk_ID}

docker/YeetFile/behind-proxy-with-db/compose.yml

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

docker/YeetFile/behind-proxy-with-db/dcc.sh

@@ -1 +1,6 @@
-docker compose --env-file ../../env/.env.stack.yeetfile --env-file ../../env/.env.yeetfile --env-file ../../env/.env.common config
+#docker create network -d brigde proxy
+#docker create network -d bridge backend
+docker compose --env-file ../../env/YeetFile-stack.env \
+--env-file ../../env/YeetFile-db.env \
+--env-file ../../env/YeetFile.env \
+--env-file ../../env/common.env config

docker/YeetFile/behind-proxy/compose.override.yml

@@ -8,7 +8,7 @@ services:
       - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.entrypoints=https"
       - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.rule=Host(`${YEETFILE_HOSTNAME}.$DOMAINNAME1`)"
       ## Middlewares
-#             - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.middlewares=chain-authelia@file"
+#             - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.middlewares=chain-authentik@file"
       - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.middlewares=chain-no-auth@file"
       ## HTTP Services
       - "traefik.http.routers.${YEETFILE_HOSTNAME}-rtr.service=${YEETFILE_HOSTNAME}-svc"

docker/YeetFile/behind-proxy/compose.yml

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

docker/YeetFile/behind-proxy/dcc.sh

@@ -1 +1,2 @@
-docker compose --env-file ../../env/.env.stack.yeetfile --env-file ../../env/.env.common config
+#docker create network -d brigde proxy
+docker compose --env-file ../../env/YeetFile-stack.env --env-file ../../env/common.env config

docker/YeetFile/compose.yml

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

docker/YeetFile/dcc.sh

@@ -1 +1,2 @@
-docker compose --env-file ../env/.env.stack.yeetfile --env-file ../env/.env.common config
+#docker create network -d bridge yeetfile
+docker compose --env-file ../env/YeetFile-stack.env --env-file ../env/common.env config

docker/YeetFile/with-db/compose.yml

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

docker/YeetFile/with-db/dcc.sh

@@ -1 +1,6 @@
-docker compose --env-file ../../env/.env.stack.yeetfile --env-file ../../env/.env.yeetfile --env-file ../../env/.env.common config
+#docker create network -d bridge yeetfile
+#docker create network -d bridge backend
+docker compose --env-file ../../env/YeetFile-stack.env \
+--env-file ../../env/YeetFile.env \
+--env-file ../../env/YeetFile-db.env \
+--env-file ../../env/common.env config

docker/compose/networks/backend.yaml

@@ -1,4 +1,4 @@
 networks:
   backend:
     name: backend
-    driver: bridge
+    external: true

docker/compose/networks/proxy.yaml

@@ -1,4 +1,4 @@
 networks:
   proxy:
     name: proxy
-    driver: bridge
+    external: true

docker/compose/yeetfile.yaml

@@ -10,11 +10,10 @@ services:
     #ports:
     #  - 8090:${YEETFILE_PORT:-8090}    
     environment:
-      UID: ${UID:-1000}
-      GID: ${GID:-1000}
-      TZ: ${TZ}
-      YEETFILE_SERVER_SECRET: 2N1oTtwOHTyEbTFtz0yDLuzq3DhgjIWmSKw4gNcH8Vk=
+      - UID=${UID:-1000}
+      - GID=${GID:-1000}
+      - TZ=${TZ}      
     env_file:
-      - path: ../env/.env.yeetfile   
+      - path: ../env/YeetFile.env
     volumes:
       - ${DOCKERDIR}/yeetfile/uploads:/app/uploads

docker/env/YeetFile-db.env

@@ -0,0 +1,7 @@
+YEETFILEDB_NETWORk_ID=backend
+
+##### YeetFile DB Container
+YEETFILEDB_CONTAINER_NAME=yeetfiledb
+YEETFILEDB_IMAGE=postgres
+YEETFILEDB_TAG=16-alpine
+YEETFILEDB_RESTART_POLICY=unless-stopped

docker/env/YeetFile-stack.env

@@ -1,5 +1,3 @@
-COMPOSE_PROJECT_NAME=yeetfile
-
 YEETFILE_NETWORk_ID=proxy
 YEETFILE_HOSTNAME=yeetfile
 
@@ -8,9 +6,3 @@ YEETFILE_CONTAINER_NAME=yeetfile
 YEETFILE_IMAGE=ghcr.io/benbusby/yeetfile
 YEETFILE_TAG=latest
 YEETFILE_RESTART_POLICY=unless-stopped
-
-##### YeetFile DB Container
-YEETFILEDB_CONTAINER_NAME=yeetfiledb
-YEETFILEDB_IMAGE=postgres
-YEETFILEDB_TAG=16-alpine
-YEETFILEDB_RESTART_POLICY=unless-stopped

docker/env/YeetFile.env

@@ -34,7 +34,7 @@ YEETFILE_DEFAULT_USER_SEND=-1
 
 # The secret value used for encrypting user password hints
 # 32-byte value, base64 encoded
-#YEETFILE_SERVER_SECRET=2N1oTtwOHTyEbTFtz0yDLuzq3DhgjIWmSKw4gNcH8Vk=
+YEETFILE_SERVER_SECRET=2N1oTtwOHTyEbTFtz0yDLuzq3DhgjIWmSKw4gNcH8Vk=
 
 # The domain that the YeetFile instance is hosted on
 # A valid domain string beginning with http:// or https://

docker/services/dc-traefik.yml

@@ -67,7 +67,7 @@ services:
       - --providers.docker.exposedByDefault=false
 #      - --providers.redis=true
 #      - --providers.redis.endpoints=redis:6379
-#      - --entrypoints.https.http.middlewares=middlewares-crowdsec-bouncer@file
+      - --entrypoints.https.http.middlewares=middlewares-crowdsec-bouncer@file
       - --entrypoints.https.http.tls.options=tls-opts@file
       # Add dns-cloudflare as default certresolver for all services. Also enables TLS and no need to specify on individual services
       - --entrypoints.https.http.tls.certresolver=${CERTRESOLVER}