changed vol path, proxy, u pdated env files, minor fixes

nginx-proxy-manager/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - "81:81"
       - "443:443"
     volumes:
-      - "${VOL_PATH:-./data}/proxy-data:/data"
-      - "${VOL_PATH:-./data}/proxy-letsencrypt:/etc/letsencrypt"
+      - "${VOL_PATH:-./data}/proxy/data:/data"
+      - "${VOL_PATH:-./data}/proxy/letsencrypt:/etc/letsencrypt"
     networks:
       - proxy

nginx-proxy-manager/sample-extends.yml

@@ -1,9 +1,5 @@
-version: '3.4'
-
 services:
   proxy:
     extends:
       file: ${COOKBOOK}/nginx-proxy-manager/docker-compose.yml
       service: proxy
-    env_file:
-      - .env

portainer/docker-compose.yml

@@ -9,8 +9,6 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - "${VOL_PATH:-./config}/portainer:/data"
     restart: always
-    networks:
-      - portainer-net
   
   portainer-agent:
     image: ${PORTAINER_AGENT_IMAGE:-portainer/agent:latest}
@@ -22,5 +20,4 @@ services:
     ports:
       - 9001:9001
     restart: always
-    networks:
-      - portainer-net
+    

portainer/sample-extends.yml

@@ -1,5 +1,3 @@
-version: '3.4'
-
 networks:
 	portainer-net:
 	external: true
@@ -9,12 +7,13 @@ services:
 		extends:
 			file: ${COOKBOOK}/portainer/docker-compose.yml
 			service: portainer-agent
-		env_file:
-			- .env
+		networks:
+			- portainer-net
 
 	portainer:
 		extends:
 			file: ${COOKBOOK}/portainer/docker-compose.yml
 			service: portainer
-		env_file:
-			- .env
+		networks:
+			- portainer-net
+			- proxy

qbittorrent/docker-compose.yml

@@ -5,9 +5,9 @@ services:
       - VPN_TYPE=wireguard
       - WEBUI_PASSWORD=${QBT_PASS:-ChangeMePass}
     volumes:
-      - "${VOL_CONFIG_PATH:-./data}/config:/config"
-      - "${VOL_PATH:-./data}/downloads:/downloads"
-      - "${VOL_PATH:-./data}/incomplete:/incomplete"
+      - "${VOL_CONFIG_PATH:-./data}/qbit/config:/config"
+      - "${VOL_PATH:-./data}/qbit/downloads:/downloads"
+      - "${VOL_PATH:-./data}/qbit/incomplete:/incomplete"
       - '/dev/net/tun:/dev/net/tun'
     ports:
      - 8080:8080