Update Dockerfile

Dockerfile

@@ -1,40 +1,62 @@
 FROM ubuntu:22.04
 
-RUN apt update && apt install -y python3-pip fonts-noto-cjk fonts-noto-color-emoji git fontconfig
-
-RUN git clone --branch v0.0.20 --depth 1 https://github.com/MeetWq/meme-generator.git && mkdir /usr/share/fonts/meme && mv meme-generator/resources/fonts/* /usr/share/fonts/meme
-
-RUN fc-cache -fv
-
-RUN rm -rf meme-generator
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y \
+    python3 \
+    python3-pip \
+    python3-venv \
+    git \
+    fontconfig \
+    fonts-noto-cjk \
+    fonts-noto-color-emoji \
+    libfontconfig1 \
+    libgl1-mesa-glx \
+    libgl1-mesa-egl \
+    libgl1-mesa-dri \
+    libegl1 \
+    libegl-mesa0 \
+ && rm -rf /var/lib/apt/lists/*
+
+# 先取一份固定版本，用来复制内置字体
+RUN git clone --branch v0.1.14 --depth 1 https://github.com/MeetWq/meme-generator.git /tmp/meme-generator \
+    && mkdir -p /usr/share/fonts/meme \
+    && cp /tmp/meme-generator/resources/fonts/* /usr/share/fonts/meme/ \
+    && fc-cache -fv \
+    && rm -rf /tmp/meme-generator
 
 RUN useradd -m -u 1000 user
 USER user
-ENV HOME=/home/user \
-	PATH=/home/user/.local/bin:$PATH
+
+ENV HOME=/home/user
+ENV PATH=$HOME/.local/bin:$PATH
+ENV POETRY_CONFIG_DIR=$HOME/app/.poetry_config
 
 WORKDIR $HOME/app
 
 COPY --chown=user . $HOME/app
 
-RUN git clone https://github.com/MeetWq/meme-generator.git
-
-ENV POETRY_CONFIG_DIR=$HOME/app/.poetry_config
-
-RUN pip install poetry
-
-RUN git clone https://github.com/MeetWq/meme-generator-contrib  && mkdir $HOME/meme-extend && mv meme-generator-contrib/memes/* $HOME/meme-extend
+# 这里也锁同一个版本，避免前后版本不一致
+RUN git clone --branch v0.1.14 --depth 1 https://github.com/MeetWq/meme-generator.git
 
-ADD config.toml $HOME/.config/meme_generator/config.toml
+RUN pip install --no-cache-dir poetry
 
-RUN cd meme-generator && poetry config virtualenvs.in-project true && poetry install && . .venv/bin/activate && python3 -m meme_generator.download && cd ..
+RUN git clone --depth 1 https://github.com/MeetWq/meme-generator-contrib.git \
+    && mkdir -p $HOME/meme-extend \
+    && mv meme-generator-contrib/memes/* $HOME/meme-extend \
+    && rm -rf meme-generator-contrib
 
-RUN rm -rf meme-generator-contrib && rm -rf $HOME/meme-generator
+RUN mkdir -p $HOME/.config/meme_generator
+COPY --chown=user config.toml $HOME/.config/meme_generator/config.toml
 
-ADD utils.py meme-generator/meme_generator
+# 你的自定义覆盖
+COPY --chown=user utils.py $HOME/app/meme-generator/meme_generator/
+COPY --chown=user dianzhongdian/__init__.py $HOME/app/meme-generator/meme_generator/memes/dianzhongdian/
 
-ADD dianzhongdian/__init__.py meme-generator/meme_generator/memes/dianzhongdian/
-# 如果有自己扩展包
-# ADD extends/ /meme-extend
+RUN cd meme-generator \
+    && poetry config virtualenvs.in-project true \
+    && poetry install \
+    && . .venv/bin/activate \
+    && python3 -m meme_generator.download
 
-CMD cd meme-generator && . .venv/bin/activate && python3 -m meme_generator.app
+CMD cd meme-generator && . .venv/bin/activate && python3 -m meme_generator.app