diff --git a/docker_init.sh b/docker_init.sh index 5319fc7..63c0f25 100644 --- a/docker_init.sh +++ b/docker_init.sh @@ -36,7 +36,8 @@ check_latest_sing-box() { install() { # 下载 sing-box echo "正在下载 sing-box ..." - local ONLINE=$(check_latest_sing-box) + #####local ONLINE=$(check_latest_sing-box) + local ONLINE='1.11.0-alpha.6' wget https://github.com/SagerNet/sing-box/releases/download/v$ONLINE/sing-box-$ONLINE-linux-$SING_BOX_ARCH.tar.gz -O- | tar xz -C $WORK_DIR sing-box-$ONLINE-linux-$SING_BOX_ARCH/sing-box && mv $WORK_DIR/sing-box-$ONLINE-linux-$SING_BOX_ARCH/sing-box $WORK_DIR/sing-box && rm -rf $WORK_DIR/sing-box-$ONLINE-linux-$SING_BOX_ARCH # 下载 jq @@ -692,7 +693,8 @@ stdout_logfile=/dev/null #include /etc/nginx/conf.d/*.conf; server { - listen 127.0.0.1:$START_PORT ssl http2; # sing-box backend + listen 127.0.0.1:$START_PORT ssl ; # sing-box backend + http2 on; server_name addons.mozilla.org; ssl_certificate $WORK_DIR/cert/cert.pem; @@ -702,7 +704,7 @@ stdout_logfile=/dev/null ssl_stapling off; ssl_stapling_verify off;" - [ "${VMESS_WS}" = 'true' ] && NGINX_CONF+=" + [ "${VLESS_WS}" = 'true' ] && NGINX_CONF+=" # 反代 sing-box vless websocket location /${UUID}-vless { if (\$http_upgrade != "websocket") { @@ -718,7 +720,7 @@ stdout_logfile=/dev/null proxy_redirect off; }" - [ "${VLESS_WS}" = 'true' ] && NGINX_CONF+=" + [ "${VMESS_WS}" = 'true' ] && NGINX_CONF+=" # 反代 sing-box websocket location /${UUID}-vmess { if (\$http_upgrade != "websocket") { @@ -1154,7 +1156,8 @@ $($WORK_DIR/qrencode https://${ARGO_DOMAIN}/${UUID}/auto) # Sing-box 的最新版本 update_sing-box() { - local ONLINE=$(check_latest_sing-box) + #####local ONLINE=$(check_latest_sing-box) + local ONLINE='1.11.0-alpha.6' local LOCAL=$($WORK_DIR/sing-box version | awk '/version/{print $NF}') if [ -n "$ONLINE" ]; then if [[ "$ONLINE" != "$LOCAL" ]]; then diff --git a/sing-box.sh b/sing-box.sh index b1a8447..a092cd1 100644 --- a/sing-box.sh +++ b/sing-box.sh @@ -518,8 +518,8 @@ check_install() { if [ "${STATUS[0]}" = "$(text 26)" ] && [ ! -s $WORK_DIR/sing-box ]; then { local VERSION_LATEST=$(wget --no-check-certificate --tries=2 --timeout=3 -qO- ${GH_PROXY}https://api.github.com/repos/SagerNet/sing-box/releases | awk -F '["v-]' '/tag_name/{print $5}' | sort -Vr | sed -n '1p') - local ONLINE=$(wget --no-check-certificate --tries=2 --timeout=3 -qO- ${GH_PROXY}https://api.github.com/repos/SagerNet/sing-box/releases | awk -F '["v]' -v var="tag_name.*$VERSION_LATEST" '$0 ~ var {print $5; exit}') - ONLINE=${ONLINE:-'1.10.0-beta.11'} + #####local ONLINE=$(wget --no-check-certificate --tries=2 --timeout=3 -qO- ${GH_PROXY}https://api.github.com/repos/SagerNet/sing-box/releases | awk -F '["v]' -v var="tag_name.*$VERSION_LATEST" '$0 ~ var {print $5; exit}') + ONLINE=${ONLINE:-'1.11.0-alpha.6'} wget --no-check-certificate --continue ${GH_PROXY}https://github.com/SagerNet/sing-box/releases/download/v$ONLINE/sing-box-$ONLINE-linux-$SING_BOX_ARCH.tar.gz -qO- | tar xz -C $TEMP_DIR sing-box-$ONLINE-linux-$SING_BOX_ARCH/sing-box >/dev/null 2>&1 [ -s $TEMP_DIR/sing-box-$ONLINE-linux-$SING_BOX_ARCH/sing-box ] && mv $TEMP_DIR/sing-box-$ONLINE-linux-$SING_BOX_ARCH/sing-box $TEMP_DIR wget --no-check-certificate --continue -qO $TEMP_DIR/jq ${GH_PROXY}https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-$JQ_ARCH >/dev/null 2>&1 && chmod +x $TEMP_DIR/jq >/dev/null 2>&1 @@ -2863,7 +2863,8 @@ uninstall() { # Sing-box 的最新版本 version() { local VERSION_LATEST=$(wget --no-check-certificate -qO- ${GH_PROXY}https://api.github.com/repos/SagerNet/sing-box/releases | awk -F '["v-]' '/tag_name/{print $5}' | sort -Vr | sed -n '1p') - local ONLINE=$(wget --no-check-certificate -qO- ${GH_PROXY}https://api.github.com/repos/SagerNet/sing-box/releases | awk -F '["v]' -v var="tag_name.*$VERSION_LATEST" '$0 ~ var {print $5; exit}') + #####local ONLINE=$(wget --no-check-certificate -qO- ${GH_PROXY}https://api.github.com/repos/SagerNet/sing-box/releases | awk -F '["v]' -v var="tag_name.*$VERSION_LATEST" '$0 ~ var {print $5; exit}') + local ONLINE='1.11.0-alpha.6' local LOCAL=$($WORK_DIR/sing-box version | awk '/version/{print $NF}') info "\n $(text 40) " [[ -n "$ONLINE" && "$ONLINE" != "$LOCAL" ]] && reading "\n $(text 9) " UPDATE || info " $(text 41) "