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

This commit is contained in:
2025-01-25 18:08:08 -08:00
parent 02c946dad8
commit 206fa153dc
5 changed files with 11 additions and 19 deletions
+2 -2
View File
@@ -10,7 +10,7 @@ services:
- "81:81" - "81:81"
- "443:443" - "443:443"
volumes: volumes:
- "${VOL_PATH:-./data}/proxy-data:/data" - "${VOL_PATH:-./data}/proxy/data:/data"
- "${VOL_PATH:-./data}/proxy-letsencrypt:/etc/letsencrypt" - "${VOL_PATH:-./data}/proxy/letsencrypt:/etc/letsencrypt"
networks: networks:
- proxy - proxy
-4
View File
@@ -1,9 +1,5 @@
version: '3.4'
services: services:
proxy: proxy:
extends: extends:
file: ${COOKBOOK}/nginx-proxy-manager/docker-compose.yml file: ${COOKBOOK}/nginx-proxy-manager/docker-compose.yml
service: proxy service: proxy
env_file:
- .env
+1 -4
View File
@@ -9,8 +9,6 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- "${VOL_PATH:-./config}/portainer:/data" - "${VOL_PATH:-./config}/portainer:/data"
restart: always restart: always
networks:
- portainer-net
portainer-agent: portainer-agent:
image: ${PORTAINER_AGENT_IMAGE:-portainer/agent:latest} image: ${PORTAINER_AGENT_IMAGE:-portainer/agent:latest}
@@ -22,5 +20,4 @@ services:
ports: ports:
- 9001:9001 - 9001:9001
restart: always restart: always
networks:
- portainer-net
+5 -6
View File
@@ -1,5 +1,3 @@
version: '3.4'
networks: networks:
portainer-net: portainer-net:
external: true external: true
@@ -9,12 +7,13 @@ services:
extends: extends:
file: ${COOKBOOK}/portainer/docker-compose.yml file: ${COOKBOOK}/portainer/docker-compose.yml
service: portainer-agent service: portainer-agent
env_file: networks:
- .env - portainer-net
portainer: portainer:
extends: extends:
file: ${COOKBOOK}/portainer/docker-compose.yml file: ${COOKBOOK}/portainer/docker-compose.yml
service: portainer service: portainer
env_file: networks:
- .env - portainer-net
- proxy
+3 -3
View File
@@ -5,9 +5,9 @@ services:
- VPN_TYPE=wireguard - VPN_TYPE=wireguard
- WEBUI_PASSWORD=${QBT_PASS:-ChangeMePass} - WEBUI_PASSWORD=${QBT_PASS:-ChangeMePass}
volumes: volumes:
- "${VOL_CONFIG_PATH:-./data}/config:/config" - "${VOL_CONFIG_PATH:-./data}/qbit/config:/config"
- "${VOL_PATH:-./data}/downloads:/downloads" - "${VOL_PATH:-./data}/qbit/downloads:/downloads"
- "${VOL_PATH:-./data}/incomplete:/incomplete" - "${VOL_PATH:-./data}/qbit/incomplete:/incomplete"
- '/dev/net/tun:/dev/net/tun' - '/dev/net/tun:/dev/net/tun'
ports: ports:
- 8080:8080 - 8080:8080