diff --git a/arr-stack/docker-compose.yml b/arr-stack/docker-compose.yml index 3dbc0ca..3e4e111 100644 --- a/arr-stack/docker-compose.yml +++ b/arr-stack/docker-compose.yml @@ -29,11 +29,11 @@ services: servarrnetwork: ipv4_address: 172.39.0.2 ports: - - 8085:8080 # qbittorrent web interface + - 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 @@ -50,53 +50,53 @@ services: 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} + # 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} # 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 @@ -104,13 +104,13 @@ services: image: lscr.io/linuxserver/qbittorrent:latest container_name: qbittorrent restart: unless-stopped - labels: - - deunhealth.restart.on.unhealthy=true + #labels: + # - deunhealth.restart.on.unhealthy=true environment: - PUID=${PUID} - PGID=${PGID} - TZ=${TZ} - - WEBUI_PORT=8085 # must match "qbittorrent web interface" port number in gluetun's service above + - WEBUI_PORT=8080 # must match "qbittorrent web interface" port number in gluetun's service above - TORRENTING_PORT=${FIREWALL_VPN_INPUT_PORTS} # airvpn forwarded port, pulled from .env volumes: - ./qbittorrent:/config @@ -128,17 +128,17 @@ services: timeout: 10s # See the 'qBittorrent Stalls with VPN Timeout' section for more information. - deunhealth: - image: qmcgaw/deunhealth - container_name: deunhealth - network_mode: "none" - environment: - - LOG_LEVEL=info - - HEALTH_SERVER_ADDRESS=127.0.0.1:9999 - - TZ=${TZ} - restart: always - volumes: - - /var/run/docker.sock:/var/run/docker.sock + #deunhealth: + # image: qmcgaw/deunhealth + # container_name: deunhealth + # network_mode: "none" + # environment: + # - LOG_LEVEL=info + # - HEALTH_SERVER_ADDRESS=127.0.0.1:9999 + # - TZ=${TZ} + # restart: always + # volumes: + # - /var/run/docker.sock:/var/run/docker.sock nzbget: image: lscr.io/linuxserver/nzbget:latest @@ -169,12 +169,11 @@ services: - /etc/localtime:/etc/localtime:ro - ./prowlarr:/config restart: unless-stopped - depends_on: - gluetun: - condition: service_healthy - restart: true - network_mode: "service:gluetun" - + ports: + - 9696:9696 + networks: + servarrnetwork: + ipv4_address: 172.39.0.11 sonarr: image: lscr.io/linuxserver/sonarr:latest container_name: sonarr @@ -266,8 +265,11 @@ services: - ./seerr:/app/config ports: - 5055:5055 + networks: + servarrnetwork: + ipv4_address: 172.39.0.9 - flaresolverr: + flaresolverr: # DockerHub mirror flaresolverr/flaresolverr:latest image: ghcr.io/flaresolverr/flaresolverr:latest container_name: flaresolverr @@ -279,11 +281,7 @@ services: - TZ=${TZ} volumes: - ./flaresolver:/config - depends_on: - gluetun: - condition: service_healthy - restart: true - network_mode: "service:gluetun" + networks: servarrnetwork: