feat: simplify docker-compose configuration by removing static IP assignments and unused services
This commit is contained in:
@@ -16,8 +16,7 @@ services:
|
|||||||
- /mnt/object_storage:/storage
|
- /mnt/object_storage:/storage
|
||||||
restart: "unless-stopped"
|
restart: "unless-stopped"
|
||||||
networks:
|
networks:
|
||||||
arr-stack-net:
|
- arr-stack-net
|
||||||
ipv4_address: 172.20.0.4
|
|
||||||
|
|
||||||
sonarr:
|
sonarr:
|
||||||
image: linuxserver/sonarr:latest
|
image: linuxserver/sonarr:latest
|
||||||
@@ -35,12 +34,10 @@ services:
|
|||||||
- host.docker.internal:host-gateway
|
- host.docker.internal:host-gateway
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
arr-stack-net:
|
- arr-stack-net
|
||||||
ipv4_address: 172.20.0.3
|
|
||||||
|
|
||||||
lidarr:
|
lidarr:
|
||||||
image: linuxserver/lidarr:latest
|
image: linuxserver/lidarr:latest
|
||||||
container_name: lidarr
|
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
- PGID=100
|
- PGID=100
|
||||||
@@ -54,8 +51,7 @@ services:
|
|||||||
- /mnt/object_storage:/storage
|
- /mnt/object_storage:/storage
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
arr-stack-net:
|
- arr-stack-net
|
||||||
ipv4_address: 172.20.0.5
|
|
||||||
|
|
||||||
prowlarr:
|
prowlarr:
|
||||||
container_name: prowlarr
|
container_name: prowlarr
|
||||||
@@ -66,11 +62,13 @@ services:
|
|||||||
- TZ=Europe/Amsterdam
|
- TZ=Europe/Amsterdam
|
||||||
volumes:
|
volumes:
|
||||||
- {{ arr_stack_data_dir }}/prowlarr-config:/config
|
- {{ arr_stack_data_dir }}/prowlarr-config:/config
|
||||||
|
extra_hosts:
|
||||||
|
- host.docker.internal:host-gateway
|
||||||
|
ports:
|
||||||
|
- 9696:9696
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
network_mode: "service:gluetun-prowlarr"
|
networks:
|
||||||
depends_on:
|
- arr-stack-net
|
||||||
gluetun-prowlarr:
|
|
||||||
condition: service_healthy
|
|
||||||
|
|
||||||
flaresolverr:
|
flaresolverr:
|
||||||
image: ghcr.io/flaresolverr/flaresolverr:latest
|
image: ghcr.io/flaresolverr/flaresolverr:latest
|
||||||
@@ -106,38 +104,8 @@ services:
|
|||||||
- arr-stack-net
|
- arr-stack-net
|
||||||
- caddy_network
|
- caddy_network
|
||||||
|
|
||||||
gluetun-prowlarr:
|
|
||||||
image: qmcgaw/gluetun:latest
|
|
||||||
privileged: true
|
|
||||||
cap_add:
|
|
||||||
- NET_ADMIN
|
|
||||||
devices:
|
|
||||||
- /dev/net/tun:/dev/net/tun
|
|
||||||
volumes:
|
|
||||||
- {{ arr_stack_data_dir }}/gluetun-prowlarr-config:/gluetun
|
|
||||||
ports:
|
|
||||||
- 9696:9696 # Prowlarr
|
|
||||||
environment:
|
|
||||||
- PUID=1000
|
|
||||||
- PGID=100
|
|
||||||
- VPN_SERVICE_PROVIDER={{ lookup('community.general.onepassword', 'qm7lxjrv2ctgzsjuwtolxpd5i4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='VPN_SERVICE_PROVIDER') }}
|
|
||||||
- OPENVPN_USER={{ lookup('community.general.onepassword', 'qm7lxjrv2ctgzsjuwtolxpd5i4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='OPENVPN_USER') }}
|
|
||||||
- OPENVPN_PASSWORD={{ lookup('community.general.onepassword', 'qm7lxjrv2ctgzsjuwtolxpd5i4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='OPENVPN_PASSWORD') }}
|
|
||||||
- SERVER_COUNTRIES={{ lookup('community.general.onepassword', 'qm7lxjrv2ctgzsjuwtolxpd5i4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='SERVER_COUNTRIES') }}
|
|
||||||
extra_hosts:
|
|
||||||
- "lidarr:172.20.0.5"
|
|
||||||
- "radarr:172.20.0.4"
|
|
||||||
- "sonarr:172.20.0.3"
|
|
||||||
restart: always
|
|
||||||
networks:
|
|
||||||
arr-stack-net:
|
|
||||||
ipv4_address: 172.20.0.6
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
arr-stack-net:
|
arr-stack-net:
|
||||||
ipam:
|
|
||||||
config:
|
|
||||||
- subnet: 172.20.0.0/24
|
|
||||||
caddy_network:
|
caddy_network:
|
||||||
external: true
|
external: true
|
||||||
name: caddy_default
|
name: caddy_default
|
||||||
|
Reference in New Issue
Block a user