Upload 6 files

Dockerfile

@@ -40,10 +40,9 @@ RUN wget https://github.com/oauth2-proxy/oauth2-proxy/releases/download/v7.6.0/o
     && chmod +x /usr/bin/oauth2-proxy \
     && rm -rf oauth2-proxy-v7.6.0.linux-amd64*
 
-# Install Node.js and OpenClaw
+# Install Node.js (for manual OpenClaw installation later)
 RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
-    apt-get install -y nodejs && \
-    npm install -g openclaw@latest
+    apt-get install -y nodejs
 
 # Create a non-root user 'user' (UID 1000)
 RUN useradd -m -u 1000 user && \

nginx.conf

@@ -53,12 +53,12 @@ http {
         # Protected Resources
         # =========================================================
 
-        # 1. OpenClaw Dashboard - Root Path /
+        # 1. Terminal (ttyd) - Root Path /
         location / {
             auth_request /oauth2/auth;
             error_page 401 = /oauth2/sign_in;
 
-            proxy_pass http://127.0.0.1:18789;
+            proxy_pass http://127.0.0.1:7681;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
@@ -70,12 +70,12 @@ http {
             proxy_set_header X-Forwarded-Email $upstream_http_x_forwarded_email;
         }
 
-        # 2. Terminal (ttyd) - /terminal/ Path
-        location /terminal/ {
+        # 2. OpenClaw Dashboard - /ui/ Path (for manual start later)
+        location /ui/ {
             auth_request /oauth2/auth;
             error_page 401 = /oauth2/sign_in;
 
-            proxy_pass http://127.0.0.1:7681;
+            proxy_pass http://127.0.0.1:18789/;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";

start.sh

@@ -54,63 +54,12 @@ fi
 # =========================================================
 
 # 1. 启动 ttyd (本地监听 7681)
+# -b /: 设置 Web 终端为根路径，登录即是终端
 echo "Starting ttyd on 127.0.0.1:7681..."
-ttyd -p 7681 -i 127.0.0.1 -b /terminal -W bash &
+ttyd -p 7681 -i 127.0.0.1 -W bash &
 TTYD_PID=$!
 
-# 2. 启动 OpenClaw Gateway (本地监听 18789)
-echo "Starting OpenClaw Gateway..."
-
-# 设置 OpenClaw 环境变量
-export PORT=18789
-export OPENCLAW_PORT=18789
-export HOST=127.0.0.1
-export OPENCLAW_NON_INTERACTIVE=true
-
-# 打印当前安装的 OpenClaw 版本
-openclaw --version || echo "Cannot get openclaw version"
-
-# 启动 OpenClaw 并直接输出到控制台 (使用 tail 实时监控)
-touch /tmp/openclaw.log
-if command -v openclaw &> /dev/null; then
-    echo "Executing: openclaw gateway run"
-    openclaw gateway run > /tmp/openclaw.log 2>&1 &
-    OPENCLAW_PID=$!
-else
-    echo "Executing: npx openclaw gateway run"
-    npx openclaw gateway run > /tmp/openclaw.log 2>&1 &
-    OPENCLAW_PID=$!
-fi
-
-# 启动一个后台任务实时打印 OpenClaw 日志到控制台，方便在 HF Logs 查看
-tail -f /tmp/openclaw.log &
-LOG_TAIL_PID=$!
-
-# 等待 OpenClaw 启动 (最多 30 秒)
-for i in {1..30}; do
-    if nc -z 127.0.0.1 18789; then
-        echo "SUCCESS: OpenClaw Gateway is up and running on port 18789!"
-        break
-    fi
-    
-    # 打印当前监听的端口，看看它到底躲在哪个端口了
-    if [ $((i % 5)) -eq 0 ]; then
-        echo "Current listening ports:"
-        netstat -tulpn | grep LISTEN
-    fi
-
-    echo "Waiting for OpenClaw (attempt $i/30)..."
-    
-    if ! kill -0 $OPENCLAW_PID 2>/dev/null; then
-        echo "CRITICAL: OpenClaw process died! Final logs:"
-        cat /tmp/openclaw.log
-        break
-    fi
-    
-    sleep 1
-done
-
-# 3. 启动 oauth2-proxy (本地监听 4180)
+# 2. 启动 oauth2-proxy (本地监听 4180)
 # 回退到稳定模式：根据环境变量智能选择单个 Provider
 echo "Starting oauth2-proxy on 127.0.0.1:4180..."
 
@@ -133,6 +82,7 @@ else
 fi
 
 # 构建 oauth2-proxy 命令 (标准命令行模式)
+# 上游指向 ttyd (127.0.0.1:7681)
 CMD="oauth2-proxy \
     --config=oauth2-proxy.cfg \
     --provider=$OAUTH2_PROXY_PROVIDER \
@@ -140,7 +90,7 @@ CMD="oauth2-proxy \
     --client-secret=$OAUTH2_PROXY_CLIENT_SECRET \
     --cookie-secret=$OAUTH2_PROXY_COOKIE_SECRET \
     --email-domain=* \
-    --upstream=http://127.0.0.1:18789 \
+    --upstream=http://127.0.0.1:7681 \
     --http-address=127.0.0.1:4180 \
     --authenticated-emails-file=$AUTH_FILE"