Docker 容器无限重启？只因 v3.7.0 少了一个 serve —— 思源笔记 CLI 破坏性变更修复实录

version: "3.9"
services:
  main:
    image: b3log/siyuan:v3.7.0
    command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=xxx']
    ports:
      - 6806:6806
    volumes:
      - /docker/siyuan_data:/siyuan/workspace
    restart: always
    environment:
      - PUID=1001
      - PGID=1002
      - SIYUAN_LANG=zh-CN

$ docker ps --filter name=siyuan
NAMES          STATUS
siyuan-qiniu   Restarting (1) 8 seconds ago

$ docker logs --tail 40 siyuan-qiniu
Error: unknown flag: --accessAuthCode
Usage:
  kernel [command]

Available Commands:
  asset       Manage assets
  attr        Manage block attributes
  block       Block operations
  bookmark    Manage bookmarks
  completion  Generate the autocompletion script
  serve       Start kernel HTTP server
  export      Export documents
  ...
Flags:
      --dry-run            dry run mode
  -h, --help               help for kernel
  -w, --workspace string   workspace path

command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=xxx']

- command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=xxx']
+ command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=xxx']

# siyuan-fix.ps1 — 思源 v3.7.0 容器修复脚本
# 用法：.\siyuan-fix.ps1 -ServerHost <docker-host> -ServerUser root -StackName siyuan-note-qiniu
param(
    [Parameter(Mandatory=$true)][string]$ServerHost,
    [string]$ServerUser = "root",
    [string]$StackName = "siyuan-note-qiniu"
)

$ErrorActionPreference = "Stop"

Write-Host "=== 思源 v3.7.0 Docker 容器修复 ===" -ForegroundColor Cyan

# 1. 检测容器状态
Write-Host "[1/5] 检查容器状态..." -ForegroundColor Yellow
$status = ssh "${ServerUser}@${ServerHost}" "docker ps --filter name=$StackName --format '{{.Status}}'"
Write-Host "  容器状态: $status"

# 2. 查看日志确认问题
Write-Host "[2/5] 查看容器日志..." -ForegroundColor Yellow
$logs = ssh "${ServerUser}@${ServerHost}" "docker logs --tail 20 $($StackName)_main_1 2>&1 || docker logs --tail 20 siyuan-qiniu 2>&1 || docker logs --tail 20 \$(docker ps -a --filter name=siyuan --format '{{.Names}}') 2>&1"
if ($logs -match "unknown flag.*accessAuthCode") {
    Write-Host "  ✓ 确认为 v3.7.0 CLI 变更导致的问题" -ForegroundColor Green
} else {
    Write-Host "  ⚠ 错误信息与预期不符，请手动检查" -ForegroundColor Red
    Write-Host $logs
    exit 1
}

# 3. 定位 compose 文件
Write-Host "[3/5] 定位 docker-compose.yml..." -ForegroundColor Yellow
$composePath = ssh "${ServerUser}@${ServerHost}" "docker inspect --format '{{index .Config.Labels \"com.docker.compose.project.config_files\"}}' \$(docker ps -a --filter name=siyuan --format '{{.ID}}' | head -1) 2>/dev/null"
if (-not $composePath) {
    # 备用方案：搜索 Portainer 目录
    $composePath = ssh "${ServerUser}@${ServerHost}" "grep -rl 'siyuan' /docker/portainer_data/compose/*/docker-compose.yml 2>/dev/null | head -1"
}
Write-Host "  Compose 文件: $composePath"

# 4. 备份并修复
Write-Host "[4/5] 备份并修复 compose 文件..." -ForegroundColor Yellow
$fixCmd = @"
cp '$composePath' '$composePath.bak.\$(date +%Y%m%d-%H%M%S)' && \
sed -i \"s|command: \\[\"--workspace|command: \\[\"serve\", \"--workspace|g\" '$composePath' && \
echo 'FIXED' && cat '$composePath' | grep -A 2 'command:'
"@
$result = ssh "${ServerUser}@${ServerHost}" $fixCmd
Write-Host $result
if ($result -match "FIXED") {
    Write-Host "  ✓ compose 文件已修复" -ForegroundColor Green
} else {
    Write-Host "  ⚠ 修复可能未生效，请手动检查" -ForegroundColor Red
    exit 1
}

# 5. 重建容器
Write-Host "[5/5] 重建容器..." -ForegroundColor Yellow
$composeDir = Split-Path $composePath -Parent
$projectName = "siyuan-note-qiniu"
$rebuildResult = ssh "${ServerUser}@${ServerHost}" "cd '$composeDir' && docker compose -p $projectName up -d --force-recreate 2>&1"
Write-Host $rebuildResult

# 验证
Start-Sleep -Seconds 5
$finalStatus = ssh "${ServerUser}@${ServerHost}" "docker ps --filter name=siyuan --format 'table {{.Names}}\t{{.Status}}\t{{.Ports}}'"
Write-Host "`n=== 最终状态 ===" -ForegroundColor Cyan
Write-Host $finalStatus

$healthCheck = ssh "${ServerUser}@${ServerHost}" "curl -sf -o /dev/null -w '%{http_code}' http://127.0.0.1:6001/ 2>&1 || echo 'port may differ'"
Write-Host "HTTP 状态码: $healthCheck (401 = 正常，锁屏密码生效)"
Write-Host "`n✅ 修复完成！" -ForegroundColor Green

#!/usr/bin/env bash
# siyuan-fix.sh — 思源 v3.7.0 容器修复脚本
# 用法: bash siyuan-fix.sh <docker-host> [ssh-user] [stack-name]
set -euo pipefail

SERVER_HOST="${1:?请指定 Docker 宿主机地址}"
SERVER_USER="${2:-root}"
STACK_NAME="${3:-siyuan-note-qiniu}"

RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'; CYAN='\033[0;36m'; NC='\033[0m'
ssh_cmd() { ssh -o StrictHostKeyChecking=accept-new "${SERVER_USER}@${SERVER_HOST}" "$@"; }

echo -e "${CYAN}=== 思源 v3.7.0 Docker 容器修复 ===${NC}"

# 1. 检测容器状态
echo -e "${YELLOW}[1/5] 检查容器状态...${NC}"
ssh_cmd "docker ps -a --filter name=siyuan --format 'table {{.Names}}\t{{.Status}}\t{{.Ports}}'"

# 2. 确认日志中的错误
echo -e "${YELLOW}[2/5] 确认错误日志...${NC}"
CONTAINER_NAME=$(ssh_cmd "docker ps -a --filter name=siyuan --format '{{.Names}}' | head -1")
LOGS=$(ssh_cmd "docker logs --tail 20 ${CONTAINER_NAME} 2>&1" || true)
if echo "$LOGS" | grep -q "unknown flag.*accessAuthCode"; then
    echo -e "${GREEN}  ✓ 确认为 v3.7.0 CLI 变更导致的问题${NC}"
else
    echo -e "${RED}  ⚠ 错误信息与预期不符，请手动检查${NC}"
    echo "$LOGS"
    exit 1
fi

# 3. 定位 compose 文件
echo -e "${YELLOW}[3/5] 定位 docker-compose.yml...${NC}"
COMPOSE_PATH=$(ssh_cmd "docker inspect --format '{{index .Config.Labels \"com.docker.compose.project.config_files\"}}' \$(docker ps -a --filter name=siyuan --format '{{.ID}}' | head -1) 2>/dev/null" || true)
if [[ -z "$COMPOSE_PATH" ]]; then
    COMPOSE_PATH=$(ssh_cmd "grep -rl 'siyuan' /docker/portainer_data/compose/*/docker-compose.yml 2>/dev/null | head -1" || true)
fi
if [[ -z "$COMPOSE_PATH" ]]; then
    echo -e "${RED}无法定位 docker-compose.yml，请手动指定${NC}"
    exit 1
fi
echo "  Compose 文件: $COMPOSE_PATH"

# 4. 备份并修复
echo -e "${YELLOW}[4/5] 备份并修复 compose 文件...${NC}"
TIMESTAMP=$(date +%Y%m%d-%H%M%S)
ssh_cmd "cp '$COMPOSE_PATH' '$COMPOSE_PATH.bak.$TIMESTAMP'" && echo "  ✓ 已备份到 .bak.$TIMESTAMP"
ssh_cmd "sed -i \"s|command: \\\\[\\\"--workspace|command: \\\\[\\\"serve\\\", \\\"--workspace|g\" '$COMPOSE_PATH'"
echo -e "${GREEN}  ✓ compose 文件已修复${NC}"

# 5. 重建容器
echo -e "${YELLOW}[5/5] 重建容器...${NC}"
COMPOSE_DIR=$(dirname "$COMPOSE_PATH")
ssh_cmd "cd '$COMPOSE_DIR' && docker compose -p $STACK_NAME up -d --force-recreate 2>&1"

# 验证
sleep 5
echo -e "\n${CYAN}=== 最终状态 ===${NC}"
ssh_cmd "docker ps --filter name=siyuan --format 'table {{.Names}}\t{{.Status}}\t{{.Ports}}'"
HTTP_CODE=$(ssh_cmd "curl -sf -o /dev/null -w '%{http_code}' http://127.0.0.1:6001/ 2>&1" || echo "N/A")
echo -e "HTTP 状态码: ${HTTP_CODE} (401 = 正常，锁屏密码生效)"
echo -e "\n${GREEN}✅ 修复完成！${NC}"

#!/usr/bin/env bash
# siyuan-fix-mac.sh — 思源 v3.7.0 容器修复脚本 (macOS)
# 用法: bash siyuan-fix-mac.sh <docker-host> [ssh-user] [stack-name]
# 前置条件: brew install coreutils (提供 gsed)

set -euo pipefail

SERVER_HOST="${1:?请指定 Docker 宿主机地址}"
SERVER_USER="${2:-root}"
STACK_NAME="${3:-siyuan-note-qiniu}"

RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'; CYAN='\033[0;36m'; NC='\033[0m'
ssh_cmd() { ssh -o StrictHostKeyChecking=accept-new "${SERVER_USER}@${SERVER_HOST}" "$@"; }

echo -e "${CYAN}=== 思源 v3.7.0 Docker 容器修复 (macOS) ===${NC}"

# 检查必要工具
if ! command -v ssh &>/dev/null; then echo -e "${RED}需要 SSH 客户端${NC}"; exit 1; fi

# 1. 检测
echo -e "${YELLOW}[1/5] 检查容器状态...${NC}"
ssh_cmd "docker ps -a --filter name=siyuan --format 'table {{.Names}}\t{{.Status}}\t{{.Ports}}'"

# 2. 确认错误
echo -e "${YELLOW}[2/5] 确认错误日志...${NC}"
CONTAINER_NAME=$(ssh_cmd "docker ps -a --filter name=siyuan --format '{{.Names}}' | head -1")
LOGS=$(ssh_cmd "docker logs --tail 20 ${CONTAINER_NAME} 2>&1" || true)
if echo "$LOGS" | grep -q "unknown flag.*accessAuthCode"; then
    echo -e "${GREEN}  ✓ 确认为 v3.7.0 CLI 变更问题${NC}"
else
    echo -e "${RED}  ⚠ 错误信息不符${NC}"; echo "$LOGS"; exit 1
fi

# 3. 定位 compose
echo -e "${YELLOW}[3/5] 定位 compose 文件...${NC}"
COMPOSE_PATH=$(ssh_cmd "docker inspect --format '{{index .Config.Labels \"com.docker.compose.project.config_files\"}}' \$(docker ps -a --filter name=siyuan --format '{{.ID}}' | head -1) 2>/dev/null" || true)
[[ -z "$COMPOSE_PATH" ]] && COMPOSE_PATH=$(ssh_cmd "grep -rl 'siyuan' /docker/portainer_data/compose/*/docker-compose.yml 2>/dev/null | head -1" || true)
[[ -z "$COMPOSE_PATH" ]] && { echo -e "${RED}无法定位 compose 文件${NC}"; exit 1; }
echo "  Compose: $COMPOSE_PATH"

# 4. 备份并修复 (macOS 用 gsed 或 python)
echo -e "${YELLOW}[4/5] 备份并修复...${NC}"
TIMESTAMP=$(date +%Y%m%d-%H%M%S)
ssh_cmd "cp '$COMPOSE_PATH' '$COMPOSE_PATH.bak.$TIMESTAMP'" && echo "  ✓ 已备份"
# 使用 python 做替换，避免 macOS sed 兼容问题
ssh_cmd "python3 -c \"
import re
p = '$COMPOSE_PATH'
c = open(p).read()
c = c.replace('command: [\\\"--workspace', 'command: [\\\"serve\\\", \\\"--workspace')
open(p, 'w').write(c)
print('FIXED')
\""
echo -e "${GREEN}  ✓ compose 文件已修复${NC}"

# 5. 重建
echo -e "${YELLOW}[5/5] 重建容器...${NC}"
COMPOSE_DIR=$(dirname "$COMPOSE_PATH")
ssh_cmd "cd '$COMPOSE_DIR' && docker compose -p $STACK_NAME up -d --force-recreate 2>&1"

sleep 5
echo -e "\n${CYAN}=== 最终状态 ===${NC}"
ssh_cmd "docker ps --filter name=siyuan --format 'table {{.Names}}\t{{.Status}}\t{{.Ports}}'"
HTTP_CODE=$(ssh_cmd "curl -sf -o /dev/null -w '%{http_code}' http://127.0.0.1:6001/ 2>&1" || echo "N/A")
echo -e "HTTP: ${HTTP_CODE} (401 = 正常)"
echo -e "\n${GREEN}✅ 修复完成！${NC}"

# 1. SSH 到 Docker 宿主机
ssh root@<your-docker-host>

# 2. 找到 compose 文件（通常在 Portainer 数据目录下）
grep -rl "siyuan" /docker/portainer_data/compose/*/docker-compose.yml

# 3. 备份原文件
cp /path/to/docker-compose.yml /path/to/docker-compose.yml.bak.$(date +%Y%m%d-%H%M%S)

# 4. 修改 command 行（在数组最前面加上 'serve'）
# 原: command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=xxx']
# 改: command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=xxx']

# 可以用 sed 一键替换:
sed -i "s|command: \\[\"--workspace|command: \\[\"serve\", \"--workspace|g" /path/to/docker-compose.yml

# 5. 验证修改
grep "command:" /path/to/docker-compose.yml

# 6. 重建容器
cd $(dirname /path/to/docker-compose.yml)
docker compose -p siyuan-note-qiniu up -d --force-recreate

# 7. 验证
docker ps --filter name=siyuan
curl -o /dev/null -w "%{http_code}\n" http://127.0.0.1:6001/
# 返回 401 表示锁屏密码生效，服务正常！

给 Agent 的提示词：
---
我的思源笔记 Docker 容器一直在重启。请帮我排查和修复。

约束条件：
1. 不要执行大版本 OS 升级
2. 不要下载不明安装器
3. 不要输出真实内网 IP、完整计算机名、私有域名或密钥
4. 修改配置文件前先备份
5. 修复后验证容器状态和 HTTP 可达性
---

$ curl -o /dev/null -w "%{http_code}\n" http://<host>:<port>/
401

docker run -d \
  -v /siyuan/workspace:/siyuan/workspace \
  -p 6806:6806 \
  b3log/siyuan \
  serve \
  --workspace=/siyuan/workspace/ \
  --accessAuthCode=xxx