diff --git a/docker-compose.yml b/docker-compose.yml index 965788d..a117055 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,30 +1,28 @@ +--- networks: servarrnetwork: name: servarrnetwork ipam: config: - subnet: 172.39.0.0/24 - services: gluetun: image: qmcgaw/gluetun container_name: gluetun - # line above must be uncommented to allow external containers to connect. - # See https://github.com/qdm12/gluetun-wiki/blob/main/setup/connect-a-container-to-gluetun.md#external-container-to-gluetun cap_add: - NET_ADMIN devices: - /dev/net/tun:/dev/net/tun networks: servarrnetwork: - ipv4_address: 172.39.0.2 + ipv4_address: 172.39.0.2 ports: - 6881:6881 - 6881:6881/udp - - 8085:8085 # qbittorrent web ui - - 6881:6881 # qbittorrent torrent port - - 6789:6789 # nzbget - - 9696:9696 # Prowlarr + - 8085:8085 + - 6881:6881 + - 6789:6789 + - 9696:9696 volumes: - ./gluetun:/gluetun healthcheck: @@ -33,23 +31,13 @@ services: timeout: 10s retries: 5 environment: - # See https://github.com/qdm12/gluetun-wiki/tree/main/setup#setup - VPN_SERVICE_PROVIDER=private internet access - # - VPN_TYPE=wireguard - # OpenVPN: - OPENVPN_USER=p5492873 - OPENVPN_PASSWORD=5goiaAsYEg - SERVER_REGIONS=Lithuania - # Wireguard: - # - WIREGUARD_PRIVATE_KEY= # See https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/nordvpn.md#obtain-your-wireguard-private-key - # - WIREGUARD_ADDRESSES=10.5.0.2/32 - # Timezone for accurate log times - TZ=America/Chicago - # Server list updater - # See https://github.com/qdm12/gluetun-wiki/blob/main/setup/servers.md#update-the-vpn-servers-list - UPDATER_PERIOD=24h - restart: always - + restart: always qbittorrent: image: lscr.io/linuxserver/qbittorrent container_name: qbittorrent @@ -73,11 +61,10 @@ services: retries: 3 start_period: 20s timeout: 10s - - deunhealth: + deunhealth: image: qmcgaw/deunhealth container_name: deunhealth - network_mode: "none" + network_mode: none environment: - LOG_LEVEL=info - HEALTH_SERVER_ADDRESS=127.0.0.1:9999 @@ -85,7 +72,6 @@ services: restart: always volumes: - /var/run/docker.sock:/var/run/docker.sock - nzbget: image: lscr.io/linuxserver/nzbget:latest container_name: nzbget @@ -103,7 +89,6 @@ services: restart: true restart: unless-stopped network_mode: service:gluetun - prowlarr: image: lscr.io/linuxserver/prowlarr:latest container_name: prowlarr @@ -120,7 +105,6 @@ services: condition: service_healthy restart: true network_mode: service:gluetun - sonarr: image: lscr.io/linuxserver/sonarr:latest container_name: sonarr @@ -129,7 +113,7 @@ services: - PGID=1000 - TZ=America/Chicago volumes: - - /etc/localtime:/etc/localtime:ro + - /etc/localtime:/etc/localtime:ro - ./sonarr:/config - /data:/data restart: unless-stopped @@ -138,7 +122,6 @@ services: networks: servarrnetwork: ipv4_address: 172.39.0.3 - lidarr: image: lscr.io/linuxserver/lidarr:latest container_name: lidarr @@ -154,9 +137,8 @@ services: - 8686:8686 networks: servarrnetwork: - ipv4_address: 172.39.0.5 + ipv4_address: 172.39.0.5 restart: unless-stopped - radarr: image: lscr.io/linuxserver/radarr:latest container_name: radarr @@ -172,26 +154,8 @@ services: - 7878:7878 networks: servarrnetwork: - ipv4_address: 172.39.0.4 + ipv4_address: 172.39.0.4 restart: unless-stopped - - prowlarr: - image: lscr.io/linuxserver/prowlarr:latest - container_name: prowlarr - environment: - - PUID=1000 - - PGID=1000 - - TZ=America/Chicago - volumes: - - /etc/localtime:/etc/localtime:ro - - ./prowlarr:/config - restart: unless-stopped - depends_on: - gluetun: - condition: service_healthy - restart: true - network_mode: service:gluetun - bazarr: image: lscr.io/linuxserver/bazarr:latest container_name: bazarr @@ -209,8 +173,6 @@ services: networks: servarrnetwork: ipv4_address: 172.39.0.6 - - ytdl-sub: image: ghcr.io/jmbannon/ytdl-sub:latest container_name: ytdl-sub @@ -226,7 +188,6 @@ services: servarrnetwork: ipv4_address: 172.39.0.8 restart: unless-stopped - jellyseerr: container_name: jellyseerr image: fallenbagel/jellyseerr:latest @@ -241,4 +202,4 @@ services: networks: servarrnetwork: ipv4_address: 172.39.0.9 - restart: unless-stopped \ No newline at end of file + restart: unless-stopped