Update Dockerfile

Dockerfile

@@ -22,7 +22,7 @@ ENV PORT=7860 \
     OPENCLAW_GATEWAY_MODE=local \
     HOME=/root
 
-# 6. Python 同步引擎 (sync.py) —— 修复版，使用多行 echo + 正确缩进
+# 6. Python 同步引擎 (sync.py) —— 使用 heredoc + 正确缩进
 RUN cat > /usr/local/bin/sync.py << 'EOF'
 import os, sys, tarfile
 from huggingface_hub import HfApi, hf_hub_download
@@ -55,7 +55,8 @@ def backup():
         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")
+            if os.path.exists("/root/.openclaw/openclaw.json"):
+                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:
@@ -68,52 +69,88 @@ if __name__ == "__main__":
         restore()
 EOF
 
-# 7. 生成 openclaw.json 配置（多行 echo 方式，避免 heredoc 解析问题）
+# 7. 生成 openclaw.json 模板（使用占位符）
 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",' >> /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 '  "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 '    "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 '    }' >> /root/.openclaw/openclaw.json && \
-    echo '  }' >> /root/.openclaw/openclaw.json && \
-    echo '}' >> /root/.openclaw/openclaw.json
-
-# 8. 生成启动脚本
+    cat > /root/.openclaw/openclaw.json.template << 'EOT'
+{
+  "models": {
+    "providers": {
+      "huggingface": {
+        "baseUrl": "PLACEHOLDER_CLEAN_BASE",
+        "apiKey": "PLACEHOLDER_OPENAI_API_KEY",
+        "api": "openai-completions",
+        "models": [
+          {
+            "id": "PLACEHOLDER_MODEL",
+            "name": "wen1.5-0.5B-Chat",
+            "contextWindow": 128000
+          }
+        ]
+      }
+    }
+  },
+  "agents": {
+    "defaults": {
+      "model": {
+        "primary": "huggingface/PLACEHOLDER_MODEL"
+      }
+    }
+  },
+  "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
+    }
+  }
+}
+EOT
+
+# 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")
+# 处理 API Base
+CLEAN_BASE=$(echo "$OPENAI_API_BASE" | sed 's|/chat/completions||g' | sed 's|/v1/|/v1|g' | sed 's|/v1$|/v1|g')
+
+# 替换模板生成最终配置
+sed -e "s|PLACEHOLDER_CLEAN_BASE|$CLEAN_BASE|g" \
+    -e "s|PLACEHOLDER_OPENAI_API_KEY|$OPENAI_API_KEY|g" \
+    -e "s|PLACEHOLDER_MODEL|$MODEL|g" \
+    -e "s|PLACEHOLDER_GATEWAY_PASSWORD|$OPENCLAW_GATEWAY_PASSWORD|g" \
+    /root/.openclaw/openclaw.json.template > /root/.openclaw/openclaw.json
 
-# 增量备份
+echo "✅ OpenClaw config generated successfully."
+
+# 增量备份循环（每6小时）
 (while true; do sleep 21600; python3 /usr/local/bin/sync.py backup; done) &
 
+# 启动 OpenClaw
 openclaw doctor --fix
 exec openclaw gateway run --port $PORT
 EOF
+
 RUN chmod +x /usr/local/bin/start-openclaw
 
 EXPOSE 7860