Эх сурвалжийг харах

Merge pull request #3095 from myhloli/dev

fix: improve Dockerfile by adding fontconfig and purging pip cache
Xiaomeng Zhao 4 сар өмнө
parent
commit
886b2dbd20

+ 8 - 4
docker/china/Dockerfile

@@ -3,14 +3,18 @@ FROM lmsysorg/sglang:v0.4.8.post1-cu126
 
 # Install libgl for opencv support & Noto fonts for Chinese characters
 RUN apt-get update && \
-    apt-get install -y fonts-noto-core fonts-noto-cjk && \
-    apt-get install -y libgl1 && \
-    apt-get clean && \
+    apt-get install -y \
+        fonts-noto-core \
+        fonts-noto-cjk \
+        fontconfig \
+        libgl1 && \
     fc-cache -fv && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
 # Install mineru latest
-RUN python3 -m pip install -U 'mineru[core]' -i https://mirrors.aliyun.com/pypi/simple --break-system-packages
+RUN python3 -m pip install -U 'mineru[core]' -i https://mirrors.aliyun.com/pypi/simple --break-system-packages && \
+    python3 -m pip cache purge
 
 # Download models and update the configuration file
 RUN /bin/bash -c "mineru-models-download -s modelscope -m all"

+ 9 - 5
docker/global/Dockerfile

@@ -1,16 +1,20 @@
 # Use the official sglang image
 FROM lmsysorg/sglang:v0.4.8.post1-cu126
 
-# Install libgl for opencv support
+# Install libgl for opencv support & Noto fonts for Chinese characters
 RUN apt-get update && \
-    apt-get install -y fonts-noto-core fonts-noto-cjk && \
-    apt-get install -y libgl1 && \
-    apt-get clean && \
+    apt-get install -y \
+        fonts-noto-core \
+        fonts-noto-cjk \
+        fontconfig \
+        libgl1 && \
     fc-cache -fv && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
 # Install mineru latest
-RUN python3 -m pip install -U 'mineru[core]' --break-system-packages
+RUN python3 -m pip install -U 'mineru[core]' --break-system-packages && \
+    python3 -m pip cache purge
 
 # Download models and update the configuration file
 RUN /bin/bash -c "mineru-models-download -s huggingface -m all"