From 195d61a5048e9543dd9dc7df5f6d7aa724ec03dd Mon Sep 17 00:00:00 2001 From: sigkill64 Date: Fri, 8 Jul 2022 06:11:03 +0800 Subject: [PATCH] update nmp --- custom.env.example | 1 - proxy/Dockerfile | 2 +- proxy/nmp | 2 +- proxy/proxy.run | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/custom.env.example b/custom.env.example index 9239b0e..ed2c4c4 100644 --- a/custom.env.example +++ b/custom.env.example @@ -12,7 +12,6 @@ ARGS_APK_MIRROR='mirrors.aliyun.com' ARGS_ALPINE_VERSION=3.16 ARGS_PYTHON_VERSION=3.8 ARGS_NGINX_VERSION=1.22 -ARGS_PHP_VERSION=8 ARGS_JELLYFIN_VERSION=10.7.7 # proxy service diff --git a/proxy/Dockerfile b/proxy/Dockerfile index 5f06dce..3662c8f 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -6,7 +6,7 @@ ARG APK_MIRROR="dl-cdn.alpinelinux.org" ENV NMP_ENDPOINT="" ENV NMP_TOKEN="" -COPY proxy.run /usr/local/bin/ +COPY proxy.run /usr/bin/ COPY v2ray/config.json /etc/v2ray/ COPY nmp/setup.py /tmp/nmp/ COPY nmp/nmp/ /tmp/nmp/nmp/ diff --git a/proxy/nmp b/proxy/nmp index 242d004..1a11056 160000 --- a/proxy/nmp +++ b/proxy/nmp @@ -1 +1 @@ -Subproject commit 242d00408e42818716b4755af473d53f36d8f934 +Subproject commit 1a1105639c38fd5fdda171cdd037300e3a0ae10c diff --git a/proxy/proxy.run b/proxy/proxy.run index a9cb234..e9998b5 100755 --- a/proxy/proxy.run +++ b/proxy/proxy.run @@ -1,5 +1,5 @@ #!/bin/sh -nmp --uvloop true --server sockv5 --endpoint "${NMP_ENDPOINT}" --host '0.0.0.0' --port 10086 --token "${NMP_TOKEN}" >/dev/null 2>&1 & +nmp --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