Upload Dockerfile

Dockerfile

@@ -1,7 +1,7 @@
 FROM node:22-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    git ca-certificates build-essential python3 python3-pip curl jq \
+    git ca-certificates build-essential python3 python3-pip curl \
     && rm -rf /var/lib/apt/lists/*
 
 RUN pip3 install --no-cache-dir huggingface_hub --break-system-packages
@@ -80,7 +80,7 @@ SYNC_EOF
 
 RUN chmod +x /usr/local/bin/sync.py
 
-# 启动脚本 start-openclaw（Hugging Face 使用新路由，contextWindow 提升到 32000）
+# 启动脚本 start-openclaw
 RUN cat > /usr/local/bin/start-openclaw << 'EOF'
 #!/bin/bash
 set -e
@@ -104,66 +104,60 @@ touch /root/.openclaw/workspace/memory/$DATE.md
 
 CLEAN_BASE=$(echo "$OPENAI_API_BASE" | sed "s|/chat/completions||g" | sed "s|/v1/|/v1|g" | sed "s|/v1$|/v1|g")
 
-# 构建 providers JSON 对象
-PROVIDERS_JSON="{}"
-
 if [ -n "$GEMINI_API_KEY" ]; then
-  PROVIDERS_JSON=$(echo "$PROVIDERS_JSON" | jq \
-    --arg baseUrl "https://generativelanguage.googleapis.com/v1beta" \
-    --arg apiKey "$GEMINI_API_KEY" \
-    --arg model "$MODEL" \
-    '.google = {"baseUrl": $baseUrl, "apiKey": $apiKey, "api": "google-generative-ai", "models": [{"id": $model, "name": $model, "contextWindow": 128000}]}')
-elif [ -n "$OPENAI_API_KEY" ]; then
-  PROVIDERS_JSON=$(echo "$PROVIDERS_JSON" | jq \
-    --arg baseUrl "$CLEAN_BASE" \
-    --arg apiKey "$OPENAI_API_KEY" \
-    --arg model "$MODEL" \
-    '.openai = {"baseUrl": $baseUrl, "apiKey": $apiKey, "api": "openai-completions", "models": [{"id": $model, "name": $model, "contextWindow": 128000}]}')
-fi
-
-if [ -n "$HF_API_TOKEN" ] && [ -n "$HF_MODEL" ]; then
-  # 使用新的路由端点 https://router.huggingface.co，并将 contextWindow 提高到 32000 以容纳更长对话
-  PROVIDERS_JSON=$(echo "$PROVIDERS_JSON" | jq \
-    --arg baseUrl "https://router.huggingface.co" \
-    --arg apiKey "$HF_API_TOKEN" \
-    --arg model "$HF_MODEL" \
-    '.huggingface = {"baseUrl": $baseUrl, "apiKey": $apiKey, "api": "openai-completions", "models": [{"id": $model, "name": $model, "contextWindow": 32000}]}')
+  PROVIDER="google"
+  API_KEY_VAR="$GEMINI_API_KEY"
+  BASE_URL_VAR="https://generativelanguage.googleapis.com/v1beta"
+  MODEL_VAR="$MODEL"
+  PRIMARY_MODEL="google/$MODEL_VAR"
+  API_TYPE="google-generative-ai"
+else
+  PROVIDER="openai"
+  API_KEY_VAR="$OPENAI_API_KEY"
+  BASE_URL_VAR="$CLEAN_BASE"
+  MODEL_VAR="$MODEL"
+  PRIMARY_MODEL="openai/$MODEL_VAR"
+  API_TYPE="openai-completions"
 fi
 
-DEFAULT_PROVIDER=""
-DEFAULT_MODEL=""
-if [ -n "$HF_API_TOKEN" ] && [ -n "$HF_MODEL" ]; then
-  DEFAULT_PROVIDER="huggingface"
-  DEFAULT_MODEL="$HF_MODEL"
-elif [ -n "$GEMINI_API_KEY" ]; then
-  DEFAULT_PROVIDER="google"
-  DEFAULT_MODEL="$MODEL"
-elif [ -n "$OPENAI_API_KEY" ]; then
-  DEFAULT_PROVIDER="openai"
-  DEFAULT_MODEL="$MODEL"
-else
-  echo "ERROR: No model provider configured."
-  exit 1
+# 构建 groups 配置字符串
+GROUPS_CONFIG=""
+if [ -n "$TELEGRAM_GROUP_IDS" ]; then
+  GROUPS_CONFIG=', "groups": {'
+  IFS=',' read -ra GROUP_ARRAY <<< "$TELEGRAM_GROUP_IDS"
+  for i in "${!GROUP_ARRAY[@]}"; do
+    GROUP_ID="${GROUP_ARRAY[$i]}"
+    GROUP_ID=$(echo "$GROUP_ID" | xargs)
+    GROUPS_CONFIG="$GROUPS_CONFIG\"$GROUP_ID\": {\"requireMention\": true}"
+    if [ $i -lt $((${#GROUP_ARRAY[@]}-1)) ]; then
+      GROUPS_CONFIG="$GROUPS_CONFIG, "
+    fi
+  done
+  GROUPS_CONFIG="$GROUPS_CONFIG }"
 fi
 
-# 生成基础 openclaw.json
-jq -n \
-  --argjson providers "$PROVIDERS_JSON" \
-  --arg defaultProvider "$DEFAULT_PROVIDER" \
-  --arg defaultModel "$DEFAULT_MODEL" \
-  --arg port "$PORT" \
-  --arg password "$OPENCLAW_GATEWAY_PASSWORD" \
-  --arg telegramToken "$TELEGRAM_BOT_TOKEN" \
-  '{
-  "models": { "providers": $providers },
+cat > /root/.openclaw/openclaw.json <<EOF2
+{
+  "models": {
+    "providers": {
+      "$PROVIDER": {
+        "baseUrl": "$BASE_URL_VAR",
+        "apiKey": "$API_KEY_VAR",
+        "api": "$API_TYPE",
+        "models": [{ "id": "$MODEL_VAR", "name": "$MODEL_VAR", "contextWindow": 128000 }]
+      }
+    }
+  },
   "agents": {
     "defaults": {
-      "model": { "primary": ($defaultProvider + "/" + $defaultModel) },
+      "model": { "primary": "$PRIMARY_MODEL" },
       "imageModel": { "primary": "openai/gpt-4o-mini" },
       "tools": {
         "elevated": {
           "enabled": true,
-          "allowFrom": { "openclaw-weixin": true }
+          "allowFrom": {
+            "openclaw-weixin": true
+          }
         }
       }
     }
@@ -171,9 +165,9 @@ jq -n \
   "gateway": {
     "mode": "local",
     "bind": "lan",
-    "port": ($port | tonumber),
+    "port": $PORT,
     "trustedProxies": ["0.0.0.0/0", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"],
-    "auth": { "mode": "token", "token": $password },
+    "auth": { "mode": "token", "token": "$OPENCLAW_GATEWAY_PASSWORD" },
     "controlUi": { "allowInsecureAuth": true, "allowedOrigins": ["*"] }
   },
   "plugins": { "allow": ["openclaw-weixin"] },
@@ -185,27 +179,17 @@ jq -n \
     },
     "telegram": {
       "enabled": true,
-      "botToken": $telegramToken,
+      "botToken": "$TELEGRAM_BOT_TOKEN",
       "retry": {
         "attempts": 10,
         "minDelayMs": 500,
         "maxDelayMs": 30000,
         "jitter": 0.1
-      }
+      }$GROUPS_CONFIG
     }
   }
-}' > /root/.openclaw/openclaw.json
-
-# 添加 Telegram 群组（如果设置了）
-if [ -n "$TELEGRAM_GROUP_IDS" ]; then
-  GROUPS_JSON="{}"
-  IFS=',' read -ra GROUP_ARRAY <<< "$TELEGRAM_GROUP_IDS"
-  for GROUP_ID in "${GROUP_ARRAY[@]}"; do
-    GROUP_ID=$(echo "$GROUP_ID" | xargs)
-    GROUPS_JSON=$(echo "$GROUPS_JSON" | jq --arg gid "$GROUP_ID" '. + {($gid): {"requireMention": true}}')
-  done
-  jq --argjson groups "$GROUPS_JSON" '.channels.telegram.groups = $groups' /root/.openclaw/openclaw.json > /tmp/openclaw.json && mv /tmp/openclaw.json /root/.openclaw/openclaw.json
-fi
+}
+EOF2
 
 echo "=== openclaw.json content ==="
 cat /root/.openclaw/openclaw.json