StarrySkyWorld commited on
Commit
fd78901
·
verified ·
1 Parent(s): 26ea821

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +12 -27
Dockerfile CHANGED
@@ -5,61 +5,46 @@ WORKDIR /build
5
 
6
  # 安装 git 和构建依赖
7
  RUN apt-get update && apt-get install -y --no-install-recommends \
8
- git \
9
- gcc \
10
- python3-dev \
11
- && rm -rf /var/lib/apt/lists/*
12
 
13
  # 克隆仓库
14
  RUN git clone https://github.com/chenyme/grok2api.git .
15
 
16
- # 安装依赖到独立目录
17
- # 额外安装 psycopg2-binary 以支持 PostgreSQL
18
  RUN pip install --no-cache-dir --prefix=/install psycopg2-binary && \
19
- pip install --no-cache-dir --only-binary=:all: --prefix=/install -r requirements.txt && \
20
- find /install -type d -name "__pycache__" -exec rm -rf {} + 2>/dev/null || true
21
 
22
  # 运行阶段
23
  FROM python:3.11-slim
24
 
25
- # 设置环境变量
26
  ENV PYTHONDONTWRITEBYTECODE=1 \
27
  PYTHONUNBUFFERED=1 \
28
  HOME=/home/user \
29
  PORT=7860
30
 
31
- # 创建非 root 用户 (HF Spaces 必须)
32
  RUN useradd -m -u 1000 user
33
  WORKDIR /app
34
 
35
- # 安装运行时必要的库 (libpq 是 pgsql 运行需要的)
36
- RUN apt-get update && apt-get install -y --no-install-recommends \
37
- libpq5 \
38
- curl \
39
- && rm -rf /var/lib/apt/lists/*
40
 
41
- # 从构建阶段复制已安装的包
42
  COPY --from=builder /install /usr/local
43
-
44
- # 从构建阶段复制源码
45
  COPY --from=builder /build /app/
46
-
47
- # 复制并处理 entrypoint
48
- # 注意:我们将 entrypoint 放在 /app 下以便于权限管理
49
  COPY docker-entrypoint.sh /app/docker-entrypoint.sh
50
- RUN chmod +x /app/docker-entrypoint.sh
51
 
52
- # 创建数据目录并授权给用户 1000
53
- RUN mkdir -p /app/data /app/logs && \
 
54
  chown -R user:user /app
55
 
56
- # 切换到非 root 用户
57
  USER user
58
 
59
  EXPOSE 7860
60
 
61
- # 使用 entrypoint
62
  ENTRYPOINT ["/app/docker-entrypoint.sh"]
63
 
64
- # 启动命令 (适配 HF 的端口)
65
  CMD ["python", "-m", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
 
5
 
6
  # 安装 git 和构建依赖
7
  RUN apt-get update && apt-get install -y --no-install-recommends \
8
+ git gcc python3-dev libpq-dev && rm -rf /var/lib/apt/lists/*
 
 
 
9
 
10
  # 克隆仓库
11
  RUN git clone https://github.com/chenyme/grok2api.git .
12
 
13
+ # 安装依赖(包含 PgSQL 驱动)
 
14
  RUN pip install --no-cache-dir --prefix=/install psycopg2-binary && \
15
+ pip install --no-cache-dir --only-binary=:all: --prefix=/install -r requirements.txt
 
16
 
17
  # 运行阶段
18
  FROM python:3.11-slim
19
 
20
+ # HF 环境变量
21
  ENV PYTHONDONTWRITEBYTECODE=1 \
22
  PYTHONUNBUFFERED=1 \
23
  HOME=/home/user \
24
  PORT=7860
25
 
26
+ # 创建 HF 专用的非 root 用户
27
  RUN useradd -m -u 1000 user
28
  WORKDIR /app
29
 
30
+ # 安装运行时必要的 libpq
31
+ RUN apt-get update && apt-get install -y --no-install-recommends libpq5 && rm -rf /var/lib/apt/lists/*
 
 
 
32
 
33
+ # 复制文件
34
  COPY --from=builder /install /usr/local
 
 
35
  COPY --from=builder /build /app/
 
 
 
36
  COPY docker-entrypoint.sh /app/docker-entrypoint.sh
 
37
 
38
+ # 权限处理
39
+ RUN chmod +x /app/docker-entrypoint.sh && \
40
+ mkdir -p /app/data /app/logs && \
41
  chown -R user:user /app
42
 
 
43
  USER user
44
 
45
  EXPOSE 7860
46
 
 
47
  ENTRYPOINT ["/app/docker-entrypoint.sh"]
48
 
49
+ # 启动命令,注意端口 7860
50
  CMD ["python", "-m", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]