From 1c33225b70f2230d455cf11226c3ace17d336bdb Mon Sep 17 00:00:00 2001 From: Sun-ZhenXing <1006925066@qq.com> Date: Wed, 31 Dec 2025 11:07:40 +0800 Subject: [PATCH] chore: update versions --- README.md | 4 +-- README.zh.md | 4 +-- builds/mineru/docker-compose.yaml | 33 ++++++++++++++----- src/milvus-standalone-embed/.env.example | 4 +-- src/milvus-standalone-embed/README.md | 4 +-- src/milvus-standalone-embed/README.zh.md | 4 +-- .../docker-compose.yaml | 13 ++++++-- src/milvus-standalone/.env.example | 8 ++--- src/milvus-standalone/README.md | 10 +++--- src/milvus-standalone/README.zh.md | 10 +++--- src/milvus-standalone/docker-compose.yaml | 5 +-- src/pulsar/docker-compose.yaml | 2 ++ 12 files changed, 65 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 2c6e147..bbdadf0 100644 --- a/README.md +++ b/README.md @@ -55,8 +55,8 @@ Compose Anything helps users quickly deploy various services by providing a set | [LiteLLM](./src/litellm) | main-stable | | [Logstash](./src/logstash) | 8.16.1 | | [MariaDB Galera Cluster](./src/mariadb-galera) | 11.7.2 | -| [Milvus Standalone Embed](./src/milvus-standalone-embed) | 2.6.2 | -| [Milvus Standalone](./src/milvus-standalone) | 2.6.2 | +| [Milvus Standalone Embed](./src/milvus-standalone-embed) | v2.6.7 | +| [Milvus Standalone](./src/milvus-standalone) | v2.6.7 | | [Minecraft Bedrock Server](./src/minecraft-bedrock-server) | latest | | [MinerU SGLang](./src/mineru-sglang) | 2.2.2 | | [MinerU vLLM](./builds/mineru-vllm) | 2.6.4 | diff --git a/README.zh.md b/README.zh.md index 91f1543..bcacdde 100644 --- a/README.zh.md +++ b/README.zh.md @@ -55,8 +55,8 @@ Compose Anything 通过提供一组高质量的 Docker Compose 配置文件, | [LiteLLM](./src/litellm) | main-stable | | [Logstash](./src/logstash) | 8.16.1 | | [MariaDB Galera 集群](./src/mariadb-galera) | 11.7.2 | -| [Milvus Standalone Embed](./src/milvus-standalone-embed) | 2.6.2 | -| [Milvus Standalone](./src/milvus-standalone) | 2.6.2 | +| [Milvus Standalone Embed](./src/milvus-standalone-embed) | v2.6.7 | +| [Milvus Standalone](./src/milvus-standalone) | v2.6.7 | | [Minecraft Bedrock Server](./src/minecraft-bedrock-server) | latest | | [MinerU SGLang](./src/mineru-sglang) | 2.2.2 | | [MinerU vLLM](./builds/mineru-vllm) | 2.6.4 | diff --git a/builds/mineru/docker-compose.yaml b/builds/mineru/docker-compose.yaml index dea5c6f..8ec8fba 100644 --- a/builds/mineru/docker-compose.yaml +++ b/builds/mineru/docker-compose.yaml @@ -22,20 +22,22 @@ x-mineru-vllm: &mineru-vllm deploy: resources: limits: - cpus: '16.0' + cpus: "16.0" memory: 32G reservations: - cpus: '8.0' + cpus: "8.0" memory: 16G devices: - driver: nvidia - device_ids: [ '0' ] - capabilities: [ gpu ] + device_ids: ["0"] + capabilities: [gpu] services: mineru-openai-server: <<: *mineru-vllm - profiles: ["openai-server"] + profiles: + - "openai-server" + - ${COMPOSE_PROFILES:-} ports: - ${MINERU_PORT_OVERRIDE_VLLM:-30000}:30000 entrypoint: mineru-openai-server @@ -70,7 +72,6 @@ services: retries: 3 start_period: 60s - mineru-api: <<: *mineru-vllm profiles: ["api"] @@ -94,7 +95,15 @@ services: # Single GPU memory optimization # --cache-max-entry-count 0.5 # Try 0.4 or lower if VRAM insufficient healthcheck: - test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8000/health"] + test: + [ + "CMD", + "wget", + "--no-verbose", + "--tries=1", + "--spider", + "http://localhost:8000/health", + ] interval: 30s timeout: 10s retries: 3 @@ -132,7 +141,15 @@ services: # Single GPU memory optimization # --cache-max-entry-count 0.5 # Try 0.4 or lower if VRAM insufficient healthcheck: - test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:7860/"] + test: + [ + "CMD", + "wget", + "--no-verbose", + "--tries=1", + "--spider", + "http://localhost:7860/", + ] interval: 30s timeout: 10s retries: 3 diff --git a/src/milvus-standalone-embed/.env.example b/src/milvus-standalone-embed/.env.example index 66f5a77..5e1c82b 100644 --- a/src/milvus-standalone-embed/.env.example +++ b/src/milvus-standalone-embed/.env.example @@ -1,6 +1,6 @@ # Component versions -MILVUS_VERSION=v2.6.2 -ATTU_VERSION=v2.6.0 +MILVUS_VERSION=v2.6.7 +ATTU_VERSION=v2.6.4 # Milvus configuration MILVUS_PORT_OVERRIDE_HTTP=19530 diff --git a/src/milvus-standalone-embed/README.md b/src/milvus-standalone-embed/README.md index 47b8d40..148626c 100644 --- a/src/milvus-standalone-embed/README.md +++ b/src/milvus-standalone-embed/README.md @@ -23,8 +23,8 @@ docker compose --profile attu up -d ## Configuration -- `MILVUS_VERSION`: The version of the Milvus image, default is `v2.6.2`. -- `ATTU_VERSION`: The version of the Attu image, default is `v2.6.0`. +- `MILVUS_VERSION`: The version of the Milvus image, default is `v2.6.7`. +- `ATTU_VERSION`: The version of the Attu image, default is `v2.6.4`. - `MILVUS_PORT_OVERRIDE_HTTP`: The host port for the Milvus HTTP service, default is `19530`. - `MILVUS_PORT_OVERRIDE_WEBUI`: The host port for the Milvus Web UI, default is `9091`. - `MILVUS_PORT_OVERRIDE_ETCD`: The host port for the etcd service, default is `2379`. diff --git a/src/milvus-standalone-embed/README.zh.md b/src/milvus-standalone-embed/README.zh.md index 2765cb5..cc509ad 100644 --- a/src/milvus-standalone-embed/README.zh.md +++ b/src/milvus-standalone-embed/README.zh.md @@ -23,8 +23,8 @@ docker compose --profile attu up -d ## 配置 -- `MILVUS_VERSION`: Milvus 镜像的版本,默认为 `v2.6.2`。 -- `ATTU_VERSION`: Attu 镜像的版本,默认为 `v2.6.0`。 +- `MILVUS_VERSION`: Milvus 镜像的版本,默认为 `v2.6.7`。 +- `ATTU_VERSION`: Attu 镜像的版本,默认为 `v2.6.4`。 - `MILVUS_PORT_OVERRIDE_HTTP`: Milvus HTTP 服务的主机端口,默认为 `19530`。 - `MILVUS_PORT_OVERRIDE_WEBUI`: Milvus Web UI 的主机端口,默认为 `9091`。 - `MILVUS_PORT_OVERRIDE_ETCD`: etcd 服务的主机端口,默认为 `2379`。 diff --git a/src/milvus-standalone-embed/docker-compose.yaml b/src/milvus-standalone-embed/docker-compose.yaml index e8dc08f..ab04032 100644 --- a/src/milvus-standalone-embed/docker-compose.yaml +++ b/src/milvus-standalone-embed/docker-compose.yaml @@ -9,7 +9,7 @@ x-defaults: &defaults services: milvus-standalone-embed: <<: *defaults - image: ${GLOBAL_REGISTRY:-}milvusdb/milvus:${MILVUS_VERSION:-v2.6.3} + image: ${GLOBAL_REGISTRY:-}milvusdb/milvus:${MILVUS_VERSION:-v2.6.7} security_opt: - seccomp:unconfined environment: @@ -45,7 +45,7 @@ services: attu: <<: *defaults - image: ${GLOBAL_REGISTRY:-}zilliz/attu:${ATTU_VERSION:-v2.6.1} + image: ${GLOBAL_REGISTRY:-}zilliz/attu:${ATTU_VERSION:-v2.6.4} profiles: - attu environment: @@ -53,6 +53,9 @@ services: MILVUS_URL: ${MILVUS_URL:-milvus-standalone-embed:19530} ports: - "${ATTU_OVERRIDE_PORT:-8000}:3000" + depends_on: + milvus-standalone-embed: + condition: service_healthy deploy: resources: limits: @@ -61,6 +64,12 @@ services: reservations: cpus: ${ATTU_CPU_RESERVATION:-0.1} memory: ${ATTU_MEMORY_RESERVATION:-128M} + healthcheck: + test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:3000/"] + interval: 30s + timeout: 10s + retries: 3 + start_period: 10s volumes: diff --git a/src/milvus-standalone/.env.example b/src/milvus-standalone/.env.example index a8ecc25..1584b47 100644 --- a/src/milvus-standalone/.env.example +++ b/src/milvus-standalone/.env.example @@ -1,12 +1,12 @@ # Component versions ETCD_VERSION=v3.5.18 MINIO_VERSION=RELEASE.2024-12-18T13-15-44Z -MILVUS_VERSION=v2.6.2 -ATTU_VERSION=v2.6.0 +MILVUS_VERSION=v2.6.7 +ATTU_VERSION=v2.6.4 # MinIO configuration -MINIO_ACCESS_KEY=minioadmin -MINIO_SECRET_KEY=minioadmin +MINIO_ROOT_USER=minioadmin +MINIO_ROOT_PASSWORD=minioadmin MINIO_PORT_OVERRIDE_API=9000 MINIO_PORT_OVERRIDE_WEBUI=9001 diff --git a/src/milvus-standalone/README.md b/src/milvus-standalone/README.md index 403aa41..253ff89 100644 --- a/src/milvus-standalone/README.md +++ b/src/milvus-standalone/README.md @@ -19,15 +19,15 @@ If you need authentication, please visit the [official documentation](https://mi - `ETCD_VERSION`: The version of the etcd image, default is `v3.5.18`. - `MINIO_VERSION`: The version of the Minio image, default is `RELEASE.2024-12-18T13-15-44Z`. -- `MILVUS_VERSION`: The version of the Milvus image, default is `v2.6.2`. -- `ATTU_VERSION`: The version of the Attu image, default is `v2.6.0`. -- `MINIO_ACCESS_KEY`: The access key for Minio, default is `minioadmin`. -- `MINIO_SECRET_KEY`: The secret key for Minio, default is `minioadmin`. +- `MILVUS_VERSION`: The version of the Milvus image, default is `v2.6.7`. +- `ATTU_VERSION`: The version of the Attu image, default is `v2.6.4`. +- `MINIO_ROOT_USER`: The root user for Minio, default is `minioadmin`. +- `MINIO_ROOT_PASSWORD`: The root password for Minio, default is `minioadmin`. - `MINIO_PORT_OVERRIDE_API`: The host port for the Minio API, default is `9000`. - `MINIO_PORT_OVERRIDE_WEBUI`: The host port for the Minio Web UI, default is `9001`. - `MILVUS_PORT_OVERRIDE_HTTP`: The host port for the Milvus HTTP service, default is `19530`. - `MILVUS_PORT_OVERRIDE_WEBUI`: The host port for the Milvus Web UI, default is `9091`. -- `ATTU_PORT`: The host port for the Attu service, default is `8000`. +- `ATTU_PORT_OVERRIDE`: The host port for the Attu service, default is `8000`. ## Volumes diff --git a/src/milvus-standalone/README.zh.md b/src/milvus-standalone/README.zh.md index 974974a..bf1e4df 100644 --- a/src/milvus-standalone/README.zh.md +++ b/src/milvus-standalone/README.zh.md @@ -19,15 +19,15 @@ Milvus 是一个开源的向量数据库,专为处理大规模向量数据而 - `ETCD_VERSION`: etcd 镜像的版本,默认为 `v3.5.18`。 - `MINIO_VERSION`: Minio 镜像的版本,默认为 `RELEASE.2024-12-18T13-15-44Z`。 -- `MILVUS_VERSION`: Milvus 镜像的版本,默认为 `v2.6.2`。 -- `ATTU_VERSION`: Attu 镜像的版本,默认为 `v2.6.0`。 -- `MINIO_ACCESS_KEY`: Minio 的访问密钥,默认为 `minioadmin`。 -- `MINIO_SECRET_KEY`: Minio 的秘密密钥,默认为 `minioadmin`。 +- `MILVUS_VERSION`: Milvus 镜像的版本,默认为 `v2.6.7`。 +- `ATTU_VERSION`: Attu 镜像的版本,默认为 `v2.6.4`。 +- `MINIO_ROOT_USER`: Minio 的根用户,默认为 `minioadmin`。 +- `MINIO_ROOT_PASSWORD`: Minio 的根密码,默认为 `minioadmin`。 - `MINIO_PORT_OVERRIDE_API`: Minio API 的主机端口,默认为 `9000`。 - `MINIO_PORT_OVERRIDE_WEBUI`: Minio Web UI 的主机端口,默认为 `9001`。 - `MILVUS_PORT_OVERRIDE_HTTP`: Milvus HTTP 服务的主机端口,默认为 `19530`。 - `MILVUS_PORT_OVERRIDE_WEBUI`: Milvus Web UI 的主机端口,默认为 `9091`。 -- `ATTU_PORT`: Attu 服务的主机端口,默认为 `8000`。 +- `ATTU_PORT_OVERRIDE`: Attu 服务的主机端口,默认为 `8000`。 ## 卷 diff --git a/src/milvus-standalone/docker-compose.yaml b/src/milvus-standalone/docker-compose.yaml index a8b0ee2..595404a 100644 --- a/src/milvus-standalone/docker-compose.yaml +++ b/src/milvus-standalone/docker-compose.yaml @@ -64,7 +64,7 @@ services: milvus-standalone: <<: *defaults - image: ${GLOBAL_REGISTRY:-}milvusdb/milvus:${MILVUS_VERSION:-v2.6.3} + image: ${GLOBAL_REGISTRY:-}milvusdb/milvus:${MILVUS_VERSION:-v2.6.7} command: ["milvus", "run", "standalone"] security_opt: - seccomp:unconfined @@ -100,7 +100,7 @@ services: attu: <<: *defaults - image: ${GLOBAL_REGISTRY:-}zilliz/attu:${ATTU_VERSION:-v2.6.1} + image: ${GLOBAL_REGISTRY:-}zilliz/attu:${ATTU_VERSION:-v2.6.4} profiles: - attu environment: @@ -129,3 +129,4 @@ services: volumes: etcd_data: minio_data: + milvus_data: diff --git a/src/pulsar/docker-compose.yaml b/src/pulsar/docker-compose.yaml index 52738ce..d65ec18 100644 --- a/src/pulsar/docker-compose.yaml +++ b/src/pulsar/docker-compose.yaml @@ -14,6 +14,8 @@ services: pulsar: <<: *defaults image: ${GLOBAL_REGISTRY:-}apachepulsar/pulsar:${PULSAR_VERSION:-4.0.7} + profiles: + - ${COMPOSE_PROFILES:-} hostname: pulsar-standalone ports: - "${PULSAR_BROKER_PORT_OVERRIDE:-6650}:6650"