diff --git a/proxy/Dockerfile b/proxy/Dockerfile index 3662c8f..91e06c7 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -13,7 +13,7 @@ COPY nmp/nmp/ /tmp/nmp/nmp/ RUN sed -i "s/dl-cdn.alpinelinux.org/${APK_MIRROR}/g" /etc/apk/repositories && \ apk add --no-cache --no-progress v2ray && \ - chmod +x /usr/local/bin/proxy.run && \ + chmod +x /usr/bin/proxy.run && \ cd /tmp/nmp && python setup.py develop EXPOSE 10086 10080 diff --git a/proxy/nmp b/proxy/nmp index 1a11056..de655f2 160000 --- a/proxy/nmp +++ b/proxy/nmp @@ -1 +1 @@ -Subproject commit 1a1105639c38fd5fdda171cdd037300e3a0ae10c +Subproject commit de655f2b2620e65c2850359c637187a8bce2c2c9 diff --git a/proxy/proxy.run b/proxy/proxy.run index e9998b5..d47f88d 100755 --- a/proxy/proxy.run +++ b/proxy/proxy.run @@ -1,5 +1,5 @@ #!/bin/sh -nmp --server sockv5 --endpoint "${NMP_ENDPOINT}" --host '0.0.0.0' --port 10086 --token "${NMP_TOKEN}" >/dev/null 2>&1 & +nmp --pre_connect true --server sockv5 --endpoint "${NMP_ENDPOINT}" --host '0.0.0.0' --port 10086 --token "${NMP_TOKEN}" >/dev/null 2>&1 & sleep 1 exec v2ray -config /etc/v2ray/config.json >/dev/null 2>&1