From 7a5910699d47c0dad638bc0720a68e8a1cf1dc78 Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Thu, 21 Aug 2025 09:55:13 +0800 Subject: [PATCH] upgrade milvus --- Database/etcd/meta.yml | 2 +- Database/mariadb/meta.yml | 2 +- .../milvus/2.6.0/24.03-lts-sp2/Dockerfile | 53 +++++++++++++++++++ Database/milvus/README.md | 8 +-- Database/milvus/doc/image-info.yml | 7 +-- Database/milvus/meta.yml | 4 +- Database/redis/meta.yml | 4 +- Database/tidb/meta.yml | 2 +- HPC/bwa/meta.yml | 2 +- 9 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 Database/milvus/2.6.0/24.03-lts-sp2/Dockerfile diff --git a/Database/etcd/meta.yml b/Database/etcd/meta.yml index c3776efb..12361c86 100644 --- a/Database/etcd/meta.yml +++ b/Database/etcd/meta.yml @@ -1,4 +1,4 @@ 3.6.0-oe2403sp1: - path: 3.6.0/24.03-lts-sp1/Dcokerfile + path: 3.6.0/24.03-lts-sp1/Dockerfile 3.6.4-oe2403sp1: path: 3.6.4/24.03-lts-sp1/Dockerfile \ No newline at end of file diff --git a/Database/mariadb/meta.yml b/Database/mariadb/meta.yml index 660280c4..ff1c6af1 100644 --- a/Database/mariadb/meta.yml +++ b/Database/mariadb/meta.yml @@ -1,4 +1,4 @@ 11.7.2-oe2403sp1: - path: 11.7.2/24.03-lts-sp1/Dcokerfile + path: 11.7.2/24.03-lts-sp1/Dockerfile 12.1.1-oe2403sp1: path: 12.1.1/24.03-lts-sp1/Dockerfile \ No newline at end of file diff --git a/Database/milvus/2.6.0/24.03-lts-sp2/Dockerfile b/Database/milvus/2.6.0/24.03-lts-sp2/Dockerfile new file mode 100644 index 00000000..e965cc6d --- /dev/null +++ b/Database/milvus/2.6.0/24.03-lts-sp2/Dockerfile @@ -0,0 +1,53 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp2 +FROM ${BASE} AS builder + +ARG VERSION=2.6.0 +ARG GOLANG_VERSION=1.24.2 +ARG TARGETARCH + +RUN yum install -y \ + sudo vim wget gcc g++ cmake make git which \ + gfortran zip unzip libatomic texinfo numa* ninja* libstdc* pkg-config libuuid-devel \ + python3-pip openblas-devel libaio perl-IPC-Cmd libasan libomp hdf5 hdf5-devel && \ + yum clean all && \ + wget -O go.tar.gz https://golang.google.cn/dl/go${GOLANG_VERSION}.linux-${TARGETARCH}.tar.gz && \ + tar -xvf go.tar.gz -C /usr/local && \ + rm -rf go.tar.gz +ENV PATH=/usr/local/go/bin:$PATH + +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.73 -y && \ + pip install conan==1.61.0 +ENV PATH=/root/.cargo/bin:$PATH + +RUN git clone -b v${VERSION} https://github.com/milvus-io/milvus.git && \ + cd milvus/ && \ + ./scripts/install_deps.sh && \ + CXXFLAGS="-I/usr/include/openblas" make build-cpp && \ + make build-go + +FROM $BASE + +ARG TARGETARCH + +RUN yum install -y libatomic openblas-devel libomp libstdc++ && \ + yum clean all + +RUN curl -fSL -o etcd-v3.5.0-linux-$TARGETARCH.tar.gz https://github.com/etcd-io/etcd/releases/download/v3.5.0/etcd-v3.5.0-linux-$TARGETARCH.tar.gz && \ + tar zxvf etcd-v3.5.0-linux-$TARGETARCH.tar.gz && \ + cp -r etcd-v3.5.0-linux-$TARGETARCH /usr/local/etcd && \ + rm -rf etcd-v3.5.0-linux-$TARGETARCH.tar.gz etcd-v3.5.0-linux-$TARGETARCH +ENV PATH=/usr/local/etcd:$PATH + +RUN curl -fSL -o minio https://dl.min.io/server/minio/release/linux-$TARGETARCH/minio && \ + chmod +x ./minio && \ + mv ./minio /usr/bin/ + +WORKDIR /milvus + +COPY --from=builder /milvus/internal/core/output/lib64/ /milvus/lib64/ +COPY --from=builder /milvus/internal/core/output/lib/*.so* /milvus/lib/ +COPY --from=builder /milvus/configs /milvus/configs +COPY --from=builder /milvus/bin/ /milvus/bin/ + +ENV LD_LIBRARY_PATH=/milvus/lib:/milvus/lib64:/lib64 +ENV PATH=$PATH:/milvus/bin/ \ No newline at end of file diff --git a/Database/milvus/README.md b/Database/milvus/README.md index b1667ba2..f4401a3b 100644 --- a/Database/milvus/README.md +++ b/Database/milvus/README.md @@ -15,9 +15,11 @@ Learn more about milvus at [https://milvus.io/](https://milvus.io/). # Supported tags and respective Dockerfile links The tag of each `milvus` docker image is consist of the version of `milvus` and the version of basic image. The details are as follows -| Tag | Currently | Architectures | -|----------|-------------|------------------| -|[2.5.14-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Database/milvus/2.5.14/24.03-lts-sp2/Dockerfile)| Milvus 2.5.14 on openEuler 24.03-LTS-SP2 | amd64, arm64 | + +| Tag | Currently | Architectures | +|-------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------|---------------| +| [2.5.14-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Database/milvus/2.5.14/24.03-lts-sp2/Dockerfile) | Milvus 2.5.14 on openEuler 24.03-LTS-SP2 | amd64, arm64 | +| [2.6.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Database/milvus/2.6.0/24.03-lts-sp2/Dockerfile) | Milvus 2.6.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 | # Usage diff --git a/Database/milvus/doc/image-info.yml b/Database/milvus/doc/image-info.yml index 0cbf33cf..556da1f6 100644 --- a/Database/milvus/doc/image-info.yml +++ b/Database/milvus/doc/image-info.yml @@ -9,9 +9,10 @@ environment: | tags: | milvus镜像的Tag由其版本信息和基础镜像版本信息组成，详细内容如下 - | Tag | Currently | Architectures | - |----------|-------------|------------------| - |[2.7.11-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Database/milvus/2.7.11/24.03-lts-sp1/Dockerfile)| milvus 2.7.11 on openEuler 24.03-LTS-SP1 | amd64, arm64 | + | Tag | Currently | Architectures | + |-------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------|---------------| + | [2.5.14-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Database/milvus/2.5.14/24.03-lts-sp2/Dockerfile) | Milvus 2.5.14 on openEuler 24.03-LTS-SP2 | amd64, arm64 | + | [2.6.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Database/milvus/2.6.0/24.03-lts-sp2/Dockerfile) | Milvus 2.6.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 | download: | 拉取镜像到本地 diff --git a/Database/milvus/meta.yml b/Database/milvus/meta.yml index fe20e024..18dce6ce 100644 --- a/Database/milvus/meta.yml +++ b/Database/milvus/meta.yml @@ -1,2 +1,4 @@ 2.5.14-oe2403sp2: - path: 2.5.14/24.03-lts-sp2/Dcokerfile \ No newline at end of file + path: 2.5.14/24.03-lts-sp2/Dockerfile +2.6.0-oe2403sp2: + path: 2.6.0/24.03-lts-sp2/Dockerfile \ No newline at end of file diff --git a/Database/redis/meta.yml b/Database/redis/meta.yml index c826a01b..48a36eb0 100644 --- a/Database/redis/meta.yml +++ b/Database/redis/meta.yml @@ -1,9 +1,9 @@ 6.2.7-oe2203lts: path: 6.2.7/22.03-lts/Dockerfile 7.2.4-oe2203sp3: - path: 7.2.4/22.03-lts-sp3/Dcokerfile + path: 7.2.4/22.03-lts-sp3/Dockerfile 7.2.5-oe2203sp3: - path: 7.2.5/22.03-lts-sp3/Dcokerfile + path: 7.2.5/22.03-lts-sp3/Dockerfile 7.4.1-oe2003sp4: path: 7.4.1/20.03-lts-sp4/Dockerfile 7.4.1-oe2203sp1: diff --git a/Database/tidb/meta.yml b/Database/tidb/meta.yml index 7ba5de30..c766cd09 100644 --- a/Database/tidb/meta.yml +++ b/Database/tidb/meta.yml @@ -1,4 +1,4 @@ 8.5.1-oe2403sp1: - path: 8.5.1/24.03-lts-sp1/Dcokerfile + path: 8.5.1/24.03-lts-sp1/Dockerfile 8.5.3-oe2403sp1: path: 8.5.3/24.03-lts-sp1/Dockerfile \ No newline at end of file diff --git a/HPC/bwa/meta.yml b/HPC/bwa/meta.yml index 30febc63..09e344cd 100644 --- a/HPC/bwa/meta.yml +++ b/HPC/bwa/meta.yml @@ -1,2 +1,2 @@ 0.7.18-oe2203sp3: - path: 0.7.18/22.03-lts-sp3/Dcokerfile \ No newline at end of file + path: 0.7.18/22.03-lts-sp3/Dockerfile \ No newline at end of file -- Gitee