wangjia/nas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(frp): DSM docker 不在 sudo secure_path,改绝对路径 /usr/local/bin/docker(-compose)

Browse Source
This commit is contained in:
wangjia
2026-07-15 06:36:10 +08:00
parent 44162851ed
commit 01d080a68e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/setup-frp-on-nas.sh
+7 -4
View File
@@ -77,11 +77,14 @@ services:
EOF EOF
echo "==> 2/6 拉起 frpc 容器" 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" cd "$FRP_DIR"
if sudo docker compose version >/dev/null 2>&1; then if sudo "$COMPOSE" version >/dev/null 2>&1; then
sudo docker compose up -d sudo "$COMPOSE" up -d
else else
sudo docker-compose up -d sudo "$DOCKER" compose up -d
fi fi
echo "==> 3/6 mihomo：hosts 覆盖 + fake-ip-filter + use-hosts（幂等）" 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 隧道" echo "==> 6/6 验证 frpc 隧道"
sleep 2 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" rm -f "$TOKEN_FILE"
echo "" echo ""
echo "完成。检查上方日志：应有 'login to server success'，且 git-ssh/git-web/dsm/nas-ssh/win-rdp/win-ssh 六个 proxy 'start proxy success'。" echo "完成。检查上方日志：应有 'login to server success'，且 git-ssh/git-web/dsm/nas-ssh/win-rdp/win-ssh 六个 proxy 'start proxy success'。"