Update Dockerfile
Browse files- Dockerfile +11 -46
Dockerfile
CHANGED
|
@@ -1,54 +1,19 @@
|
|
| 1 |
-
|
|
|
|
| 2 |
|
| 3 |
-
|
| 4 |
-
|
| 5 |
-
|
| 6 |
-
|
| 7 |
-
# ---- Fix apt HF ----
|
| 8 |
-
RUN apt-get update && \
|
| 9 |
-
apt-get install -y --no-install-recommends \
|
| 10 |
-
tor \
|
| 11 |
-
privoxy \
|
| 12 |
-
curl \
|
| 13 |
-
ca-certificates \
|
| 14 |
-
unzip \
|
| 15 |
-
&& rm -rf /var/lib/apt/lists/*
|
| 16 |
-
|
| 17 |
-
# ---- Tor config ----
|
| 18 |
-
RUN printf "SocksPort %s\nRunAsDaemon 0\nDataDirectory /var/lib/tor\n" \
|
| 19 |
-
"$TOR_SOCKS_PORT" > /etc/tor/torrc
|
| 20 |
-
|
| 21 |
-
# ---- Privoxy config ----
|
| 22 |
-
RUN printf "user-manual /usr/share/doc/privoxy/user-manual\n\
|
| 23 |
-
confdir /etc/privoxy\n\
|
| 24 |
-
logdir /var/log/privoxy\n\
|
| 25 |
-
listen-address 0.0.0.0:%s\n\
|
| 26 |
-
toggle 1\n\
|
| 27 |
-
enable-remote-toggle 0\n\
|
| 28 |
-
enable-remote-http-toggle 0\n\
|
| 29 |
-
enable-edit-actions 0\n\
|
| 30 |
-
enforce-blocks 0\n\
|
| 31 |
-
forward-socks5 / 127.0.0.1:%s .\n" \
|
| 32 |
-
"$PRIVOXY_PORT" "$TOR_SOCKS_PORT" > /etc/privoxy/config
|
| 33 |
-
|
| 34 |
-
# ---- Install bore ----
|
| 35 |
-
RUN curl -fsSL https://github.com/ekzhang/bore/releases/latest/download/bore-linux-amd64.zip \
|
| 36 |
-o /tmp/bore.zip && \
|
| 37 |
unzip /tmp/bore.zip -d /usr/local/bin && \
|
| 38 |
chmod +x /usr/local/bin/bore && \
|
| 39 |
rm /tmp/bore.zip
|
| 40 |
|
| 41 |
-
#
|
| 42 |
-
RUN printf '#!/bin/
|
| 43 |
-
|
| 44 |
-
echo "[+]
|
| 45 |
-
|
| 46 |
-
sleep 8\n\
|
| 47 |
-
echo "[+] Privoxy starting"\n\
|
| 48 |
-
privoxy --no-daemon /etc/privoxy/config &\n\
|
| 49 |
-
sleep 4\n\
|
| 50 |
-
echo "[+] Exposing via bore.pub"\n\
|
| 51 |
-
exec bore pub 7860 --to bore.pub\n' > /start.sh && chmod +x /start.sh
|
| 52 |
|
| 53 |
-
EXPOSE
|
| 54 |
CMD ["/start.sh"]
|
|
|
|
| 1 |
+
# 1) Base image pré‑configurée tor+privoxy
|
| 2 |
+
FROM dockage/tor-privoxy
|
| 3 |
|
| 4 |
+
# 2) Ajout de bore
|
| 5 |
+
RUN apk add --no-cache curl unzip && \
|
| 6 |
+
curl -fsSL https://github.com/ekzhang/bore/releases/latest/download/bore-linux-musl.zip \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 7 |
-o /tmp/bore.zip && \
|
| 8 |
unzip /tmp/bore.zip -d /usr/local/bin && \
|
| 9 |
chmod +x /usr/local/bin/bore && \
|
| 10 |
rm /tmp/bore.zip
|
| 11 |
|
| 12 |
+
# 3) On remplace le startup pour lancer bore
|
| 13 |
+
RUN printf '#!/bin/sh\n\
|
| 14 |
+
echo "[+] Tor + Privoxy ready (8118)";\n\
|
| 15 |
+
echo "[+] Publishing proxy via bore.pub";\n\
|
| 16 |
+
exec bore pub 8118 --to bore.pub\n' > /start.sh && chmod +x /start.sh
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 17 |
|
| 18 |
+
EXPOSE 8118
|
| 19 |
CMD ["/start.sh"]
|