From e2d7b8dbbf5f4fd3950a7688c386351c3a376c08 Mon Sep 17 00:00:00 2001 From: Chenyme <118253778+chenyme@users.noreply.github.com> Date: Fri, 17 Oct 2025 11:54:06 +0800 Subject: [PATCH 1/3] feat: reduce image size --- .dockerignore | 4 ++++ Dockerfile | 28 ++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.dockerignore b/.dockerignore index a3c2840..49a3e57 100644 --- a/.dockerignore +++ b/.dockerignore @@ -80,6 +80,10 @@ logs/ *.log *.log.* +# 数据临时文件 +data/temp/ +data/token.json + # 数据库文件 *.db *.sqlite diff --git a/Dockerfile b/Dockerfile index 1992333..970d3d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,33 +5,49 @@ WORKDIR /app # 安装依赖阶段 FROM base AS dependencies -# 安装运行时需要的系统依赖 +# 安装编译所需的系统依赖 RUN apt-get update && \ apt-get install -y --no-install-recommends \ gcc \ + g++ \ + libffi-dev \ && rm -rf /var/lib/apt/lists/* # 复制并安装 Python 依赖 COPY requirements.txt . RUN pip install --no-cache-dir --upgrade pip && \ - pip install --no-cache-dir -r requirements.txt + pip install --no-cache-dir --compile -r requirements.txt && \ + find /usr/local/lib/python3.11/site-packages -type d -name "__pycache__" -exec rm -rf {} + 2>/dev/null || true && \ + find /usr/local/lib/python3.11/site-packages -type d -name "tests" -exec rm -rf {} + 2>/dev/null || true && \ + find /usr/local/lib/python3.11/site-packages -type d -name "test" -exec rm -rf {} + 2>/dev/null || true && \ + find /usr/local/lib/python3.11/site-packages -type f -name "*.pyc" -delete && \ + find /usr/local/lib/python3.11/site-packages -type f -name "*.pyo" -delete # 最终运行阶段 FROM python:3.11-slim AS runtime WORKDIR /app +# 只安装运行时必需的系统依赖 +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + libffi8 \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/* /var/tmp/* + # 复制必要的 Python 依赖 COPY --from=dependencies /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages COPY --from=dependencies /usr/local/bin /usr/local/bin -# 复制应用代码 -COPY . . - # 创建必要的目录和文件 -RUN mkdir -p /app/logs /app/data/temp && \ +RUN mkdir -p /app/logs /app/data/temp/image /app/data/temp/video && \ echo '{"ssoNormal": {}, "ssoSuper": {}}' > /app/data/token.json +# 复制应用代码 +COPY app/ ./app/ +COPY main.py . +COPY data/setting.toml ./data/ + EXPOSE 8000 CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] \ No newline at end of file From 29d7b64f1c99fd6c010331f2b9a49ba43cad87e2 Mon Sep 17 00:00:00 2001 From: Chenyme <118253778+chenyme@users.noreply.github.com> Date: Fri, 17 Oct 2025 12:40:08 +0800 Subject: [PATCH 2/3] feat: reduce image size --- Dockerfile | 56 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 970d3d8..ce40d23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,9 @@ -FROM python:3.11-slim AS base +# 构建阶段 - 使用完整镜像编译依赖 +FROM python:3.11-slim AS builder -WORKDIR /app +WORKDIR /build -# 安装依赖阶段 -FROM base AS dependencies - -# 安装编译所需的系统依赖 +# 安装编译工具 RUN apt-get update && \ apt-get install -y --no-install-recommends \ gcc \ @@ -13,31 +11,39 @@ RUN apt-get update && \ libffi-dev \ && rm -rf /var/lib/apt/lists/* -# 复制并安装 Python 依赖 +# 安装依赖到独立目录 COPY requirements.txt . -RUN pip install --no-cache-dir --upgrade pip && \ - pip install --no-cache-dir --compile -r requirements.txt && \ - find /usr/local/lib/python3.11/site-packages -type d -name "__pycache__" -exec rm -rf {} + 2>/dev/null || true && \ - find /usr/local/lib/python3.11/site-packages -type d -name "tests" -exec rm -rf {} + 2>/dev/null || true && \ - find /usr/local/lib/python3.11/site-packages -type d -name "test" -exec rm -rf {} + 2>/dev/null || true && \ - find /usr/local/lib/python3.11/site-packages -type f -name "*.pyc" -delete && \ - find /usr/local/lib/python3.11/site-packages -type f -name "*.pyo" -delete +RUN pip install --no-cache-dir --prefix=/install --compile -r requirements.txt -# 最终运行阶段 -FROM python:3.11-slim AS runtime +# 清理 Python 包中的冗余文件 +RUN find /install -type d -name "__pycache__" -exec rm -rf {} + 2>/dev/null || true && \ + find /install -type d -name "tests" -exec rm -rf {} + 2>/dev/null || true && \ + find /install -type d -name "test" -exec rm -rf {} + 2>/dev/null || true && \ + find /install -type d -name "*.dist-info" -exec sh -c 'rm -f "$1"/RECORD "$1"/INSTALLER' _ {} \; && \ + find /install -type f -name "*.pyc" -delete && \ + find /install -type f -name "*.pyo" -delete && \ + find /install -type f -name "*.c" -delete && \ + find /install -type f -name "*.h" -delete && \ + find /install -type f -name "*.txt" -path "*/pip/*" -delete 2>/dev/null || true + +# 运行阶段 - 使用最小镜像 +FROM python:3.11-slim WORKDIR /app -# 只安装运行时必需的系统依赖 +# 只安装必要的运行时库 RUN apt-get update && \ apt-get install -y --no-install-recommends \ libffi8 \ + ca-certificates \ && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* /var/tmp/* + && rm -rf /tmp/* /var/tmp/* \ + && rm -rf /usr/share/doc/* \ + && rm -rf /usr/share/man/* \ + && rm -rf /var/cache/apt/* -# 复制必要的 Python 依赖 -COPY --from=dependencies /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages -COPY --from=dependencies /usr/local/bin /usr/local/bin +# 从构建阶段复制已安装的包 +COPY --from=builder /install /usr/local # 创建必要的目录和文件 RUN mkdir -p /app/logs /app/data/temp/image /app/data/temp/video && \ @@ -48,6 +54,10 @@ COPY app/ ./app/ COPY main.py . COPY data/setting.toml ./data/ -EXPOSE 8000 +# 删除 Python 字节码和缓存 +ENV PYTHONDONTWRITEBYTECODE=1 \ + PYTHONUNBUFFERED=1 -CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] \ No newline at end of file +EXPOSE 8001 + +CMD ["python", "-m", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8001"] \ No newline at end of file From 87cf2a5673a66088d7eb34cc68e38bf296135f0b Mon Sep 17 00:00:00 2001 From: Chenyme <118253778+chenyme@users.noreply.github.com> Date: Fri, 17 Oct 2025 12:44:24 +0800 Subject: [PATCH 3/3] feat: reduce image size --- Dockerfile | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index ce40d23..452c561 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,46 +1,32 @@ -# 构建阶段 - 使用完整镜像编译依赖 +# 构建阶段 FROM python:3.11-slim AS builder WORKDIR /build -# 安装编译工具 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - gcc \ - g++ \ - libffi-dev \ - && rm -rf /var/lib/apt/lists/* - # 安装依赖到独立目录 COPY requirements.txt . -RUN pip install --no-cache-dir --prefix=/install --compile -r requirements.txt - -# 清理 Python 包中的冗余文件 -RUN find /install -type d -name "__pycache__" -exec rm -rf {} + 2>/dev/null || true && \ +RUN pip install --no-cache-dir --only-binary=:all: --prefix=/install -r requirements.txt && \ + find /install -type d -name "__pycache__" -exec rm -rf {} + 2>/dev/null || true && \ find /install -type d -name "tests" -exec rm -rf {} + 2>/dev/null || true && \ find /install -type d -name "test" -exec rm -rf {} + 2>/dev/null || true && \ find /install -type d -name "*.dist-info" -exec sh -c 'rm -f "$1"/RECORD "$1"/INSTALLER' _ {} \; && \ find /install -type f -name "*.pyc" -delete && \ find /install -type f -name "*.pyo" -delete && \ - find /install -type f -name "*.c" -delete && \ - find /install -type f -name "*.h" -delete && \ - find /install -type f -name "*.txt" -path "*/pip/*" -delete 2>/dev/null || true + find /install -name "*.so" -exec strip --strip-unneeded {} \; 2>/dev/null || true # 运行阶段 - 使用最小镜像 FROM python:3.11-slim WORKDIR /app -# 只安装必要的运行时库 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - libffi8 \ - ca-certificates \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* /var/tmp/* \ - && rm -rf /usr/share/doc/* \ - && rm -rf /usr/share/man/* \ - && rm -rf /var/cache/apt/* +# 清理基础镜像中的冗余文件 +RUN rm -rf /usr/share/doc/* \ + /usr/share/man/* \ + /usr/share/locale/* \ + /var/cache/apt/* \ + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* # 从构建阶段复制已安装的包 COPY --from=builder /install /usr/local