Update Dockerfile

Dockerfile

@@ -14,46 +14,46 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 # ---- Tor config ----
-RUN echo "\
-SocksPort ${TOR_SOCKS_PORT}\n\
-RunAsDaemon 0\n\
-DataDirectory /var/lib/tor\n\
-" > /etc/tor/torrc
+RUN printf "SocksPort %s\nRunAsDaemon 0\nDataDirectory /var/lib/tor\n" "$TOR_SOCKS_PORT" > /etc/tor/torrc
 
 # ---- Privoxy config ----
-RUN echo "\
-user-manual /usr/share/doc/privoxy/user-manual\n\
+RUN printf "user-manual /usr/share/doc/privoxy/user-manual\n\
 confdir /etc/privoxy\n\
 logdir /var/log/privoxy\n\
-listen-address  0.0.0.0:${PRIVOXY_PORT}\n\
+listen-address  0.0.0.0:%s\n\
 toggle 1\n\
 enable-remote-toggle 0\n\
 enable-remote-http-toggle 0\n\
 enable-edit-actions 0\n\
 enforce-blocks 0\n\
-forward-socks5 / 127.0.0.1:${TOR_SOCKS_PORT} .\n\
-" > /etc/privoxy/config
+forward-socks5 / 127.0.0.1:%s .\n" \
+"$PRIVOXY_PORT" "$TOR_SOCKS_PORT" > /etc/privoxy/config
 
 # ---- Install bore ----
-RUN curl -L https://github.com/ekzhang/bore/releases/latest/download/bore-linux-amd64.zip \
+RUN curl -fsSL https://github.com/ekzhang/bore/releases/latest/download/bore-linux-amd64.zip \
     -o /tmp/bore.zip && \
     unzip /tmp/bore.zip -d /usr/local/bin && \
     chmod +x /usr/local/bin/bore && \
     rm /tmp/bore.zip
 
 # ---- Startup script ----
-RUN echo '#!/bin/bash\n\
-set -e\n\
-echo "[+] Starting Tor..."\n\
-tor &\n\
-sleep 5\n\
-echo "[+] Starting Privoxy on port '${PRIVOXY_PORT}'..."\n\
-privoxy --no-daemon /etc/privoxy/config &\n\
-sleep 3\n\
-echo "[+] Exposing proxy via bore.pub..."\n\
-bore pub ${PRIVOXY_PORT} --to bore.pub\n\
-' > /start.sh && chmod +x /start.sh
+RUN cat << 'EOF' > /start.sh
+#!/bin/bash
+set -e
 
-EXPOSE 7860
+echo "[+] Starting Tor"
+tor &
+sleep 6
+
+echo "[+] Starting Privoxy on port 7860"
+privoxy --no-daemon /etc/privoxy/config &
+sleep 4
+
+echo "[+] Publishing proxy via bore.pub"
+exec bore pub 7860 --to bore.pub
+EOF
 
+RUN chmod +x /start.sh
+
+EXPOSE 7860
 CMD ["/start.sh"]