Merge pull request #3 from zhongruan0522/master

推送Docker部署方法

Author: lilingfengdev

.github/workflows/docker.yml

@@ -0,0 +1,55 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - beta
+      - master
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest  # 使用最便宜的Linux runner
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=sha,prefix={{branch}}-
+            type=raw,value=latest,enable={{is_default_branch}}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          platforms: linux/amd64  # 只构建amd64镜像节省成本

.gitignore

@@ -46,3 +46,4 @@ Thumbs.db
 legacy
 config.yaml
 
+.spec-workflow/

Dockerfile

@@ -0,0 +1,26 @@
+# 使用官方Python运行时作为基础镜像
+FROM python:3.11-slim
+
+# 设置工作目录
+WORKDIR /app
+
+# 复制requirements文件并安装依赖
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# 复制应用代码
+COPY . .
+
+# 创建非root用户
+RUN useradd -m -u 1000 appuser && chown -R appuser:appuser /app
+USER appuser
+
+# 暴露端口
+EXPOSE 8000
+
+# 健康检查
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+    CMD python -c "import requests; requests.get('http://localhost:8000/health')" || exit 1
+
+# 启动命令
+CMD ["python", "-m", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]

README.md

@@ -55,10 +55,62 @@ model:
 
 ### 3. 运行服务
 
+#### 本地部署
+
 ```bash
 python main.py
 ```
 
+#### Docker 部署
+
+##### 使用 Docker Compose（推荐）
+
+```bash
+# 使用GitHub镜像运行
+docker-compose up -d
+
+# 查看日志
+docker-compose logs -f
+
+# 停止服务
+docker-compose down
+```
+
+##### 使用 Docker 直接运行
+
+```bash
+# 使用GitHub镜像直接运行
+docker run -d \
+  --name deepapi \
+  -p 8000:8000 \
+  -v $(pwd)/config.yaml:/app/config.yaml:ro \
+  ghcr.io/zhongruan0522/deepapi:latest
+
+# 如果需要本地构建
+docker build -t deepapi .
+docker run -d \
+  --name deepapi \
+  -p 8000:8000 \
+  -v $(pwd)/config.yaml:/app/config.yaml:ro \
+  deepapi
+```
+
+##### 环境变量说明
+- `PYTHONUNBUFFERED=1`: 启用Python日志输出
+- 自定义DNS服务器（解决网络问题）：`8.8.8.8`, `8.8.4.4`
+
+##### 健康检查
+容器包含健康检查，可通过以下命令查看状态：
+```bash
+docker ps --format "table {{.Names}}\t{{.Status}}"
+```
+
+##### 生产环境建议
+1. 使用稳定版本镜像标签（如 `beta` 或具体版本号），避免使用 `latest`
+2. 设置适当的资源限制
+3. 配置日志收集
+4. 使用HTTPS和适当的认证
+
 ## API 使用
 
 ### 聊天补全
@@ -218,4 +270,8 @@ models:
     Agent N: 角度N ──┘
             ↓
     综合所有结果 → 输出最佳方案
-```
+```
+
+## 架构说明
+
+### DeepThink 流程

docker-compose.yml

@@ -0,0 +1,22 @@
+version: '3.8'
+
+services:
+  deepapi:
+    image: ghcr.io/zhongruan0522/deepapi:beta
+    container_name: deepapi
+    ports:
+      - "8000:8000"
+    volumes:
+      - ./config.yaml:/app/config.yaml:ro
+    environment:
+      - PYTHONUNBUFFERED=1
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "python", "-c", "import requests; requests.get('http://localhost:8000/health')"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s