Merge pull request #7 from YuJunZhiXue/trae

修改docker和添加图片生成功能

Author: YuJunZhiXue

.env.example

@@ -0,0 +1,19 @@
+ADMIN_KEY=change-me-now
+PORT=7860
+WORKERS=1
+ENGINE_MODE=hybrid
+BROWSER_POOL_SIZE=2
+MAX_INFLIGHT=1
+ACCOUNT_MIN_INTERVAL_MS=1200
+REQUEST_JITTER_MIN_MS=120
+REQUEST_JITTER_MAX_MS=360
+MAX_RETRIES=2
+TOOL_MAX_RETRIES=2
+EMPTY_RESPONSE_RETRIES=1
+RATE_LIMIT_BASE_COOLDOWN=600
+RATE_LIMIT_MAX_COOLDOWN=3600
+STREAM_KEEPALIVE_INTERVAL=5
+ACCOUNTS_FILE=/workspace/data/accounts.json
+USERS_FILE=/workspace/data/users.json
+CAPTURES_FILE=/workspace/data/captures.json
+CONFIG_FILE=/workspace/data/config.json

.github/workflows/docker-publish.yml

@@ -2,29 +2,15 @@ name: Docker Build and Push
 
 on:
   push:
-    branches: [ "main", "master" ]
-    # 当你打标签（比如发布 v1.0.0）时也会触发
+    branches: [ "main" ]
     tags: [ 'v*.*.*' ]
-  pull_request:
-    branches: [ "main", "master" ]
-
-env:
-  # 使用 GitHub 自带的镜像仓库，完全不需要注册第三方账号
-  REGISTRY: ghcr.io
-  # 自动读取你的 GitHub 用户名和仓库名作为镜像名
-  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-    
-    # 这一步非常关键：赋予 GitHub Actions 推送镜像的权限
-    permissions:
-      contents: read
-      packages: write
 
     steps:
-      - name: Checkout repository
+      - name: Checkout
         uses: actions/checkout@v4
 
       - name: Set up QEMU
@@ -33,34 +19,28 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # 使用 GitHub 自带的 Token 自动登录，无需你手动配置任何密码
-      - name: Log in to the Container registry
-        if: github.event_name != 'pull_request'
+      - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # 自动生成镜像标签 (例如 latest, v1.0.0)
-      - name: Extract Docker metadata
+      - name: Extract metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: yujunzhixue/qwen2api
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
             type=semver,pattern={{version}}
             type=sha,format=short
 
-      # 构建并推送镜像
-      - name: Build and push Docker image
+      - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          # 开启构建缓存，加快以后每次打包的速度
           cache-from: type=gha
           cache-to: type=gha,mode=max

Dockerfile

@@ -7,15 +7,18 @@ COPY frontend/ ./
 RUN npm run build
 
 # Stage 2: Backend + Final Image
-FROM python:3.10-slim
+FROM python:3.11-slim
 WORKDIR /workspace
 
-# Install system dependencies required for headless Firefox (Camoufox)
-RUN apt-get update && apt-get install -y --no-install-recommends \
+# Always refresh apt cache first (never cache this layer)
+RUN apt-get update
+
+# Install system dependencies for headless Firefox (Camoufox)
+# Use || true on packages that may differ across Debian versions
+RUN apt-get install -y --no-install-recommends \
     wget \
     curl \
     ca-certificates \
-    libx11-xcb1 \
     libx11-6 \
     libxcb1 \
     libxrandr2 \
@@ -24,12 +27,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libxfixes3 \
     libxext6 \
     libxkbcommon0 \
-    libdbus-glib-1-2 \
     libdbus-1-3 \
-    libxt6 \
     libgtk-3-0 \
-    libasound2 \
-    libpulse0 \
     libdrm2 \
     libgbm1 \
     libxshmfence1 \
@@ -41,7 +40,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libnspr4 \
     libglib2.0-0 \
     fonts-liberation \
-    fonts-noto-cjk \
+    && apt-get install -y --no-install-recommends fonts-noto-cjk || true \
+    && apt-get install -y --no-install-recommends libdbus-glib-1-2 || true \
+    && apt-get install -y --no-install-recommends libasound2 libasound2t64 || true \
+    && apt-get install -y --no-install-recommends libpulse0 || true \
+    && apt-get install -y --no-install-recommends libx11-xcb1 || true \
     && rm -rf /var/lib/apt/lists/*
 
 ENV PYTHONIOENCODING=utf-8
@@ -58,7 +61,7 @@ COPY backend/ ./backend/
 COPY start.py ./
 COPY --from=frontend-builder /app/dist ./frontend/dist
 
-# Create data directory
+# Create data and logs directories
 RUN mkdir -p /workspace/data /workspace/logs
 
 EXPOSE 7860