diff --git a/scripts/setup-frp-on-nas.sh b/scripts/setup-frp-on-nas.sh index 04f2970..f558d82 100755 --- a/scripts/setup-frp-on-nas.sh +++ b/scripts/setup-frp-on-nas.sh @@ -77,11 +77,14 @@ services: EOF echo "==> 2/6 拉起 frpc 容器" +# DSM 的 docker 在 /usr/local/bin(Container Manager 符号链接),不在 sudo 的 secure_path 里,必须绝对路径 +DOCKER=/usr/local/bin/docker +COMPOSE=/usr/local/bin/docker-compose cd "$FRP_DIR" -if sudo docker compose version >/dev/null 2>&1; then - sudo docker compose up -d +if sudo "$COMPOSE" version >/dev/null 2>&1; then + sudo "$COMPOSE" up -d else - sudo docker-compose up -d + sudo "$DOCKER" compose up -d fi echo "==> 3/6 mihomo:hosts 覆盖 + fake-ip-filter + use-hosts(幂等)" @@ -181,7 +184,7 @@ nslookup git.yanmeiai.com 127.0.0.1 2>&1 | tail -3 echo "==> 6/6 验证 frpc 隧道" sleep 2 -sudo docker logs frpc --tail 20 2>&1 || true +sudo /usr/local/bin/docker logs frpc --tail 20 2>&1 || true rm -f "$TOKEN_FILE" echo "" echo "完成。检查上方日志:应有 'login to server success',且 git-ssh/git-web/dsm/nas-ssh/win-rdp/win-ssh 六个 proxy 'start proxy success'。"