diff --git a/README.md b/README.md index db0e849..446db6d 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ These services require building custom Docker images from source. | [goose](./builds/goose) | 1.18.0 | | [IOPaint](./builds/io-paint) | 1.6.0 | | [K3s inside DinD](./builds/k3s-inside-dind) | 0.2.2 | -| [MinerU vLLM](./builds/mineru) | 2.7.6 | +| [MinerU vLLM](./builds/mineru) | 3.0.1 | | [OpenFang](./builds/openfang) | 0.1.0 | | [Paperclip](./builds/paperclip) | main | diff --git a/README.zh.md b/README.zh.md index b595d76..a781610 100644 --- a/README.zh.md +++ b/README.zh.md @@ -15,7 +15,7 @@ Compose Anything 通过提供一组高质量的 Docker Compose 配置文件， | [goose](./builds/goose) | 1.18.0 | | [IOPaint](./builds/io-paint) | 1.6.0 | | [K3s inside DinD](./builds/k3s-inside-dind) | 0.2.2 | -| [MinerU vLLM](./builds/mineru) | 2.7.6 | +| [MinerU vLLM](./builds/mineru) | 3.0.1 | | [OpenFang](./builds/openfang) | 0.1.0 | | [Paperclip](./builds/paperclip) | main | diff --git a/builds/mineru/.env.example b/builds/mineru/.env.example index 35a0fed..eb1165d 100644 --- a/builds/mineru/.env.example +++ b/builds/mineru/.env.example @@ -1,5 +1,5 @@ # MinerU Docker image -MINERU_VERSION=2.7.6 +MINERU_VERSION=3.0.1 # Port configurations MINERU_PORT_OVERRIDE_VLLM=30000 diff --git a/builds/mineru/Dockerfile b/builds/mineru/Dockerfile index 5cbd953..d728511 100644 --- a/builds/mineru/Dockerfile +++ b/builds/mineru/Dockerfile @@ -1,10 +1,7 @@ -# Use the official vllm image for gpu with Ampere、Ada Lovelace、Hopper architecture (8.0 <= Compute Capability <= 9.0) +# Use DaoCloud mirrored vllm image for China region for gpu with Volta、Turing、Ampere、Ada Lovelace、Hopper、Blackwell architecture (7.0 <= Compute Capability <= 12.0) # Compute Capability version query (https://developer.nvidia.com/cuda-gpus) -FROM vllm/vllm-openai:v0.10.2 - -# Use the official vllm image for gpu with Volta、Turing、Blackwell architecture (7.0 < Compute Capability < 8.0 or Compute Capability >= 10.0) # support x86_64 architecture and ARM(AArch64) architecture -# FROM vllm/vllm-openai:v0.11.0 +FROM docker.m.daocloud.io/vllm/vllm-openai:v0.11.2 # Install libgl for opencv support & Noto fonts for Chinese characters RUN apt-get update && \ @@ -18,11 +15,11 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # Install mineru latest -RUN python3 -m pip install -U 'mineru[core]>=2.7.6' --break-system-packages && \ +RUN python3 -m pip install -U 'mineru[core]>=3.0.0' -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 huggingface -m all" +RUN /bin/bash -c "mineru-models-download -s modelscope -m all" # Set the entry point to activate the virtual environment and run the command line tool ENTRYPOINT ["/bin/bash", "-c", "export MINERU_MODEL_SOURCE=local && exec \"$@\"", "--"] diff --git a/builds/mineru/README.md b/builds/mineru/README.md index c2ae367..822214b 100644 --- a/builds/mineru/README.md +++ b/builds/mineru/README.md @@ -39,7 +39,7 @@ mineru -p demo.pdf -o ./output -b vlm-http-client -u http://localhost:30000 ## Configuration -- `MINERU_VERSION`: The version for MinerU, default is `2.7.6`. +- `MINERU_VERSION`: The version for MinerU, default is `3.0.1`. - `MINERU_PORT_OVERRIDE_VLLM`: The host port for the VLLM server, default is `30000`. - `MINERU_PORT_OVERRIDE_API`: The host port for the API service, default is `8000`. - `MINERU_PORT_OVERRIDE_GRADIO`: The host port for the Gradio WebUI, default is `7860`. diff --git a/builds/mineru/README.zh.md b/builds/mineru/README.zh.md index 3e0bbd4..fd7918d 100644 --- a/builds/mineru/README.zh.md +++ b/builds/mineru/README.zh.md @@ -39,7 +39,7 @@ mineru -p demo.pdf -o ./output -b vlm-http-client -u http://localhost:30000 ## 配置 -- `MINERU_VERSION`: MinerU 的 Docker 镜像版本，默认为 `2.7.6`。 +- `MINERU_VERSION`: MinerU 的 Docker 镜像版本，默认为 `3.0.1`。 - `MINERU_PORT_OVERRIDE_VLLM`: VLLM 服务器的主机端口，默认为 `30000`。 - `MINERU_PORT_OVERRIDE_API`: API 服务的主机端口，默认为 `8000`。 - `MINERU_PORT_OVERRIDE_GRADIO`: Gradio WebUI 的主机端口，默认为 `7860`。 diff --git a/builds/mineru/china.Dockerfile b/builds/mineru/china.Dockerfile index c00db1c..db0ff31 100644 --- a/builds/mineru/china.Dockerfile +++ b/builds/mineru/china.Dockerfile @@ -1,10 +1,7 @@ -# Use DaoCloud mirrored vllm image for China region for gpu with Ampere、Ada Lovelace、Hopper architecture (8.0 <= Compute Capability <= 9.0) +# Use DaoCloud mirrored vllm image for China region for gpu with Volta、Turing、Ampere、Ada Lovelace、Hopper、Blackwell architecture (7.0 <= Compute Capability <= 12.0) # Compute Capability version query (https://developer.nvidia.com/cuda-gpus) -FROM docker.m.daocloud.io/vllm/vllm-openai:v0.10.2 - -# Use DaoCloud mirrored vllm image for China region for gpu with Volta、Turing、Blackwell architecture (7.0 < Compute Capability < 8.0 or Compute Capability >= 10.0) # support x86_64 architecture and ARM(AArch64) architecture -# FROM docker.m.daocloud.io/vllm/vllm-openai:v0.11.0 +FROM docker.m.daocloud.io/vllm/vllm-openai:v0.11.2 # Install libgl for opencv support & Noto fonts for Chinese characters RUN apt-get update && \ @@ -18,7 +15,7 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # Install mineru latest -RUN python3 -m pip install -U 'mineru[core]>=2.7.0' -i https://mirrors.aliyun.com/pypi/simple --break-system-packages && \ +RUN python3 -m pip install -U 'mineru[core]>=3.0.0' -i https://mirrors.aliyun.com/pypi/simple --break-system-packages && \ python3 -m pip cache purge # Download models and update the configuration file diff --git a/builds/mineru/corex.Dockerfile b/builds/mineru/corex.Dockerfile index 8b88fe5..34a7d12 100644 --- a/builds/mineru/corex.Dockerfile +++ b/builds/mineru/corex.Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update && \ # Install mineru latest RUN python3 -m pip install -U pip -i https://mirrors.aliyun.com/pypi/simple && \ - python3 -m pip install 'mineru[core]>=2.7.4' \ + python3 -m pip install 'mineru[core]>=3.0.0' \ numpy==1.26.4 \ opencv-python==4.11.0.86 \ -i https://mirrors.aliyun.com/pypi/simple && \ diff --git a/builds/mineru/dcu.Dockerfile b/builds/mineru/dcu.Dockerfile index 85fe692..2c67da1 100644 --- a/builds/mineru/dcu.Dockerfile +++ b/builds/mineru/dcu.Dockerfile @@ -14,10 +14,7 @@ RUN apt-get update && \ # Install mineru latest RUN python3 -m pip install -U pip -i https://mirrors.aliyun.com/pypi/simple && \ - python3 -m pip install mineru[api,gradio] \ - "matplotlib>=3.10,<4" \ - "ultralytics>=8.3.48,<9" \ - "doclayout_yolo==0.0.4" \ + python3 -m pip install "mineru[gradio]>=3.0.0" \ "ftfy>=6.3.1,<7" \ "shapely>=2.0.7,<3" \ "pyclipper>=1.3.0,<2" \ diff --git a/builds/mineru/docker-compose.yaml b/builds/mineru/docker-compose.yaml index c0616a2..ff2050e 100644 --- a/builds/mineru/docker-compose.yaml +++ b/builds/mineru/docker-compose.yaml @@ -8,7 +8,7 @@ x-defaults: &defaults x-mineru-vllm: &mineru-vllm <<: *defaults - image: ${GLOBAL_REGISTRY:-}alexsuntop/mineru:${MINERU_VERSION:-2.7.6} + image: ${GLOBAL_REGISTRY:-}alexsuntop/mineru:${MINERU_VERSION:-3.0.1} build: context: . dockerfile: ${MINERU_DOCKERFILE_PATH:-Dockerfile} diff --git a/builds/mineru/gcu.Dockerfile b/builds/mineru/gcu.Dockerfile index f2216bc..41dc275 100644 --- a/builds/mineru/gcu.Dockerfile +++ b/builds/mineru/gcu.Dockerfile @@ -17,7 +17,7 @@ RUN echo 'deb http://mirrors.aliyun.com/ubuntu/ noble main restricted universe m rm -rf /var/lib/apt/lists/* /tmp/aliyun-sources.list # Install mineru latest -RUN python3 -m pip install "mineru[core]>=2.7.2" \ +RUN python3 -m pip install "mineru[core]>=3.0.0" \ numpy==1.26.4 \ opencv-python==4.11.0.86 \ -i https://mirrors.aliyun.com/pypi/simple && \ diff --git a/builds/mineru/kxpu.Dockerfile b/builds/mineru/kxpu.Dockerfile index abbccee..f10178c 100644 --- a/builds/mineru/kxpu.Dockerfile +++ b/builds/mineru/kxpu.Dockerfile @@ -14,10 +14,7 @@ RUN apt-get update && \ # Install mineru latest RUN python3 -m pip install -U pip -i https://mirrors.aliyun.com/pypi/simple && \ - python3 -m pip install "mineru[api,gradio]>=2.7.6" \ - "matplotlib>=3.10,<4" \ - "ultralytics>=8.3.48,<9" \ - "doclayout_yolo==0.0.4" \ + python3 -m pip install "mineru[gradio]>=3.0.0" \ "ftfy>=6.3.1,<7" \ "shapely>=2.0.7,<3" \ "pyclipper>=1.3.0,<2" \ diff --git a/builds/mineru/maca.Dockerfile b/builds/mineru/maca.Dockerfile index 0bbd81a..137eca1 100644 --- a/builds/mineru/maca.Dockerfile +++ b/builds/mineru/maca.Dockerfile @@ -21,7 +21,7 @@ RUN sed -i '3s/^Version: 0.15.1+metax3\.1\.0\.4$/Version: 0.21.0+metax3.1.0.4/' # Install mineru latest RUN /opt/conda/bin/python3 -m pip install -U pip -i https://mirrors.aliyun.com/pypi/simple && \ - /opt/conda/bin/python3 -m pip install 'mineru[core]>=2.6.5' \ + /opt/conda/bin/python3 -m pip install 'mineru[core]>=3.0.0' \ numpy==1.26.4 \ opencv-python==4.11.0.86 \ -i https://mirrors.aliyun.com/pypi/simple && \ diff --git a/builds/mineru/mlu.Dockerfile b/builds/mineru/mlu.Dockerfile index 51c3f59..1a172de 100644 --- a/builds/mineru/mlu.Dockerfile +++ b/builds/mineru/mlu.Dockerfile @@ -1,6 +1,6 @@ # 基础镜像配置 vLLM 或 LMDeploy ，请根据实际需要选择其中一个，要求 amd64(x86-64) CPU + Cambricon MLU. # Base image containing the LMDEPLOY inference environment, requiring amd64(x86-64) CPU + Cambricon MLU. -FROM crpi-4crprmm5baj1v8iv.cn-hangzhou.personal.cr.aliyuncs.com/lmdeploy_dlinfer/camb:qwen2.5_vl +FROM crpi-4crprmm5baj1v8iv.cn-hangzhou.personal.cr.aliyuncs.com/lmdeploy_dlinfer/camb:mineru25 ARG BACKEND=lmdeploy # Base image containing the vLLM inference environment, requiring amd64(x86-64) CPU + Cambricon MLU. # FROM crpi-vofi3w62lkohhxsp.cn-shanghai.personal.cr.aliyuncs.com/opendatalab-mineru/mlu:vllm0.8.3-torch2.6.0-torchmlu1.26.1-ubuntu22.04-py310 @@ -22,7 +22,7 @@ RUN /bin/bash -c '\ source /torch/venv3/pytorch_infer/bin/activate; \ fi && \ python3 -m pip install -U pip -i https://mirrors.aliyun.com/pypi/simple && \ - python3 -m pip install "mineru[core]>=2.7.4" \ + python3 -m pip install "mineru[core]>=3.0.0" \ numpy==1.26.4 \ opencv-python==4.11.0.86 \ -i https://mirrors.aliyun.com/pypi/simple && \ diff --git a/builds/mineru/musa.Dockerfile b/builds/mineru/musa.Dockerfile index aad10be..4d12de6 100644 --- a/builds/mineru/musa.Dockerfile +++ b/builds/mineru/musa.Dockerfile @@ -18,10 +18,7 @@ RUN python3 -m pip install -U pip -i https://mirrors.aliyun.com/pypi/simple && \ git clone https://gitcode.com/gh_mirrors/vi/vision.git -b v0.20.0 --depth 1 && \ cd vision && \ python3 setup.py install && \ - python3 -m pip install "mineru[api,gradio]>=2.7.2" \ - "matplotlib>=3.10,<4" \ - "ultralytics>=8.3.48,<9" \ - "doclayout_yolo==0.0.4" \ + python3 -m pip install "mineru[gradio]>=3.0.0" \ "ftfy>=6.3.1,<7" \ "shapely>=2.0.7,<3" \ "pyclipper>=1.3.0,<2" \ diff --git a/builds/mineru/npu.Dockerfile b/builds/mineru/npu.Dockerfile index 5759331..9b4ce26 100644 --- a/builds/mineru/npu.Dockerfile +++ b/builds/mineru/npu.Dockerfile @@ -19,7 +19,7 @@ RUN apt-get update && \ # Install mineru latest RUN python3 -m pip install -U pip -i https://mirrors.aliyun.com/pypi/simple && \ - python3 -m pip install 'mineru[core]>=2.6.5' \ + python3 -m pip install 'mineru[core]>=3.0.0' \ numpy==1.26.4 \ opencv-python==4.11.0.86 \ -i https://mirrors.aliyun.com/pypi/simple && \ diff --git a/builds/mineru/ppu.Dockerfile b/builds/mineru/ppu.Dockerfile index d344d59..32e6570 100644 --- a/builds/mineru/ppu.Dockerfile +++ b/builds/mineru/ppu.Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ # Install mineru latest RUN python3 -m pip install -U pip -i https://mirrors.aliyun.com/pypi/simple && \ - python3 -m pip install 'mineru[core]>=2.6.5' \ + python3 -m pip install 'mineru[core]>=3.0.0' \ numpy==1.26.4 \ opencv-python==4.11.0.86 \ -i https://mirrors.aliyun.com/pypi/simple && \