diff --git a/arr-stack/docker-compose.yml b/arr-stack/docker-compose.yml index 3e4e111..5932bb3 100644 --- a/arr-stack/docker-compose.yml +++ b/arr-stack/docker-compose.yml @@ -32,8 +32,8 @@ services: - 8080:8080 # qbittorrent web interface - 6881:6881 # qbittorrent torrent port - 6789:6789 # nzbget - #- 9696:9696 # prowlarr - #- 8191:8191 # flaresolverr + - 9696:9696 # prowlarr + - 8191:8191 # flaresolverr - 8888:8888/tcp # HTTP proxy - 8388:8388/tcp # Shadowsocks - 8388:8388/udp # Shadowsocks @@ -49,54 +49,54 @@ services: retries: 5 restart: unless-stopped -# WebUI for Gluetun - # gluetun-webui: - # image: scuzza/gluetun-webui:latest - # container_name: gluetun-webui - # ports: - # - "127.0.0.1:3002:3000" - # environment: - # - GLUETUN_CONTROL_URL=http://gluetun:8000 - # - PUID=${PUID} - # - PGID=${PGID} + # WebUI for Gluetun + gluetun-webui: + image: scuzza/gluetun-webui:latest + container_name: gluetun-webui + ports: + - "3002:3000" + environment: + - GLUETUN_CONTROL_URL=http://gluetun:8000 + - PUID=${PUID} + - PGID=${PGID} # Uncomment if Gluetun auth is enabled: #- GLUETUN_API_KEY=yourtoken #- GLUETUN_USER=username #- GLUETUN_PASSWORD=password - # restart: unless-stopped - # read_only: true - # tmpfs: - # - /tmp - # security_opt: - # - no-new-privileges:true - # cap_drop: - # - ALL - # healthcheck: - # test: ["CMD", "wget", "-qO-", "http://localhost:3002/api/health"] - # interval: 30s - # timeout: 5s - # start_period: 10s - # retries: 3 + restart: unless-stopped + read_only: true + tmpfs: + - /tmp + security_opt: + - no-new-privileges:true + cap_drop: + - ALL + healthcheck: + test: ["CMD", "wget", "-qO-", "http://localhost:3002/api/health"] + interval: 30s + timeout: 5s + start_period: 10s + retries: 3 - # gluetun-monitor: - # image: ghcr.io/csmarshall/gluetun-monitor:latest - # # Or from Docker Hub: chasmarshall/gluetun-monitor:latest - # container_name: gluetun-monitor - # restart: unless-stopped - # environment: - # - PUID=${PUID} - # - PGID=${PGID} - # - TZ=${TZ} - # - GLUETUN_CONTAINER=gluetun - # - DEPENDENT_CONTAINERS=auto # auto-discovery (default) - # - CHECK_INTERVAL=30 # seconds between checks - # - TIMEOUT=10 # seconds per site test - # - FAIL_THRESHOLD=2 # consecutive failures to trigger restart - # - HEALTHY_WAIT_TIMEOUT=120 # seconds to wait for healthy status - # volumes: - # - /var/run/docker.sock:/var/run/docker.sock:ro - # - ./sites.conf:/config/sites.conf:ro - # - ./logs:/logs + gluetun-monitor: + image: ghcr.io/csmarshall/gluetun-monitor:latest + # Or from Docker Hub: chasmarshall/gluetun-monitor:latest + container_name: gluetun-monitor + restart: unless-stopped + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TZ} + - GLUETUN_CONTAINER=gluetun + - DEPENDENT_CONTAINERS=auto # auto-discovery (default) + - CHECK_INTERVAL=30 # seconds between checks + - TIMEOUT=10 # seconds per site test + - FAIL_THRESHOLD=2 # consecutive failures to trigger restart + - HEALTHY_WAIT_TIMEOUT=120 # seconds to wait for healthy status + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro + - ./sites.conf:/config/sites.conf:ro + - ./logs:/logs # Containers run through Gluetun. Qbittorrent is on 8085, nzbget is on port 6789, Prowlarr is on port 9696 @@ -168,12 +168,13 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - ./prowlarr:/config + depends_on: + gluetun: + condition: service_healthy + restart: true restart: unless-stopped - ports: - - 9696:9696 - networks: - servarrnetwork: - ipv4_address: 172.39.0.11 + network_mode: "service:gluetun" + sonarr: image: lscr.io/linuxserver/sonarr:latest container_name: sonarr @@ -281,8 +282,14 @@ services: - TZ=${TZ} volumes: - ./flaresolver:/config + depends_on: + gluetun: + condition: service_healthy + restart: true + restart: unless-stopped + network_mode: "service:gluetun" - networks: - servarrnetwork: - ipv4_address: 172.39.0.7 \ No newline at end of file + # networks: + # servarrnetwork: + # ipv4_address: 172.39.0.7 \ No newline at end of file