更新dockerfile文件

2025-04-12 20:30:57 +08:00 · 2024-11-03 20:51:07 +08:00 · 2024-11-03 20:51:07 +08:00 · ccdd34c548
commit ccdd34c548
parent 4951fe711c
3 changed files with 108 additions and 83 deletions
--- a/72
+++ b/72
@ -1,24 +1,60 @@
-FROM python:3.7-alpine
-LABEL maintainer="www.mrdoc.fun"
+# Stage 1: Build stage
+FROM python:3.11-alpine3.19 AS builder
+
+LABEL maintainer="mrdoc.pro"
+
+# 设置 Python 环境变量
 ENV PYTHONUNBUFFERED=0 \
    TZ=Asia/Shanghai \
-    LISTEN_PORT=10086\
-    USER=admin
-COPY . /app/MrDoc/
+    PIP_NO_PROXY='*'

+# 替换 alpine 软件仓库的源并安装编译依赖
+RUN set -x \
+    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories \
+    && apk add --no-cache --virtual .build-deps build-base g++ gcc libxslt-dev py3-lxml openldap-dev python3-dev linux-headers \
+    && apk add --no-cache git tzdata zlib-dev freetype-dev jpeg-dev mariadb-dev postgresql-dev
+
+# 设置工作目录并复制依赖文件
+WORKDIR /app/MrDoc
+COPY requirements.txt /app/MrDoc/
+
+# 升级 pip 并安装 Python 依赖
+RUN python -m pip install --upgrade pip -i https://pypi.tuna.tsinghua.edu.cn/simple/ --trusted-host pypi.tuna.tsinghua.edu.cn \
+    && pip install --no-cache-dir -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple/ --trusted-host pypi.tuna.tsinghua.edu.cn \
+    && pip install --no-cache-dir uwsgi -i https://pypi.tuna.tsinghua.edu.cn/simple/ --trusted-host pypi.tuna.tsinghua.edu.cn
+
+# Stage 2: Final stage
+FROM python:3.11-alpine3.19
+
+# 设置时区和基本环境变量
+ENV PYTHONUNBUFFERED=0 \
+    TZ=Asia/Shanghai \
+    LISTEN_PORT=10086 \
+    USER=admin \
+    PIP_NO_PROXY='*'
+
+# 替换 alpine 软件仓库的源并安装运行时依赖
+RUN set -x \
+    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories \
+    && apk add --no-cache tzdata chromium chromium-chromedriver libreoffice libreoffice-base libreoffice-lang-zh_cn ttf-dejavu fontconfig libmagic libffi-dev \
+    && ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo "Asia/Shanghai" > /etc/timezone
+
+# 复制字体文件
+COPY SourceHanSerifCN-Medium.otf /usr/share/fonts/sourcehan/SourceHanSerifCN-Medium.otf
+
+# 从构建阶段复制已安装的 Python 依赖
+COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
+COPY --from=builder /usr/local/bin /usr/local/bin
+
+# 复制应用代码
+COPY . /app/MrDoc/
 WORKDIR /app/MrDoc

-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
-RUN  set -x \
-    && apk add --no-cache --virtual .build-deps build-base g++ gcc libxslt-dev python3-dev linux-headers \
-    && apk add --no-cache pwgen git tzdata zlib-dev freetype-dev jpeg-dev  mariadb-dev postgresql-dev \
-    && pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple \
-    && python -m pip install --upgrade pip \
-    && pip --no-cache-dir install -r requirements.txt \
-    && pip --no-cache-dir install mysqlclient \
-    && pip --no-cache-dir install uwsgi \
-    && chmod +x docker_mrdoc.sh \
-    && apk del .build-deps \
-    && rm -rf /var/cache/apk/* 
+# 启动脚本权限
+RUN chmod +x docker_mrdoc.sh

-ENTRYPOINT ["./docker_mrdoc.sh"]
+# 暴露端口
+EXPOSE 10086
+
+# 容器启动命令
+ENTRYPOINT ["sh", "docker_mrdoc.sh"]
--- a/70
+++ b/70
@ -1,23 +1,61 @@
-FROM harbor.loongnix.cn/mirrorloongsoncontainers/python:3.8.12-alpine3.11
-LABEL maintainer="www.mrdoc.fun"
+# Stage 1: Build stage
+FROM harbor.loongnix.cn/mirrorloongsoncontainers/python:3.11-alpine3.19 AS builder
+
+LABEL maintainer="mrdoc.pro"
+
+# 设置 Python 环境变量
 ENV PYTHONUNBUFFERED=0 \
    TZ=Asia/Shanghai \
-    LISTEN_PORT=10086\
-    USER=admin
-COPY . /app/MrDoc/
+    PIP_NO_PROXY='*'

+# 替换 alpine 软件仓库的源并安装编译依赖
+RUN set -x \
+    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories \
+    && apk add --no-cache --virtual .build-deps build-base g++ gcc libxslt-dev py3-lxml openldap-dev python3-dev linux-headers \
+    && apk add --no-cache git tzdata zlib-dev freetype-dev jpeg-dev mariadb-dev postgresql-dev
+
+# 设置工作目录并复制依赖文件
+WORKDIR /app/MrDoc
+COPY requirements.txt /app/MrDoc/
+
+# 升级 pip 并安装 Python 依赖
+RUN python -m pip install --upgrade pip -i https://pypi.tuna.tsinghua.edu.cn/simple/ --trusted-host pypi.tuna.tsinghua.edu.cn \
+    && pip install --no-cache-dir -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple/ --trusted-host pypi.tuna.tsinghua.edu.cn \
+    && pip install --no-cache-dir uwsgi -i https://pypi.tuna.tsinghua.edu.cn/simple/ --trusted-host pypi.tuna.tsinghua.edu.cn
+
+# Stage 2: Final stage
+FROM harbor.loongnix.cn/mirrorloongsoncontainers/python:3.11-alpine3.19
+
+# 设置时区和基本环境变量
+ENV PYTHONUNBUFFERED=0 \
+    TZ=Asia/Shanghai \
+    LISTEN_PORT=10086 \
+    USER=admin \
+    PIP_NO_PROXY='*'
+
+# 替换 alpine 软件仓库的源并安装运行时依赖
+RUN set -x \
+    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories \
+    && apk add --no-cache tzdata chromium chromium-chromedriver libreoffice libreoffice-base libreoffice-lang-zh_cn ttf-dejavu fontconfig libmagic libffi-dev \
+    && ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo "Asia/Shanghai" > /etc/timezone
+
+# 复制字体文件
+COPY SourceHanSerifCN-Medium.otf /usr/share/fonts/sourcehan/SourceHanSerifCN-Medium.otf
+
+# 从构建阶段复制已安装的 Python 依赖
+COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
+COPY --from=builder /usr/local/bin /usr/local/bin
+
+# 复制应用代码
+COPY . /app/MrDoc/
 WORKDIR /app/MrDoc

-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+# 启动脚本权限
+RUN chmod +x docker_mrdoc.sh

-RUN  set -x \
-    && apk add --no-cache --virtual .build-deps build-base g++ gcc libxslt-dev python2-dev linux-headers \
-    && apk add --no-cache pwgen git tzdata zlib-dev freetype-dev jpeg-dev  mariadb-dev postgresql-dev libxml2-dev \
-    && python -m pip install --upgrade pip \
-    && pip --no-cache-dir install -r requirements.txt \
-    && pip --no-cache-dir install mysqlclient uwsgi \
-    && chmod +x docker_mrdoc.sh \
-    && apk del .build-deps \
-    && rm -rf /var/cache/apk/* 
+# 暴露端口
+EXPOSE 10086
+
+# 容器启动命令
+ENTRYPOINT ["sh", "docker_mrdoc.sh"]

-ENTRYPOINT ["./docker_mrdoc.sh"]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,49 +0,0 @@
-version: "3"
-services:
-  mrdoc:
-    image: jonnyan404/mrdoc-nginx:0.6.6-with-mysql
-    container_name: mrdoc-mysql
-    restart: always
-    volumes:
-      - /path/to/you/dir/config:/app/MrDoc/config  # 请注意修改 /path/to/you/dir 为您要存储mrdoc数据的绝对路径.
-      - /path/to/you/dir/media:/app/MrDoc/media    # 同上
-    environment:
-      - TZ=Asia/Shanghai
-###### 以下注释项为可选变量
-#      - LISTEN_PORT=10086   # 自定义端口
-#      - CREATE_USER=1       # 0 不创建管理员用户, 1 创建管理员用户,默认是1
-#      - USER=jonnyan404     # 自定义管理员用户名
-#      - MM=1                # 自定义管理员密码
-###### 如果默认用户密码,以及变量添加用户密码无法登录,请参考:https://www.mrdoc.fun/project-1/doc-242/
-    ports:
-      - "10086:10086"
-    depends_on:
-      - mysql
-
-  mysql:
-    image: mysql:5.7
-    container_name: mysql-with-mrdoc    # 这里名字不要修改,否则无法连接数据库.如果修改,请注意自行更改mrdoc的配置文件.
-    restart: always
-    volumes:
-      - /path/to/you/dir:/var/lib/mysql # 请注意修改 /path/to/you/dir 为您要存储mysql数据的目录绝对路径.
-    environment:
-      - TZ=Asia/Shanghai
-      - MYSQL_ROOT_PASSWORD=Jonnyan404!
-      - MYSQL_DATABASE=mrdoc
-      - MYSQL_USER=jonnyan404
-      - MYSQL_PASSWORD=www.mrdoc.fun
-    expose:
-      - "3306"
-    ports:
-      - "63306:3306"  # 如果不需要外部连接mysql,可注释此行+上一行.
-    command:
-      - "--character-set-server=utf8mb4"
-      - "--collation-server=utf8mb4_unicode_ci"
-
-
-# Volumes for persisting data, see https://docs.docker.com/engine/admin/volumes/volumes/
-#volumes:
-#  mrdoc-data:
-#    driver: local
-#  mysql-data:
-#    driver: local