From 16c9e64ae40d2c4983446d75deb24a500345f4b8 Mon Sep 17 00:00:00 2001 From: foxhui Date: Sun, 14 Dec 2025 19:23:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Docker=20=E7=99=BB=E5=BD=95=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 15 +++++++++++---- README.md | 2 +- docker-compose.yaml | 3 ++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74c143e..d172039 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,8 +22,10 @@ RUN apt-get update && apt-get install -y \ build-essential \ && rm -rf /var/lib/apt/lists/* -# 2. 复制依赖并安装 +# 2. 复制依赖文件、脚本和补丁目录,然后安装 COPY package.json pnpm-lock.yaml ./ +COPY scripts/ ./scripts/ +COPY patches/ ./patches/ RUN npm install -g pnpm && pnpm install --frozen-lockfile # 3. 复制源码并初始化 @@ -50,9 +52,14 @@ CMD ["/bin/sh", "-c", "\ fi; \ \ ARGS='-xvfb -vnc'; \ - if [ \"$LOGIN_MODE\" = \"true\" ]; then \ - echo '>>> ENABLED LOGIN MODE'; \ - ARGS=\"$ARGS -login\"; \ + if [ -n \"$LOGIN_MODE\" ]; then \ + if [ \"$LOGIN_MODE\" = \"true\" ]; then \ + echo '>>> ENABLED LOGIN MODE'; \ + ARGS=\"$ARGS -login\"; \ + else \ + echo \">>> ENABLED LOGIN MODE for worker: $LOGIN_MODE\"; \ + ARGS=\"$ARGS -login:$LOGIN_MODE\"; \ + fi; \ fi; \ \ echo \">>> Starting application with args: $ARGS\"; \ diff --git a/README.md b/README.md index 2fdbfd6..9a829ce 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ LMArenaImagenAutomator 是一个基于 Playwright + Camoufox 的自动化图像 ### 🐳 方式二:Docker 部署 -> ⚠️ **特别说明**:首次运行需设置 `LOGIN_MODE=true`,并通过 VNC 客户端连接 `localhost:5900` 完成网页登录验证。 +> ⚠️ **特别说明**:首次运行需设置 `LOGIN_MODE=true`(true可以改为workerName),并通过 VNC 客户端连接 `localhost:5900` 完成网页登录验证。 **Docker CLI** ```bash diff --git a/docker-compose.yaml b/docker-compose.yaml index af4e674..715f777 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,8 +11,9 @@ services: - ./data:/app/data environment: - DISPLAY=:99 - # true: 登录模式 (用VNC连上去登录) # false: 标准挂机模式 + # true: 登录第一个 worker + # workerName: 只登录指定的 worker - LOGIN_MODE=false shm_size: '2gb' init: true \ No newline at end of file