fix: squid start

Author: nickdlkk

Dockerfile

@@ -8,6 +8,7 @@ RUN apt update && \
         iproute2 \
         socat \
         squid \
+        curl net-tools \
         ca-certificates && \
     # 清理缓存
     apt clean && \

README.md

@@ -174,4 +174,6 @@ docker rm vpn-proxy
 
 # 参考
 
-https://github.com/Ericwyn/ovpn-proxy
+https://github.com/Ericwyn/ovpn-proxy
+
+https://github.com/JefferyBoy/openvpn-to-http-proxy

start.sh

@@ -2,9 +2,16 @@
 
 set -e
 
-echo "==== Try Start Squid Proxy ===="
-# 启动 squid
-squid
+# Start squid service
+start_squid()
+{
+    service squid start
+    if [ ! `service squid status | grep "squid is running" | wc -l` -gt 0 ]; then 
+        echo "Error: failed to start squid service" >&2; 
+        return 1
+    fi
+    return 0
+}
 
 # 启动OpenVPN (后台运行)
 echo "=== Starting OpenVPN ==="
@@ -16,6 +23,20 @@ echo "=== Starting RDP Forwarder ==="
 /rdp-forward.sh &
 RDP_FORWARD_PID=$!
 
+echo "==== Try Start Squid Proxy ===="
+# 启动 squid
+for i in `seq 3`
+do
+    start_squid
+    if [ $? -eq 0 ]; then
+        break 
+    fi
+    if [ $i -eq 3 ]; then
+        echo "Error: failed to start squid service." >&2
+        exit 1
+    fi
+done
+service squid status
 
 # 捕获退出信号
 trap "kill $OPENVPN_PID $RDP_FORWARD_PID 2>/dev/null; exit 0" SIGINT SIGTERM