Update Dockerfile

Dockerfile

@@ -1,66 +1,69 @@
 FROM python:3.11-slim
 
-WORKDIR /app
-
-
-# Install system dependencies
+# 安装 Chrome 和必要的依赖
 RUN apt-get update && apt-get install -y \
-    build-essential \
-    curl \
-    libcurl4-openssl-dev \
-    libssl-dev \
-    # Chrome dependencies
     wget \
     gnupg \
-    fonts-liberation \
-    libasound2 \
-    libatk-bridge2.0-0 \
-    libatk1.0-0 \
-    libatspi2.0-0 \
-    libcups2 \
-    libdbus-1-3 \
-    libdrm2 \
-    libgbm1 \
-    libgtk-3-0 \
-    libnspr4 \
-    libnss3 \
-    libxcomposite1 \
-    libxdamage1 \
-    libxfixes3 \
-    libxkbcommon0 \
-    libxrandr2 \
-    xdg-utils \
-    # Install Chrome
     && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
     && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list \
     && apt-get update \
-    && apt-get install -y google-chrome-stable \
+    && apt-get install -y \
+    google-chrome-stable \
+    fonts-ipafont-gothic \
+    fonts-wqy-zenhei \
+    fonts-thai-tlwg \
+    fonts-kacst \
+    fonts-freefont-ttf \
+    libxss1 \
+    libx11-xcb1 \
+    libxcomposite1 \
+    libxcursor1 \
+    libxdamage1 \
+    libxi6 \
+    libxtst6 \
+    libglib2.0-0 \
+    libnss3 \
+    libcups2 \
+    libxss1 \
+    libxrandr2 \
+    libasound2 \
+    libpangocairo-1.0-0 \
+    libatk1.0-0 \
+    libatk-bridge2.0-0 \
+    libgtk-3-0 \
     && rm -rf /var/lib/apt/lists/*
 
-# Copy requirements first to leverage Docker cache
+# 设置工作目录
+WORKDIR /app
+
+# 设置环境变量
+ENV PYTHONUNBUFFERED=1 \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PLAYWRIGHT_BROWSERS_PATH=/ms-playwright \
+    CHROME_BIN=/usr/bin/google-chrome \
+    CHROME_PATH=/usr/lib/google-chrome/ \
+    PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
+    PUPPETEER_EXECUTABLE_PATH=/usr/bin/google-chrome
+
+# 复制依赖文件
 COPY requirements.txt .
+
+# 安装 Python 依赖
 RUN pip install --no-cache-dir -r requirements.txt
 
-# 配置 DrissionPage
-RUN cd /usr/local/lib/python3.11/site-packages/DrissionPage/_configs/ && \
-    sed -i "/browser_path/s/$(grep 'browser_path' 'configs.ini' | awk -F '=' '{print $2}')/\/usr\/bin\/google-chrome-stable/" configs.ini && \
-    sed -i "/arguments/s/\[/\[\'--no-sandbox\', \'--headless=new\', \'--disable-dev-shm-usage\', \'--disable-gpu\', \'--disable-software-rasterizer\', \'--disable-extensions\', \'--disable-setuid-sandbox\', \'--no-first-run\', \'--no-zygote\', \'--single-process\', \'--remote-debugging-port=9222\', \'--window-size=1920,1080\', \'--user-agent=Mozilla\/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/120.0.0.0 Safari\/537.36\', \'--enable-logging\', \'--v=1\', \'--remote-debugging-address=127.0.0.1\', /" configs.ini
+# 安装 Playwright 浏览器
+RUN playwright install chromium
 
-# Copy the rest of the application
+# 复制应用代码
 COPY . .
 
-# 创建并设置 Chrome 数据目录
-RUN mkdir -p /tmp/chrome-data && chmod 777 /tmp/chrome-data
+# 创建非 root 用户
+RUN useradd -m -u 1000 appuser && \
+    chown -R appuser:appuser /app
+USER appuser
 
-# Expose the port the app runs on
+# 暴露端口
 EXPOSE 7860
 
-# Environment variables with defaults
-ENV OPENAI_API_KEY=None
-ENV ENVIRONMENT="production"
-ENV PORT=7860
-ENV CHROME_PATH=/usr/bin/google-chrome-stable
-ENV CHROME_USER_DATA_DIR=/tmp/chrome-data
-
-# Command to run the application
+# 启动命令
 CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]