Update Dockerfile

Dockerfile

@@ -14,7 +14,7 @@ RUN npm install -g openclaw@2026.6.9 --unsafe-perm
 
 ENV PORT=7860 OPENCLAW_GATEWAY_MODE=local HOME=/root
 
-# ==================== 同步引擎 - 最可靠版 ====================
+# ==================== 同步引擎 - 最终修复版 ====================
 RUN cat > /usr/local/bin/sync.py << 'EOF'
 import os, sys, tarfile, shutil
 from huggingface_hub import HfApi, hf_hub_download
@@ -37,22 +37,28 @@ def restore():
                 print(f"📦 Downloading {name}...")
                 path = hf_hub_download(repo_id=repo_id, filename=name, repo_type="dataset", token=token)
                 
-                # 解压到临时目录，然后移动
-                tmp_dir = "/tmp/restore_tmp"
-                os.makedirs(tmp_dir, exist_ok=True)
+                print("📂 Tar contents preview:")
                 with tarfile.open(path, "r:gz") as tar:
-                    tar.extractall(path=tmp_dir)
+                    for member in tar.getmembers()[:20]:  # 只打印前20个
+                        print("  ", member.name)
+                    
+                    for member in tar.getmembers():
+                        # 关键修复：统一放到 .openclaw 下
+                        if member.name.startswith('agents/') or member.name.startswith('skills/') or \
+                           member.name.startswith('workspace/') or member.name.startswith('cron/') or \
+                           member.name.startswith('state/'):
+                            member.name = os.path.join('.openclaw', member.name)
+                        elif member.name == 'openclaw.json' or member.name == 'backup_state.sqlite':
+                            member.name = os.path.join('.openclaw', member.name)
+                        tar.extract(member, "/root")
                 
-                # 移动所有内容到 .openclaw
-                if os.path.exists(tmp_dir):
-                    for item in os.listdir(tmp_dir):
-                        src = os.path.join(tmp_dir, item)
-                        dst = os.path.join(BASE, item)
-                        if os.path.exists(dst):
-                            shutil.rmtree(dst, ignore_errors=True)
-                        shutil.move(src, dst)
+                print("✅ Extraction completed")
                 
-                print("✅ All files restored to .openclaw")
+                # 处理 DB
+                if os.path.exists(f"{BASE}/backup_state.sqlite"):
+                    os.makedirs(f"{BASE}/state", exist_ok=True)
+                    shutil.move(f"{BASE}/backup_state.sqlite", f"{BASE}/state/openclaw.sqlite")
+                    print("✅ SQLite (cron) restored")
                 return True
         print("⚠️ No backup found")
     except Exception as e:
@@ -78,7 +84,7 @@ if __name__ == "__main__":
         restore()
 EOF
 
-# 配置模板
+# 模板
 RUN mkdir -p /root/.openclaw
 RUN cat > /root/.openclaw/openclaw.json.template << 'EOT'
 {"models":{"providers":{"thirdparty":{"baseUrl":"PLACEHOLDER_BASE_URL","apiKey":"PLACEHOLDER_API_KEY","api":"openai-completions","headers":{"User-Agent":"Mozilla/5.0"},"models":[{"id":"PLACEHOLDER_MODEL_ID","name":"GLM-4.7-Flash","contextWindow":131072}]}}},"agents":{"defaults":{"model":{"primary":"thirdparty/PLACEHOLDER_MODEL_ID"}}},"gateway":{"mode":"local","bind":"lan","port":7860,"trustedProxies":["0.0.0.0/0","10.0.0.0/8","10.16.0.0/12","172.16.0.0/12","192.168.0.0/16"],"auth":{"mode":"token","token":"PLACEHOLDER_GATEWAY_PASSWORD"},"controlUi":{"enabled":true,"allowInsecureAuth":true,"dangerouslyAllowHostHeaderOriginFallback":true,"dangerouslyDisableDeviceAuth":true}}}
@@ -93,15 +99,19 @@ mkdir -p /root/.openclaw/{sessions,state}
 echo "🚀 Starting OpenClaw..."
 
 python3 /usr/local/bin/sync.py restore
-sleep 10
+sleep 8
+
+if [ ! -d "/root/.openclaw/agents" ]; then
+    echo "🔄 Retrying restore..."
+    python3 /usr/local/bin/sync.py restore
+    sleep 6
+fi
 
 echo "=== Final Status ==="
 echo "Agents dir: $([ -d "/root/.openclaw/agents" ] && echo Yes || echo No)"
 echo "Sessions: $(ls /root/.openclaw/agents/main/sessions 2>/dev/null | wc -l || echo 0)"
 echo "Skills: $(ls /root/.openclaw/skills 2>/dev/null | wc -l || echo 0)"
-if [ -f "/root/.openclaw/state/openclaw.sqlite" ]; then
-    echo "Cron jobs: $(sqlite3 /root/.openclaw/state/openclaw.sqlite "SELECT COUNT(*) FROM cron_jobs WHERE enabled=1;" 2>/dev/null || echo 0)"
-fi
+[ -f "/root/.openclaw/state/openclaw.sqlite" ] && echo "Cron jobs: $(sqlite3 /root/.openclaw/state/openclaw.sqlite "SELECT COUNT(*) FROM cron_jobs WHERE enabled=1;" 2>/dev/null || echo 0)"
 
 #python3 /usr/local/bin/sync.py backup