diff --git a/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml b/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml index b94de85e..bf139b5f 100644 --- a/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml +++ b/scripts/Common/Software/docker/services/jellyfin/docker-compose.base.yml @@ -69,12 +69,14 @@ services: privoxy: build: context: . - dockerfile_inline: | - FROM walt3rl/proton-privoxy - RUN apk --update add ip6tables + dockerfile: rtorrent.Dockerfile + target: privoxy restart: unless-stopped + sysctls: + net.ipv4.conf.all.rp_filter: 2 volumes: - /etc/localtime:/etc/localtime:ro + - ./data/proton/privoxy:/proton devices: - /dev/net/tun cap_add: @@ -115,7 +117,7 @@ services: - /etc/localtime:/etc/localtime:ro - rtorrent:/config - ./data/downloads:/downloads - - ./data/proton:/proton + - ./data/proton/rtorrent:/proton devices: - /dev/net/tun cap_add: diff --git a/scripts/Common/Software/docker/services/jellyfin/main.fish b/scripts/Common/Software/docker/services/jellyfin/main.fish index 17b83caa..50ad4bb4 100755 --- a/scripts/Common/Software/docker/services/jellyfin/main.fish +++ b/scripts/Common/Software/docker/services/jellyfin/main.fish @@ -19,6 +19,7 @@ begin initializeServiceInstallation $argv sudo cp "$dir/docker-compose.base.yml" "$root" sudo cp "$dir/.dockerignore" "$root" + sudo cp "$dir/privoxy.conf" "$root" sudo cp "$dir/pvpn-cli.py" "$root" sudo cp "$dir/proton-entrypoint.sh" "$root" sudo cp "$dir/rtorrent.Dockerfile" "$root" diff --git a/scripts/Common/Software/docker/services/jellyfin/privoxy.conf b/scripts/Common/Software/docker/services/jellyfin/privoxy.conf new file mode 100644 index 00000000..72a483d8 --- /dev/null +++ b/scripts/Common/Software/docker/services/jellyfin/privoxy.conf @@ -0,0 +1,6 @@ +confdir /data/privoxy +logdir /dev/fd/1 +listen-address 0.0.0.0:8080 + +#debug 1 # show each GET/POST/CONNECT request +debug 4096 # Startup banner and warnings diff --git a/scripts/Common/Software/docker/services/jellyfin/rtorrent.Dockerfile b/scripts/Common/Software/docker/services/jellyfin/rtorrent.Dockerfile index 53898ce7..3406add4 100644 --- a/scripts/Common/Software/docker/services/jellyfin/rtorrent.Dockerfile +++ b/scripts/Common/Software/docker/services/jellyfin/rtorrent.Dockerfile @@ -42,3 +42,14 @@ RUN mkdir -p /data/rtorrent COPY --chmod=777 --from=jesec/rtorrent / / COPY --chmod=755 ./rtorrent-entrypoint.sh /usr/local/bin/rtorrent-entrypoint ENTRYPOINT [ "proton-entrypoint", "rtorrent-entrypoint" ] + +FROM vpn AS privoxy +EXPOSE 8080 + +RUN apt-get update \ + && apt-get install -y privoxy \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /data/privoxy +COPY ./privoxy.conf /data/privoxy/ +CMD [ "privoxy", "--no-daemon", "/data/privoxy/privoxy.conf" ]