diff --git a/docker-compose.new.yml b/docker-compose.new.yml index a2ebd0c..0e780ac 100644 --- a/docker-compose.new.yml +++ b/docker-compose.new.yml @@ -8,9 +8,9 @@ services: - PGID=1000 - TZ=America/Detroit volumes: - - "C:/Media Server/Config/Jellyfin:/config" - - "M:/Media/Movies:/data/movies" - - "M:/Media/TV Shows:/data/tvshows" + - ${JELLYFIN_CONFIG}:/config + - ${MOVIES}:/data/movies + - ${TV_SHOWS}:/data/tvshows ports: - 8096:8096 restart: unless-stopped @@ -24,7 +24,7 @@ services: ports: - 5055:5055 volumes: - - "C:/Media Server/Config/Jellyseer:/app/config" + - ${JELLYSEER_CONFIG}:/app/config restart: unless-stopped sonarr: @@ -35,9 +35,9 @@ services: - PGID=1000 - TZ=America/Detroit volumes: - - "C:/Media Server/Config/Sonarr:/config" - - "M:/Media/TV Shows:/data/tvshows" - - "M:/Media/Downloads:/downloads" + - ${SONARR_CONFIG}:/config + - ${TV_SHOWS}:/data/tvshows + - ${DOWNLOADS}:/downloads ports: - 8989:8989 restart: unless-stopped @@ -50,9 +50,9 @@ services: - PGID=1000 - TZ=America/Detroit volumes: - - "C:/Media Server/Config/Radarr:/config" - - "M:/Media/Movies:/data/movies" - - "M:/Media/Downloads:/downloads" + - ${RADARR_CONFIG}:/config + - ${MOVIES}:/data/movies + - ${DOWNLOADS}:/downloads ports: - 7878:7878 restart: unless-stopped @@ -65,7 +65,7 @@ services: - PGID=1000 - TZ=America/Detroit volumes: - - "C:/Media Server/Config/Prowlarr:/config" + - ${PROWLARR_CONFIG}:/config ports: - 9696:9696 restart: unless-stopped @@ -89,9 +89,49 @@ services: - PGID=1000 - TZ=Etc/UTC volumes: - - "C:/Media Server/Config/Bazarr:/config" - - "M:/Media/Movies:/data/movies" - - "M:/Media/TV Shows:/data/tvshows" + - ${BAZARR_CONFIG}:/config + - ${MOVIES}:/data/movies + - ${TV_SHOWS}:/data/tvshows ports: - 6767:6767 restart: unless-stopped + + gluetun: + image: qmcgaw/gluetun:latest + container_name: gluetun + cap_add: + - NET_ADMIN + environment: + - VPN_SERVICE_PROVIDER=${VPN_SERVICE_PROVIDER} + # OpenVPN: + - VPN_TYPE=openvpn + - OPENVPN_USER=${USER} + - OPENVPN_PASSWORD=${PASSWORD} + # Wireguard: + # - VPN_TYPE=wiregaurd + # - WIREGUARD_PRIVATE_KEY=${WIREGAURD_PRIVATE_KEY} + # - WIREGUARD_ADDRESSES=${WIREGAURD_ADDRESSES} + - SERVER_COUNTRIES=${SERVER_COUNTRIES} + # Gluetun wiki has other env var for specific vpns + - TZ=America/Detroit + volumes: + - ${GLUETUN_CONFIG}:/gluetun + ports: + - 8080:8080 + restart: unless-stopped + + qbittorrent: + image: lscr.io/linuxserver/qbittorrent:latest + container_name: qbittorrent + network_mode: "service:gluetun" + depends_on: + - gluetun + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/Detroit + - WEBUI_PORT=8080 + volumes: + - ${QBITTORRENT_CONFIG}:/config + - ${DOWNLOADS}:/downloads + restart: unless-stopped