From 7bbe824071292e14234de2f50d43b685330cca35 Mon Sep 17 00:00:00 2001
From: Menno van Leeuwen <menno@vleeuwen.me>
Date: Thu, 27 Mar 2025 13:06:48 +0100
Subject: [PATCH] feat: simplify docker-compose configuration by removing
 static IP assignments and unused services

---
 .../services/arr-stack/docker-compose.yml.j2  | 50 ++++---------------
 1 file changed, 9 insertions(+), 41 deletions(-)

diff --git a/config/ansible/tasks/servers/services/arr-stack/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/arr-stack/docker-compose.yml.j2
index 48ef0ac..98a07d4 100644
--- a/config/ansible/tasks/servers/services/arr-stack/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/arr-stack/docker-compose.yml.j2
@@ -16,8 +16,7 @@ services:
       - /mnt/object_storage:/storage
     restart: "unless-stopped"
     networks:
-      arr-stack-net:
-        ipv4_address: 172.20.0.4
+      - arr-stack-net
 
   sonarr:
     image: linuxserver/sonarr:latest
@@ -35,12 +34,10 @@ services:
       - host.docker.internal:host-gateway
     restart: unless-stopped
     networks:
-      arr-stack-net:
-        ipv4_address: 172.20.0.3
+      - arr-stack-net
 
   lidarr:
     image: linuxserver/lidarr:latest
-    container_name: lidarr
     environment:
       - PUID=1000
       - PGID=100
@@ -54,8 +51,7 @@ services:
       - /mnt/object_storage:/storage
     restart: unless-stopped
     networks:
-      arr-stack-net:
-        ipv4_address: 172.20.0.5
+      - arr-stack-net
 
   prowlarr:
     container_name: prowlarr
@@ -66,11 +62,13 @@ services:
       - TZ=Europe/Amsterdam
     volumes:
       - {{ arr_stack_data_dir }}/prowlarr-config:/config
+    extra_hosts:
+      - host.docker.internal:host-gateway
+    ports:
+      - 9696:9696
     restart: unless-stopped
-    network_mode: "service:gluetun-prowlarr"
-    depends_on:
-      gluetun-prowlarr:
-        condition: service_healthy
+    networks:
+      - arr-stack-net
 
   flaresolverr:
     image: ghcr.io/flaresolverr/flaresolverr:latest
@@ -106,38 +104,8 @@ services:
       - arr-stack-net
       - 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:
   arr-stack-net:
-    ipam:
-      config:
-        - subnet: 172.20.0.0/24
   caddy_network:
     external: true
     name: caddy_default