rollback dockerfile

2026-02-03 02:25:32 +08:00 · 2025-08-21 18:44:47 +08:00
parent 5f18776c61
commit b6154e58b8
1 changed files with 68 additions and 87 deletions
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,57 +1,4 @@
-# builder 阶段：完成所有编译、下载和准备工作
-FROM python:3.12.8-slim-bookworm AS builder
-
-# 设置环境变量
-ENV LANG="C.UTF-8" \
-    TZ="Asia/Shanghai" \
-    VENV_PATH="/opt/venv"
-ENV PATH="${VENV_PATH}/bin:${PATH}"
-
-# 安装系统构建依赖
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    musl-dev \
-    curl \
-    busybox \
-    jq \
-    wget \
-    && \
-    if [ "$(uname -m)" = "x86_64" ]; \
-        then ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1; \
-    elif [ "$(uname -m)" = "aarch64" ]; \
-        then ln -s /usr/lib/aarch64-linux-musl/libc.so /lib/libc.musl-aarch64.so.1; \
-    fi
-
-# 安装 Python 构建依赖并创建虚拟环境
-WORKDIR /app
-COPY ../requirements.in requirements.in
-RUN python3 -m venv ${VENV_PATH} \
-    && pip install --upgrade pip \
-    && pip install Cython pip-tools \
-    && pip-compile requirements.in \
-    && pip install -r requirements.txt
-
-# 3. 下载外部资源
-COPY ./version.py .
-RUN mkdir -p /app/app/plugins /app/app/helper /public \
-    && FRONTEND_VERSION=$(sed -n "s/^FRONTEND_VERSION\s*=\s*'\([^']*\)'/\1/p" /app/version.py) \
-    && curl -sL "https://github.com/jxxghp/MoviePilot-Frontend/releases/download/${FRONTEND_VERSION}/dist.zip" | busybox unzip -d / - && mv /dist /public \
-    && curl -sL "https://github.com/jxxghp/MoviePilot-Plugins/archive/refs/heads/main.zip" | busybox unzip -d /tmp - \
-    && mv -f /tmp/MoviePilot-Plugins-main/plugins.v2/* /app/app/plugins/ \
-    && cat /tmp/MoviePilot-Plugins-main/package.json | jq -r 'to_entries[] | select(.value.v2 == true) | .key' | awk '{print tolower($0)}' | \
-        while read -r i; do if [ ! -d "/app/app/plugins/$i" ]; then mv "/tmp/MoviePilot-Plugins-main/plugins/$i" "/app/app/plugins/"; else echo "跳过 $i"; fi; done \
-    && curl -sL "https://github.com/jxxghp/MoviePilot-Resources/archive/refs/heads/main.zip" | busybox unzip -d /tmp - \
-    && mv -f /tmp/MoviePilot-Resources-main/resources.v2/* /app/app/helper/ \
-    && rm -rf /tmp/*
-
-# 复制项目的全部代码
-COPY .. .
-
-
-# final 阶段: 安装运行时依赖和配置最终镜像
-FROM python:3.12.8-slim-bookworm AS final
-
-# 设置环境变量
+FROM python:3.12.8-slim-bookworm
 ENV LANG="C.UTF-8" \
    TZ="Asia/Shanghai" \
    HOME="/moviepilot" \
@@ -62,42 +9,68 @@ ENV LANG="C.UTF-8" \
    PGID=0 \
    UMASK=000 \
    VENV_PATH="/opt/venv"
-ENV PATH="${VENV_PATH}/bin:${PATH}"
+WORKDIR "/app"

-# 设置工作目录
-WORKDIR /app
-
-# 从 builder 阶段复制应用代码、所有已下载好的资源、虚拟环境中的依赖
-COPY --from=builder ${VENV_PATH} ${VENV_PATH}
-COPY --from=builder /app /app
-COPY --from=builder /public /public
-
-# 安装最终镜像所需的运行时依赖
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    nginx \
-    gettext-base \
-    locales \
-    procps \
-    gosu \
-    bash \
-    curl \
-    wget \
-    busybox \
-    dumb-init \
-    jq \
-    fuse3 \
-    rsync \
-    ffmpeg \
-    nano \
+# 安装系统依赖
+RUN apt-get update -y \
+    && apt-get upgrade -y \
+    && apt-get -y install \
+        musl-dev \
+        nginx \
+        gettext-base \
+        locales \
+        procps \
+        gosu \
+        bash \
+        wget \
+        curl \
+        busybox \
+        dumb-init \
+        jq \
+        fuse3 \
+        rsync \
+        ffmpeg \
+        nano \
+        build-essential \
    && dpkg-reconfigure --frontend noninteractive tzdata \
+    && \
+    if [ "$(uname -m)" = "x86_64" ]; \
+        then ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1; \
+    elif [ "$(uname -m)" = "aarch64" ]; \
+        then ln -s /usr/lib/aarch64-linux-musl/libc.so /lib/libc.musl-aarch64.so.1; \
+    fi \
    && curl https://rclone.org/install.sh | bash \
    && apt-get autoremove -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get clean -y \
+    && rm -rf \
+        /tmp/* \
+        /moviepilot/.cache \
+        /var/lib/apt/lists/* \
+        /var/tmp/*

-# 安装playwright依赖
-RUN playwright install-deps chromium
+# 创建虚拟环境
+RUN python3 -m venv ${VENV_PATH} \
+    && ${VENV_PATH}/bin/pip install --upgrade pip \
+    && ${VENV_PATH}/bin/pip install Cython pip-tools

+# 复制依赖文件并安装到虚拟环境
+COPY ../requirements.in requirements.in
+RUN ${VENV_PATH}/bin/pip-compile requirements.in \
+    && ${VENV_PATH}/bin/pip install -r requirements.txt \
+    && ${VENV_PATH}/bin/playwright install-deps chromium \
+    && apt-get remove -y build-essential \
+    && apt-get autoremove -y \
+    && apt-get clean -y \
+    && rm -rf \
+        /tmp/* \
+        /moviepilot/.cache \
+        /var/lib/apt/lists/* \
+        /var/tmp/*
+
+# 复制应用代码
+COPY .. .
+
+# 配置nginx和其他文件
 RUN cp -f /app/docker/nginx.common.conf /etc/nginx/common.conf \
    && cp -f /app/docker/nginx.template.conf /etc/nginx/nginx.template.conf \
    && cp -f /app/docker/update.sh /usr/local/bin/mp_update.sh \
@@ -105,15 +78,23 @@ RUN cp -f /app/docker/nginx.common.conf /etc/nginx/common.conf \
    && cp -f /app/docker/docker_http_proxy.conf /etc/nginx/docker_http_proxy.conf \
    && chmod +x /entrypoint.sh /usr/local/bin/mp_update.sh \
    && mkdir -p ${HOME} \
-    && mkdir -p ${CONFIG_DIR} \
    && groupadd -r moviepilot -g 918 \
    && useradd -r moviepilot -g moviepilot -d ${HOME} -s /bin/bash -u 918 \
-    && chown -R moviepilot:moviepilot /app ${VENV_PATH} /public ${HOME} ${CONFIG_DIR} \
    && python_ver=$(python3 -V | awk '{print $2}') \
    && echo "/app/" > ${VENV_PATH}/lib/python${python_ver%.*}/site-packages/app.pth \
    && echo 'fs.inotify.max_user_watches=5242880' >> /etc/sysctl.conf \
    && echo 'fs.inotify.max_user_instances=5242880' >> /etc/sysctl.conf \
-    && locale-gen zh_CN.UTF-8
+    && locale-gen zh_CN.UTF-8 \
+    && FRONTEND_VERSION=$(sed -n "s/^FRONTEND_VERSION\s*=\s*'\([^']*\)'/\1/p" /app/version.py) \
+    && curl -sL "https://github.com/jxxghp/MoviePilot-Frontend/releases/download/${FRONTEND_VERSION}/dist.zip" | busybox unzip -d / - \
+    && mv /dist /public \
+    && curl -sL "https://github.com/jxxghp/MoviePilot-Plugins/archive/refs/heads/main.zip" | busybox unzip -d /tmp - \
+    && mv -f /tmp/MoviePilot-Plugins-main/plugins.v2/* /app/app/plugins/ \
+    && cat /tmp/MoviePilot-Plugins-main/package.json | jq -r 'to_entries[] | select(.value.v2 == true) | .key' | awk '{print tolower($0)}' | \
+        while read -r i; do if [ ! -d "/app/app/plugins/$i" ]; then mv "/tmp/MoviePilot-Plugins-main/plugins/$i" "/app/app/plugins/"; else echo "跳过 $i"; fi; done \
+    && curl -sL "https://github.com/jxxghp/MoviePilot-Resources/archive/refs/heads/main.zip" | busybox unzip -d /tmp - \
+    && mv -f /tmp/MoviePilot-Resources-main/resources.v2/* /app/app/helper/ \
+    && rm -rf /tmp/*

 EXPOSE 3000
 VOLUME [ "${CONFIG_DIR}" ]