update Dockerfile ENV

This commit is contained in:
Jason
2020-08-08 18:16:19 +08:00
parent 702cacb65a
commit dd573b067e
2 changed files with 15 additions and 15 deletions

View File

@@ -21,17 +21,17 @@ RUN apk add --update --no-cache iptables iproute2 \
ENV TUN tun0 ENV TUN tun0
ENV ETH eth0 ENV ETH eth0
ENV ETHADDR= ENV ETH_ADDR=
ENV TUNADDR= ENV TUN_ADDR=
ENV TUNMASK= ENV TUN_MASK=
ENV PROXY= ENV PROXY=
ENV LOGLEVEL= ENV LOGLEVEL=
ENV EXCLUDED= ENV EXCLUDED=
ENV EXTRACMD= ENV EXTRACMD=
ENV MONITOR= ENV MONITOR=
ENV MONITORADDR= ENV MONITOR_ADDR=
ENV FAKEDNS= ENV FAKEDNS=
ENV BACKENDDNS= ENV BACKEND_DNS=
ENV HOSTS= ENV HOSTS=
ENTRYPOINT ["/tun2socks.sh"] ENTRYPOINT ["/tun2socks.sh"]

View File

@@ -2,32 +2,32 @@
TUN="${TUN:-tun0}" TUN="${TUN:-tun0}"
ETH="${ETH:-eth0}" ETH="${ETH:-eth0}"
ETHADDR="${ETHADDR:-172.16.1.1}" ETH_ADDR="${ETH_ADDR:-172.16.1.1}"
TUNADDR="${TUNADDR:-198.18.0.1}" TUN_ADDR="${TUN_ADDR:-198.18.0.1}"
TUNMASK="${TUNMASK:-255.254.0.0}" TUN_MASK="${TUN_MASK:-255.254.0.0}"
PROXY="${PROXY:-172.16.1.2:1080}" PROXY="${PROXY:-172.16.1.2:1080}"
LOGLEVEL="${LOGLEVEL:-warning}" LOGLEVEL="${LOGLEVEL:-warning}"
EXCLUDED="${EXCLUDED:-172.16.1.2/32}" EXCLUDED="${EXCLUDED:-172.16.1.2/32}"
MONITOR="${MONITOR:-1}" MONITOR="${MONITOR:-1}"
MONITORADDR="${MONITORADDR:-0.0.0.0:80}" MONITOR_ADDR="${MONITOR_ADDR:-0.0.0.0:80}"
FAKEDNS="${FAKEDNS:-1}" FAKEDNS="${FAKEDNS:-1}"
BACKENDDNS="${BACKENDDNS:-8.8.8.8:53}" BACKEND_DNS="${BACKEND_DNS:-8.8.8.8:53}"
HOSTS="${HOSTS:-localhost=127.0.0.1}" HOSTS="${HOSTS:-localhost=127.0.0.1}"
# create tun device # create tun device
ip tuntap add mode tun dev "$TUN" ip tuntap add mode tun dev "$TUN"
ip addr add "$TUNADDR"/"$TUNMASK" dev "$TUN" ip addr add "$TUN_ADDR"/"$TUN_MASK" dev "$TUN"
ip link set dev "$TUN" up ip link set dev "$TUN" up
# change default gateway # change default gateway
ip route del default > /dev/null ip route del default > /dev/null
ip route add default via "$TUNADDR" dev "$TUN" ip route add default via "$TUN_ADDR" dev "$TUN"
# add to ip route # add to ip route
for ip in $(echo "$EXCLUDED" | tr ',' '\n') for ip in $(echo "$EXCLUDED" | tr ',' '\n')
do do
ip route add "$ip" via "$ETHADDR" ip route add "$ip" via "$ETH_ADDR"
done done
if [ -n "$EXTRACMD" ]; then if [ -n "$EXTRACMD" ]; then
@@ -35,11 +35,11 @@ if [ -n "$EXTRACMD" ]; then
fi fi
if [ "$MONITOR" -ne 0 ]; then if [ "$MONITOR" -ne 0 ]; then
ARGS="-monitor -monitorAddr $MONITORADDR" ARGS="-monitor -monitorAddr $MONITOR_ADDR"
fi fi
if [ "$FAKEDNS" -ne 0 ]; then if [ "$FAKEDNS" -ne 0 ]; then
ARGS="$ARGS -fakeDNS -hosts $HOSTS -backendDNS $BACKENDDNS" ARGS="$ARGS -fakeDNS -hosts $HOSTS -backendDNS $BACKEND_DNS"
fi fi
eval exec /tun2socks -loglevel "$LOGLEVEL" \ eval exec /tun2socks -loglevel "$LOGLEVEL" \