ted1990 commited on
Commit
be1f2e0
·
verified ·
1 Parent(s): 21effef

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +7 -29
Dockerfile CHANGED
@@ -20,7 +20,7 @@ ENV PORT=7860 \
20
  OPENCLAW_GATEWAY_MODE=local \
21
  HOME=/home/node
22
 
23
- # sync.py
24
  RUN echo 'import os, sys, tarfile\n\
25
  from huggingface_hub import HfApi, hf_hub_download\n\
26
  from datetime import datetime, timedelta\n\
@@ -64,8 +64,7 @@ def backup():\n\
64
  print(f"--- [SYNC] 正在执行全量备份: {name} ---")\n\
65
  with tarfile.open(name, "w:gz") as tar:\n\
66
  for target in existing:\n\
67
- full_path = os.path.join(DATA_DIR, target)\n\
68
- tar.add(full_path, arcname=target)\n\
69
  api.upload_file(path_or_fileobj=name, path_in_repo=name, repo_id=repo_id, repo_type="dataset", token=token)\n\
70
  print(f"--- [SYNC] 备份上传成功! ---")\n\
71
  os.remove(name)\n\
@@ -88,9 +87,7 @@ RUN printf '#!/bin/bash\nset -e\n\n\
88
  DATA_DIR="$HOME/.openclaw"\n\
89
  mkdir -p "$DATA_DIR"/{sessions,workspace,agents/main/sessions}\n\n\
90
  python3 /usr/local/bin/sync.py restore\n\n\
91
- # 备份恢复后强制写 openclaw.json,防止旧配置污染\n\
92
- CLEAN_BASE=$(echo "$OPENAI_API_BASE" | sed "s|/chat/completions||g" | sed "s|/v1beta/openai.*||g" | sed "s|/v1/||g" | sed "s|/v1$||g")\n\n\
93
- # 关键:把 GATEWAY_TOKEN 写入配置,让网关启动时就信任已知设备\n\
94
  cat > "$DATA_DIR/openclaw.json" <<JSON\n\
95
  {\n\
96
  "models": {\n\
@@ -109,17 +106,11 @@ cat > "$DATA_DIR/openclaw.json" <<JSON\n\
109
  "bind": "lan",\n\
110
  "port": $PORT,\n\
111
  "trustedProxies": ["10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"],\n\
112
- "auth": {\n\
113
- "mode": "token",\n\
114
- "token": "$OPENCLAW_GATEWAY_PASSWORD"\n\
115
- },\n\
116
  "controlUi": {\n\
117
  "allowInsecureAuth": true,\n\
118
- "allowedOrigins": ["https://ted1990-openclaw.hf.space"],\n\
119
- "gatewayToken": "$OPENCLAW_GATEWAY_PASSWORD"\n\
120
- },\n\
121
- "pairing": {\n\
122
- "autoApprove": true\n\
123
  }\n\
124
  }\n\
125
  }\n\
@@ -131,22 +122,9 @@ echo "--- [CONFIG] openclaw.json 已生成 ---"\n\
131
  echo "--- [CONFIG] API Base: $OPENAI_API_BASE ---"\n\
132
  echo "--- [CONFIG] Model: $MODEL ---"\n\
133
  echo ""\n\n\
134
- # 定时备份(注意备份列表已排除 openclaw.json)\n\
135
  (while true; do sleep 10800; python3 /usr/local/bin/sync.py backup; done) &\n\n\
136
- # 自动批准配对请求(兜底方案)\n\
137
  (\n\
138
- sleep 15\n\
139
- for i in $(seq 1 20); do\n\
140
- REQUEST_ID=$(openclaw devices list --json 2>/dev/null | python3 -c "import sys,json; data=json.load(sys.stdin); reqs=[d.get('"'"'requestId'"'"',...) for d in data if d.get('"'"'status'"'"')=='"'"'pending'"'"']; print(reqs[0] if reqs else '"'"''"'"')" 2>/dev/null || true)\n\
141
- if [ -n "$REQUEST_ID" ] && [ "$REQUEST_ID" != "None" ]; then\n\
142
- echo "✅ 正在批准设备: $REQUEST_ID"\n\
143
- openclaw devices approve "$REQUEST_ID" && break\n\
144
- fi\n\
145
- sleep 3\n\
146
- done\n\
147
- ) &\n\n\
148
- (\n\
149
- sleep 10\n\
150
  echo ""\n\
151
  echo "================================================="\n\
152
  echo "✅ OpenClaw 已就绪!请使用以下完整 URL 访问:"\n\
 
20
  OPENCLAW_GATEWAY_MODE=local \
21
  HOME=/home/node
22
 
23
+ # sync.py(备份排除 openclaw.json,防止旧配置污染)
24
  RUN echo 'import os, sys, tarfile\n\
25
  from huggingface_hub import HfApi, hf_hub_download\n\
26
  from datetime import datetime, timedelta\n\
 
64
  print(f"--- [SYNC] 正在执行全量备份: {name} ---")\n\
65
  with tarfile.open(name, "w:gz") as tar:\n\
66
  for target in existing:\n\
67
+ tar.add(os.path.join(DATA_DIR, target), arcname=target)\n\
 
68
  api.upload_file(path_or_fileobj=name, path_in_repo=name, repo_id=repo_id, repo_type="dataset", token=token)\n\
69
  print(f"--- [SYNC] 备份上传成功! ---")\n\
70
  os.remove(name)\n\
 
87
  DATA_DIR="$HOME/.openclaw"\n\
88
  mkdir -p "$DATA_DIR"/{sessions,workspace,agents/main/sessions}\n\n\
89
  python3 /usr/local/bin/sync.py restore\n\n\
90
+ # 恢复后强制写 openclaw.json,防止旧配置污染\n\
 
 
91
  cat > "$DATA_DIR/openclaw.json" <<JSON\n\
92
  {\n\
93
  "models": {\n\
 
106
  "bind": "lan",\n\
107
  "port": $PORT,\n\
108
  "trustedProxies": ["10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"],\n\
109
+ "auth": { "mode": "token", "token": "$OPENCLAW_GATEWAY_PASSWORD" },\n\
 
 
 
110
  "controlUi": {\n\
111
  "allowInsecureAuth": true,\n\
112
+ "dangerouslyDisableDeviceAuth": true,\n\
113
+ "allowedOrigins": ["https://ted1990-openclaw.hf.space"]\n\
 
 
 
114
  }\n\
115
  }\n\
116
  }\n\
 
122
  echo "--- [CONFIG] API Base: $OPENAI_API_BASE ---"\n\
123
  echo "--- [CONFIG] Model: $MODEL ---"\n\
124
  echo ""\n\n\
 
125
  (while true; do sleep 10800; python3 /usr/local/bin/sync.py backup; done) &\n\n\
 
126
  (\n\
127
+ sleep 8\n\
 
 
 
 
 
 
 
 
 
 
 
128
  echo ""\n\
129
  echo "================================================="\n\
130
  echo "✅ OpenClaw 已就绪!请使用以下完整 URL 访问:"\n\