Update Dockerfile

Dockerfile

@@ -22,46 +22,99 @@ ENV PORT=7860 \
     OPENCLAW_GATEWAY_MODE=local \
     HOME=/root
 
-# 6. Python 同步引擎 (sync.py) —— 单行版（已验证可部署）
-RUN echo 'import os, sys, tarfile; from huggingface_hub import HfApi, hf_hub_download; from datetime import datetime, timedelta; api = HfApi(); repo_id = os.getenv("HF_DATASET"); token = os.getenv("HF_TOKEN"); def restore(): try: files = api.list_repo_files(repo_id=repo_id, repo_type="dataset", token=token); now = datetime.now(); for i in range(5): day = (now - timedelta(days=i)).strftime("%Y-%m-%d"); name = f"backup_{day}.tar.gz"; if name in files: path = hf_hub_download(repo_id=repo_id, filename=name, repo_type="dataset", token=token); with tarfile.open(path, "r:gz") as tar: tar.extractall(path="/root/.openclaw/"); print(f"Success: Restored from {name}"); return True; except Exception as e: print(f"Restore Error: {e}"); def backup(): try: day = datetime.now().strftime("%Y-%m-%d"); name = f"backup_{day}.tar.gz"; with tarfile.open(name, "w:gz") as tar: if os.path.exists("/root/.openclaw/sessions"): tar.add("/root/.openclaw/sessions", arcname="sessions"); tar.add("/root/.openclaw/openclaw.json", arcname="openclaw.json"); api.upload_file(path_or_fileobj=name, path_in_repo=name, repo_id=repo_id, repo_type="dataset", token=token); print(f"Backup {name} Success."); except Exception as e: print(f"Backup Error: {e}"); if __name__ == "__main__": if len(sys.argv) > 1 and sys.argv[1] == "backup": backup() else: restore()' > /usr/local/bin/sync.py
+# 6. Python 同步引擎 (sync.py) —— 修复版，使用多行 echo + 正确缩进
+RUN cat > /usr/local/bin/sync.py << 'EOF'
+import os, sys, tarfile
+from huggingface_hub import HfApi, hf_hub_download
+from datetime import datetime, timedelta
 
-# 7. 生成 openclaw.json 配置（拆分成多条 echo，避免 heredoc 解析问题）
+api = HfApi()
+repo_id = os.getenv("HF_DATASET")
+token = os.getenv("HF_TOKEN")
+
+def restore():
+    try:
+        files = api.list_repo_files(repo_id=repo_id, repo_type="dataset", token=token)
+        now = datetime.now()
+        for i in range(5):
+            day = (now - timedelta(days=i)).strftime("%Y-%m-%d")
+            name = f"backup_{day}.tar.gz"
+            if name in files:
+                path = hf_hub_download(repo_id=repo_id, filename=name, repo_type="dataset", token=token)
+                with tarfile.open(path, "r:gz") as tar:
+                    tar.extractall(path="/root/.openclaw/")
+                print(f"Success: Restored from {name}")
+                return True
+    except Exception as e:
+        print(f"Restore Error: {e}")
+
+def backup():
+    try:
+        day = datetime.now().strftime("%Y-%m-%d")
+        name = f"backup_{day}.tar.gz"
+        with tarfile.open(name, "w:gz") as tar:
+            if os.path.exists("/root/.openclaw/sessions"):
+                tar.add("/root/.openclaw/sessions", arcname="sessions")
+            tar.add("/root/.openclaw/openclaw.json", arcname="openclaw.json")
+        api.upload_file(path_or_fileobj=name, path_in_repo=name, repo_id=repo_id, repo_type="dataset", token=token)
+        print(f"Backup {name} Success.")
+    except Exception as e:
+        print(f"Backup Error: {e}")
+
+if __name__ == "__main__":
+    if len(sys.argv) > 1 and sys.argv[1] == "backup":
+        backup()
+    else:
+        restore()
+EOF
+
+# 7. 生成 openclaw.json 配置（多行 echo 方式，避免 heredoc 解析问题）
 RUN mkdir -p /root/.openclaw && \
     echo '{' > /root/.openclaw/openclaw.json && \
     echo '  "models": {' >> /root/.openclaw/openclaw.json && \
     echo '    "providers": {' >> /root/.openclaw/openclaw.json && \
     echo '      "huggingface": {' >> /root/.openclaw/openclaw.json && \
-    echo '        "baseUrl": "$CLEAN_BASE", "apiKey": "$OPENAI_API_KEY", "api": "openai-completions",' >> /root/.openclaw/openclaw.json && \
-    echo '        "models": [{ "id": "$MODEL", "name": "wen1.5-0.5B-Chat", "contextWindow": 128000 }]' >> /root/.openclaw/openclaw.json && \
+    echo '        "baseUrl": "$CLEAN_BASE",' >> /root/.openclaw/openclaw.json && \
+    echo '        "apiKey": "$OPENAI_API_KEY",' >> /root/.openclaw/openclaw.json && \
+    echo '        "api": "openai-completions",' >> /root/.openclaw/openclaw.json && \
+    echo '        "models": [{"id": "$MODEL", "name": "wen1.5-0.5B-Chat", "contextWindow": 128000}]' >> /root/.openclaw/openclaw.json && \
     echo '      }' >> /root/.openclaw/openclaw.json && \
     echo '    }' >> /root/.openclaw/openclaw.json && \
     echo '  },' >> /root/.openclaw/openclaw.json && \
-    echo '  "agents": { "defaults": { "model": { "primary": "huggingface/$MODEL" } } },' >> /root/.openclaw/openclaw.json && \
+    echo '  "agents": {"defaults": {"model": {"primary": "huggingface/$MODEL"}}},' >> /root/.openclaw/openclaw.json && \
     echo '  "gateway": {' >> /root/.openclaw/openclaw.json && \
     echo '    "mode": "local",' >> /root/.openclaw/openclaw.json && \
     echo '    "bind": "lan",' >> /root/.openclaw/openclaw.json && \
     echo '    "port": $PORT,' >> /root/.openclaw/openclaw.json && \
     echo '    "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"],' >> /root/.openclaw/openclaw.json && \
-    echo '    "auth": { "mode": "token", "token": "$OPENCLAW_GATEWAY_PASSWORD" },' >> /root/.openclaw/openclaw.json && \
+    echo '    "auth": {"mode": "token", "token": "$OPENCLAW_GATEWAY_PASSWORD"},' >> /root/.openclaw/openclaw.json && \
     echo '    "controlUi": {' >> /root/.openclaw/openclaw.json && \
     echo '      "enabled": true,' >> /root/.openclaw/openclaw.json && \
     echo '      "allowInsecureAuth": true,' >> /root/.openclaw/openclaw.json && \
-    echo '      "dangerouslyAllowHostHeaderOriginFallback": true,' >> /root/.openclaw/openclaw.json && \
-    echo '      "dangerouslyDisableDeviceAuth": true' >> /root/.openclaw/openclaw.json && \
+    echo '      "dangerouslyAllowHostHeaderOriginFallback": true' >> /root/.openclaw/openclaw.json && \
     echo '    }' >> /root/.openclaw/openclaw.json && \
     echo '  }' >> /root/.openclaw/openclaw.json && \
     echo '}' >> /root/.openclaw/openclaw.json
 
-# 8. 生成启动脚本 start-openclaw（也用多条 echo）
-RUN echo '#!/bin/bash' > /usr/local/bin/start-openclaw && \
-    echo 'set -e' >> /usr/local/bin/start-openclaw && \
-    echo 'mkdir -p /root/.openclaw/sessions' >> /usr/local/bin/start-openclaw && \
-    echo 'python3 /usr/local/bin/sync.py restore' >> /usr/local/bin/start-openclaw && \
-    echo 'CLEAN_BASE=$(echo "$OPENAI_API_BASE" | sed "s|/chat/completions||g" | sed "s|/v1/|/v1|g" | sed "s|/v1$|/v1|g")' >> /usr/local/bin/start-openclaw && \
-    echo '(while true; do sleep 21600; python3 /usr/local/bin/sync.py backup; done) &' >> /usr/local/bin/start-openclaw && \
-    echo 'openclaw doctor --fix' >> /usr/local/bin/start-openclaw && \
-    echo 'exec openclaw gateway run --port $PORT' >> /usr/local/bin/start-openclaw && \
-    chmod +x /usr/local/bin/start-openclaw
+# 8. 生成启动脚本
+RUN cat > /usr/local/bin/start-openclaw << 'EOF'
+#!/bin/bash
+set -e
+mkdir -p /root/.openclaw/sessions
+
+# 恢复数据
+python3 /usr/local/bin/sync.py restore
+
+# 处理地址
+CLEAN_BASE=$(echo "$OPENAI_API_BASE" | sed "s|/chat/completions||g" | sed "s|/v1/|/v1|g" | sed "s|/v1$|/v1|g")
+
+# 增量备份
+(while true; do sleep 21600; python3 /usr/local/bin/sync.py backup; done) &
+
+openclaw doctor --fix
+exec openclaw gateway run --port $PORT
+EOF
+RUN chmod +x /usr/local/bin/start-openclaw
 
 EXPOSE 7860
 CMD ["/usr/local/bin/start-openclaw"]