clash-linux commited on
Commit
17a46ca
·
verified ·
1 Parent(s): 40a164c

Upload 11 files

Browse files
Files changed (1) hide show
  1. Dockerfile +15 -15
Dockerfile CHANGED
@@ -5,19 +5,19 @@ FROM python:3.9-alpine
5
  WORKDIR /app
6
 
7
  # 安装系统依赖
8
- # 添加 build-base (包含gcc, make等) python3-dev, musl-dev, libffi-dev 用于编译
9
- # 添加 yaml-dev 以确保libyaml头文件可用
10
  RUN apk add --no-cache \
11
  curl \
12
  ca-certificates \
13
  tzdata \
14
  tar \
15
  gzip \
16
- build-base \
17
  python3-dev \
18
  musl-dev \
19
  libffi-dev \
20
- yaml-dev
 
 
21
 
22
  # 设置时区为亚洲/上海
23
  ENV TZ=Asia/Shanghai
@@ -57,23 +57,23 @@ COPY requirements.txt ./
57
  # 升级 pip
58
  RUN pip install --upgrade pip
59
 
60
- # 安装Cython 和 setuptools (作为PyYAML构建依赖的后备)
61
- RUN pip install --no-cache-dir Cython setuptools
62
 
63
- # 设置环境变量,帮助PyYAML找到系统libyaml
64
- ENV YAML_INCLUDE_DIR=/usr/include \
65
- YAML_LIB_DIR=/usr/lib
66
 
67
- # 单独安装PyYAML,尝试强制使用系统库
68
- RUN echo "Installing PyYAML..." && \
69
- pip install --no-cache-dir --no-build-isolation PyYAML==6.0
70
 
71
- # 安装剩余的Python依赖
72
- RUN echo "Installing remaining Python dependencies..." && \
73
  pip install --no-cache-dir -r requirements.txt
74
 
75
  # 可选:删除构建依赖以减小镜像体积
76
- # RUN apk del build-base python3-dev musl-dev libffi-dev yaml-dev
77
 
78
  # 设置环境变量
79
  ENV PYTHONDONTWRITEBYTECODE=1 \
 
5
  WORKDIR /app
6
 
7
  # 安装系统依赖
8
+ # 添加 py3-yaml 直接通过 apk 安装 PyYAML
 
9
  RUN apk add --no-cache \
10
  curl \
11
  ca-certificates \
12
  tzdata \
13
  tar \
14
  gzip \
 
15
  python3-dev \
16
  musl-dev \
17
  libffi-dev \
18
+ yaml-dev \
19
+ py3-yaml
20
+ # 不再需要 build-base,因为不再编译 PyYAML
21
 
22
  # 设置时区为亚洲/上海
23
  ENV TZ=Asia/Shanghai
 
57
  # 升级 pip
58
  RUN pip install --upgrade pip
59
 
60
+ # 不再需要预安装 Cython 和 setuptools
61
+ # RUN pip install --no-cache-dir Cython setuptools
62
 
63
+ # 不再需要设置 PyYAML 环境变量
64
+ # ENV YAML_INCLUDE_DIR=/usr/include \
65
+ # YAML_LIB_DIR=/usr/lib
66
 
67
+ # 不再需要单独安装 PyYAML
68
+ # RUN echo "Installing PyYAML..." && \
69
+ # pip install --no-cache-dir --no-build-isolation PyYAML==6.0
70
 
71
+ # 安装剩余的Python依赖 (PyYAML 已通过 apk 安装)
72
+ RUN echo "Installing Python dependencies..." && \
73
  pip install --no-cache-dir -r requirements.txt
74
 
75
  # 可选:删除构建依赖以减小镜像体积
76
+ # RUN apk del python3-dev musl-dev libffi-dev yaml-dev
77
 
78
  # 设置环境变量
79
  ENV PYTHONDONTWRITEBYTECODE=1 \