Fix privoxy container
This commit is contained in:
parent
be87d94d5f
commit
f2ba1632b3
4 changed files with 24 additions and 4 deletions
scripts/Common/Software/docker/services/jellyfin
|
@ -69,12 +69,14 @@ services:
|
||||||
privoxy:
|
privoxy:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile_inline: |
|
dockerfile: rtorrent.Dockerfile
|
||||||
FROM walt3rl/proton-privoxy
|
target: privoxy
|
||||||
RUN apk --update add ip6tables
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
sysctls:
|
||||||
|
net.ipv4.conf.all.rp_filter: 2
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
|
- ./data/proton/privoxy:/proton
|
||||||
devices:
|
devices:
|
||||||
- /dev/net/tun
|
- /dev/net/tun
|
||||||
cap_add:
|
cap_add:
|
||||||
|
@ -115,7 +117,7 @@ services:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- rtorrent:/config
|
- rtorrent:/config
|
||||||
- ./data/downloads:/downloads
|
- ./data/downloads:/downloads
|
||||||
- ./data/proton:/proton
|
- ./data/proton/rtorrent:/proton
|
||||||
devices:
|
devices:
|
||||||
- /dev/net/tun
|
- /dev/net/tun
|
||||||
cap_add:
|
cap_add:
|
||||||
|
|
|
@ -19,6 +19,7 @@ begin
|
||||||
initializeServiceInstallation $argv
|
initializeServiceInstallation $argv
|
||||||
sudo cp "$dir/docker-compose.base.yml" "$root"
|
sudo cp "$dir/docker-compose.base.yml" "$root"
|
||||||
sudo cp "$dir/.dockerignore" "$root"
|
sudo cp "$dir/.dockerignore" "$root"
|
||||||
|
sudo cp "$dir/privoxy.conf" "$root"
|
||||||
sudo cp "$dir/pvpn-cli.py" "$root"
|
sudo cp "$dir/pvpn-cli.py" "$root"
|
||||||
sudo cp "$dir/proton-entrypoint.sh" "$root"
|
sudo cp "$dir/proton-entrypoint.sh" "$root"
|
||||||
sudo cp "$dir/rtorrent.Dockerfile" "$root"
|
sudo cp "$dir/rtorrent.Dockerfile" "$root"
|
||||||
|
|
|
@ -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
|
|
@ -42,3 +42,14 @@ RUN mkdir -p /data/rtorrent
|
||||||
COPY --chmod=777 --from=jesec/rtorrent / /
|
COPY --chmod=777 --from=jesec/rtorrent / /
|
||||||
COPY --chmod=755 ./rtorrent-entrypoint.sh /usr/local/bin/rtorrent-entrypoint
|
COPY --chmod=755 ./rtorrent-entrypoint.sh /usr/local/bin/rtorrent-entrypoint
|
||||||
ENTRYPOINT [ "proton-entrypoint", "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" ]
|
||||||
|
|
Loading…
Reference in a new issue