Merge pull request #190 from Vstay97/vstay97

在构建 image的阶段就使用代理,这样再进行 apt更新时就不会太慢

Author: CJackHwang

docker/Dockerfile

@@ -1,57 +1,75 @@
 # Dockerfile
 
+ARG PROXY_ADDR="http://host.docker.internal:7890"
 FROM python:3.10-slim-bookworm AS builder
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    libatk1.0-0 libatk-bridge2.0-0 libcups2 libdbus-1-3 libdrm2 libgbm1 libgtk-3-0 libnspr4 libnss3 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxdamage1 libxext6 libxfixes3 libxrandr2 libxrender1 libxtst6 ca-certificates fonts-liberation libasound2 libpangocairo-1.0-0 libpango-1.0-0 libu2f-udev \
-    supervisor curl \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+ARG PROXY_ADDR
+
+RUN if [ -n "$PROXY_ADDR" ]; then \
+    printf 'Acquire::http::Proxy "%s";\nAcquire::https::Proxy "%s";\n' "$PROXY_ADDR" "$PROXY_ADDR" > /etc/apt/apt.conf.d/99proxy; \
+    fi && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends curl \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    if [ -n "$PROXY_ADDR" ]; then rm -f /etc/apt/apt.conf.d/99proxy; fi
+
+ENV HTTP_PROXY=${PROXY_ADDR}
+ENV HTTPS_PROXY=${PROXY_ADDR}
 
-# Install Poetry
 ENV POETRY_HOME="/opt/poetry"
 ENV POETRY_VERSION=1.8.3
-RUN curl -sSL https://install.python-poetry.org | python3 - --version ${POETRY_VERSION} 
+RUN curl -sSL https://install.python-poetry.org | python3 - --version ${POETRY_VERSION}
 ENV PATH="${POETRY_HOME}/bin:${PATH}"
 
 WORKDIR /app_builder
-
-# Copy Poetry project files
 COPY pyproject.toml poetry.lock ./
-
-# Configure Poetry to not create virtualenvs and install dependencies
 RUN poetry config virtualenvs.create false --local && \
     poetry install --no-root --no-dev --no-interaction --no-ansi
 
 FROM python:3.10-slim-bookworm
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && \
+ARG PROXY_ADDR
+
+ENV HTTP_PROXY=${PROXY_ADDR}
+ENV HTTPS_PROXY=${PROXY_ADDR}
+
+# 步骤 1: 安装所有系统依赖。
+# Playwright 的依赖也在这里一并安装。
+RUN \
+    if [ -n "$PROXY_ADDR" ]; then \
+    printf 'Acquire::http::Proxy "%s";\nAcquire::https::Proxy "%s";\n' "$PROXY_ADDR" "$PROXY_ADDR" > /etc/apt/apt.conf.d/99proxy; \
+    fi && \
+    apt-get update && \
     apt-get install -y --no-install-recommends \
     libatk1.0-0 libatk-bridge2.0-0 libcups2 libdbus-1-3 libdrm2 libgbm1 libgtk-3-0 libnspr4 libnss3 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxdamage1 libxext6 libxfixes3 libxrandr2 libxrender1 libxtst6 ca-certificates fonts-liberation libasound2 libpangocairo-1.0-0 libpango-1.0-0 libu2f-udev \
     supervisor curl \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+    && \
+    # 清理工作
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* && \
+    if [ -n "$PROXY_ADDR" ]; then rm -f /etc/apt/apt.conf.d/99proxy; fi
 
 RUN groupadd -r appgroup && useradd -r -g appgroup -s /bin/bash -d /app appuser
 
 WORKDIR /app
 
-# Copy installed packages and executables from builder stage
+# 步骤 2: 复制 Python 包和可执行文件。
+# 这是关键的顺序调整：在使用 playwright 之前先把它复制进来。
 COPY --from=builder /usr/local/lib/python3.10/site-packages/ /usr/local/lib/python3.10/site-packages/
 COPY --from=builder /usr/local/bin/ /usr/local/bin/
 COPY --from=builder /opt/poetry/bin/poetry /usr/local/bin/poetry
 
-# Copy application code
+# 复制应用代码
 COPY . .
 
-# Install Playwright browsers and dependencies, and fetch camoufox
-# Note: poetry is now available in the final image if needed for any build scripts,
-# but dependencies should already be installed.
+# 步骤 3: 现在 Python 模块已存在，可以安全地运行这些命令。
+# 注意：我们不再需要 `playwright install-deps`，因为依赖已在上面的 apt-get 中安装。
 RUN camoufox fetch && \
-    python -m playwright install firefox && \
-    python -m playwright install-deps firefox
+    python -m playwright install firefox
 
+# 创建目录和设置权限
 RUN mkdir -p /app/logs && \
     mkdir -p /app/auth_profiles/active && \
     mkdir -p /app/auth_profiles/saved && \
@@ -64,19 +82,18 @@ RUN mkdir -p /app/logs && \
 
 COPY supervisord.conf /etc/supervisor/conf.d/app.conf
 
-#新增解决 ❌ 错误 (--internal-launch-mode): 执行 camoufox.server.launch_server 时发生异常: Version information not found at /app/.cache/camoufox/version.json. Please run `camoufox fetch` to install.
+# 修复 camoufox 缓存逻辑
 RUN mkdir -p /var/cache/camoufox && \
-    # 2. 从 builder 阶段复制 camoufox 的缓存文件到最终镜像的 /var/cache/camoufox
-    # 这是最关键的一步，确保文件内容存在
-    cp -a /root/.cache/camoufox/* /var/cache/camoufox/ && \
-    # 3. 创建 appuser 期望的缓存路径
+    if [ -d /root/.cache/camoufox ]; then cp -a /root/.cache/camoufox/* /var/cache/camoufox/; fi && \
     mkdir -p /app/.cache && \
-    # 4. 创建软链接，将 /app/.cache/camoufox 指向实际文件所在位置
-    ln -s /var/cache/camoufox /app/.cache/camoufox 
-#新增结束
+    ln -s /var/cache/camoufox /app/.cache/camoufox
 
 RUN python update_browserforge_data.py
 
+# 清理代理环境变量
+ENV HTTP_PROXY=""
+ENV HTTPS_PROXY=""
+
 EXPOSE 2048
 EXPOSE 3120
 
@@ -86,16 +103,13 @@ ENV PLAYWRIGHT_BROWSERS_PATH=/home/appuser/.cache/ms-playwright
 
 ENV PYTHONUNBUFFERED=1
 
-# Default environment variables (can be overridden by .env or runtime)
 ENV PORT=8000
 ENV DEFAULT_FASTAPI_PORT=2048
 ENV DEFAULT_CAMOUFOX_PORT=9222
 ENV STREAM_PORT=3120
 ENV SERVER_LOG_LEVEL=INFO
 ENV DEBUG_LOGS_ENABLED=false
 ENV AUTO_CONFIRM_LOGIN=true
-
-# Backward compatibility
 ENV SERVER_PORT=2048
 ENV INTERNAL_CAMOUFOX_PROXY=""