From 217d79b8f8791e661acfb5d066cacf5a624c416c Mon Sep 17 00:00:00 2001
From: Jason <xjasonlyu@gmail.com>
Date: Thu, 6 Aug 2020 19:20:26 +0800
Subject: [PATCH] update Dockerfile & script

---
 Dockerfile   | 12 ++++++++++--
 tun2socks.sh |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bb284b2..1f89671 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,17 +9,25 @@ RUN apk add --update --no-cache \
     && go get -u github.com/gobuffalo/packr/packr \
     && packr \
     && make build \
-    && mv ./bin/tun2socks /tun2socks
+    && /tun2socks-src/bin/tun2socks -version
 
 FROM alpine:latest
 
 COPY ./tun2socks.sh /
-COPY --from=builder /tun2socks /usr/local/bin
+COPY --from=builder /tun2socks-src/bin/tun2socks /tun2socks
 
 RUN apk add --update --no-cache iproute2 \
     && chmod +x /tun2socks.sh
 
 ENV TUN tun0
 ENV ETH eth0
+ENV ETHGW=
+ENV TUNGW=
+ENV PROXY=
+ENV MONITOR=
+ENV LOGLEVEL=
+ENV EXCLUDED=
+ENV BACKENDDNS=
+ENV HOSTS=
 
 ENTRYPOINT ["/tun2socks.sh"]
diff --git a/tun2socks.sh b/tun2socks.sh
index 2be63d4..eb76444 100644
--- a/tun2socks.sh
+++ b/tun2socks.sh
@@ -27,9 +27,9 @@ do
 done
 
 # DNS settings
-echo "nameserver $TUNGW" > /etc/resolv.conf
+echo "nameserver $TUNGW" >> /etc/resolv.conf
 
-exec tun2socks -loglevel $LOGLEVEL \
+exec /tun2socks -loglevel $LOGLEVEL \
     -tunName $TUN -proxyServer $PROXY \
     -monitor -monitorAddr $MONITOR \
     -fakeDNS -hosts $HOSTS \