gateway configs

2026-02-23 11:06:40 -05:00
parent 52d2555cca
commit 88d4505d2f
6 changed files with 158 additions and 28 deletions
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -43,9 +43,9 @@ RUN echo '#!/bin/sh' > /home/node/.local/bin/tailscale-start.sh && \
    echo 'mkdir -p /var/run/tailscale /home/node/.local/share/tailscale /home/node/.local/share/tailscale/files' >> /home/node/.local/bin/tailscale-start.sh && \
    echo 'tailscaled --socket=/tmp/tailscale.sock --tun=userspace-networking &' >> /home/node/.local/bin/tailscale-start.sh && \
    echo 'sleep 3' >> /home/node/.local/bin/tailscale-start.sh && \
-    echo 'tailscale --socket=/tmp/tailscale.sock up --authkey=$TAILSCALE_AUTH_KEY' >> /home/node/.local/bin/tailscale-start.sh && \
+    echo 'if [ -n "$TAILSCALE_AUTH_KEY" ]; then tailscale --socket=/tmp/tailscale.sock up --authkey="$TAILSCALE_AUTH_KEY" --hostname="${TAILSCALE_HOSTNAME:-openclaw-gateway}" || true; fi' >> /home/node/.local/bin/tailscale-start.sh && \
    echo 'sleep 2' >> /home/node/.local/bin/tailscale-start.sh && \
-    echo 'tailscale --socket=/tmp/tailscale.sock serve --bg 18789' >> /home/node/.local/bin/tailscale-start.sh && \
+    echo 'tailscale --socket=/tmp/tailscale.sock serve --bg 18789 || true' >> /home/node/.local/bin/tailscale-start.sh && \
    chmod +x /home/node/.local/bin/tailscale-start.sh

 # Copy custom tools into the image
@@ -54,7 +54,7 @@ COPY bin/* /usr/local/bin/
 RUN chmod +x /usr/local/bin/*

 # Create directories in the persistent volume location
-RUN mkdir -p /home/node/.openclaw/ssh /home/node/.openclaw/gog \
+RUN mkdir -p /home/node/.openclaw/ssh /home/node/.openclaw/gog /opt/openclaw/defaults \
    && chown -R node:node /home/node/.openclaw

 # Link gog config and ssh to standard locations
@@ -62,8 +62,9 @@ RUN mkdir -p /home/node/.config /home/node/.ssh \
    && ln -sf /home/node/.openclaw/gog /home/node/.config/gog \
    && ln -sf /home/node/.openclaw/ssh /home/node/.ssh

-# Copy config into the image
-COPY config/openclaw.json /home/node/.openclaw/openclaw.json
+# Copy default config into the image
+COPY config/openclaw.json /opt/openclaw/defaults/openclaw.json
+RUN chown -R node:node /opt/openclaw/defaults

 # Switch back to node user
 USER node
--- a/docker/bin/start-gateway.sh
+++ b/docker/bin/start-gateway.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+set -eu
+
+CONFIG_DIR="${HOME:-/home/node}/.openclaw"
+CONFIG_FILE="${CONFIG_DIR}/openclaw.json"
+DEFAULT_CONFIG="/opt/openclaw/defaults/openclaw.json"
+BIND="${OPENCLAW_GATEWAY_BIND:-lan}"
+TAILSCALE_MODE="${OPENCLAW_TAILSCALE_MODE:-off}"
+PORT="${OPENCLAW_GATEWAY_PORT:-18789}"
+
+mkdir -p "${CONFIG_DIR}"
+
+if [ ! -f "${CONFIG_FILE}" ] && [ -f "${DEFAULT_CONFIG}" ]; then
+  cp "${DEFAULT_CONFIG}" "${CONFIG_FILE}"
+fi
+
+if [ ! -f "${CONFIG_FILE}" ]; then
+  printf '{}\n' > "${CONFIG_FILE}"
+fi
+
+tmp_file="$(mktemp)"
+jq \
+  --arg bind "${BIND}" \
+  --arg tailscale_mode "${TAILSCALE_MODE}" \
+  --arg token "${OPENCLAW_GATEWAY_TOKEN:-}" \
+  '
+  .env.OPENCLAW_GATEWAY_TOKEN = "${OPENCLAW_GATEWAY_TOKEN}" |
+  .env.OPENAI_API_KEY = "${OPENAI_API_KEY}" |
+  .gateway.bind = $bind |
+  .gateway.tailscale.mode = $tailscale_mode |
+  .gateway.auth.mode = "token" |
+  .gateway.auth.token = (if $token == "" then (.gateway.auth.token // "${OPENCLAW_GATEWAY_TOKEN}") else $token end) |
+  .gateway.controlUi.allowInsecureAuth = true |
+  .models.providers.openai = {
+    baseUrl: "https://api.openai.com/v1",
+    apiKey: "${OPENAI_API_KEY}",
+    auth: "api-key",
+    api: "openai-completions",
+    models: [
+      {
+        id: "gpt-4.1-mini",
+        name: "GPT-4.1 mini",
+        reasoning: false,
+        input: ["text"],
+        cost: {input: 0, output: 0, cacheRead: 0, cacheWrite: 0},
+        contextWindow: 1047576,
+        maxTokens: 32768
+      },
+      {
+        id: "gpt-image-1",
+        name: "GPT Image 1",
+        reasoning: false,
+        input: ["text", "image"],
+        cost: {input: 0, output: 0, cacheRead: 0, cacheWrite: 0},
+        contextWindow: 128000,
+        maxTokens: 4096
+      }
+    ]
+  } |
+  .agents.defaults.model.fallbacks = ((.agents.defaults.model.fallbacks // []) + ["openai/gpt-4.1-mini"] | unique) |
+  .agents.defaults.models["openai/gpt-4.1-mini"] = {alias: "OpenAI GPT-4.1 mini"}
+  ' "${CONFIG_FILE}" > "${tmp_file}"
+mv "${tmp_file}" "${CONFIG_FILE}"
+
+if [ "${OPENCLAW_ENABLE_TAILSCALE:-0}" = "1" ] && [ -x /home/node/.local/bin/tailscale-start.sh ]; then
+  /home/node/.local/bin/tailscale-start.sh || true
+fi
+
+exec node dist/index.js gateway --bind "${BIND}" --port "${PORT}"
--- a/docker/config/openclaw.json
+++ b/docker/config/openclaw.json
@@ -5,7 +5,8 @@
 	},
 	"env": {
 		"MOONSHOT_API_KEY": "${MOONSHOT_API_KEY}",
-		"OPENCLAW_GATEWAY_TOKEN": "${OPENCLAW_GATEWAY_TOKEN}"
+		"OPENCLAW_GATEWAY_TOKEN": "${OPENCLAW_GATEWAY_TOKEN}",
+		"OPENAI_API_KEY": "${OPENAI_API_KEY}"
 	},
 	"wizard": {
 		"lastRunAt": "2026-02-19T04:49:36.701Z",
@@ -23,11 +24,47 @@
 	},
 	"models": {
 		"providers": {
+			"openai": {
+				"baseUrl": "https://api.openai.com/v1",
+				"apiKey": "${OPENAI_API_KEY}",
+				"auth": "api-key",
+				"api": "openai-completions",
+				"models": [
+					{
+						"id": "gpt-4.1-mini",
+						"name": "GPT-4.1 mini",
+						"reasoning": false,
+						"input": ["text"],
+						"cost": {
+							"input": 0,
+							"output": 0,
+							"cacheRead": 0,
+							"cacheWrite": 0
+						},
+						"contextWindow": 1047576,
+						"maxTokens": 32768
+					},
+					{
+						"id": "gpt-image-1",
+						"name": "GPT Image 1",
+						"reasoning": false,
+						"input": ["text", "image"],
+						"cost": {
+							"input": 0,
+							"output": 0,
+							"cacheRead": 0,
+							"cacheWrite": 0
+						},
+						"contextWindow": 128000,
+						"maxTokens": 4096
+					}
+				]
+			},
 			"moonshot": {
 				"baseUrl": "https://api.moonshot.ai/v1",
 				"apiKey": "${MOONSHOT_API_KEY}",
 				"auth": "api-key",
-				"api": "openai-responses",
+				"api": "openai-completions",
 				"models": [
 					{
 						"id": "kimi-k2.5",
@@ -51,13 +88,16 @@
 		"defaults": {
 			"model": {
 				"primary": "kimi-coding/k2p5",
-				"fallbacks": ["moonshot/kimi-k2.5"]
+				"fallbacks": ["moonshot/kimi-k2.5", "openai/gpt-4.1-mini"]
 			},
 			"models": {
-				"moonshot/kimi-k2.5": {
+				"kimi-coding/k2p5": {
 					"alias": "Kimi K2.5"
 				},
-				"kimi-coding/k2p5": {
+				"openai/gpt-4.1-mini": {
+					"alias": "OpenAI GPT-4.1 mini"
+				},
+				"moonshot/kimi-k2.5": {
 					"alias": "Kimi K2.5"
 				}
 			},
@@ -97,9 +137,16 @@
 		}
 	},
 	"gateway": {
-		"bind": "loopback",
+		"bind": "lan",
+		"auth": {
+			"mode": "token",
+			"token": "${OPENCLAW_GATEWAY_TOKEN}"
+		},
+		"controlUi": {
+			"allowInsecureAuth": true
+		},
 		"tailscale": {
-			"mode": "serve",
+			"mode": "off",
 			"resetOnExit": false
 		}
 	},