From f976d22d6a5103c5b9c2957afe73bf96c139b0a9 Mon Sep 17 00:00:00 2001 From: Sally O'Malley Date: Mon, 9 Dec 2024 17:33:57 -0500 Subject: [PATCH] update to ubi9.5 Signed-off-by: Sally O'Malley --- build/build_multi_stage.sh | 2 +- build/multi-stage/ubi-rhel/Dockerfile | 6 +++--- build/multi-stage/ubi-rhel/README.md | 4 ++-- deployments/podman-kube-play/rag-milvus-ex.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/build_multi_stage.sh b/build/build_multi_stage.sh index 6472e4e8062c8..c36a9a9995fda 100755 --- a/build/build_multi_stage.sh +++ b/build/build_multi_stage.sh @@ -21,7 +21,7 @@ set -euo pipefail DOCKERFILE="${DOCKERFILE:-./build/multi-stage/ubi-rhel/Dockerfile}" IMAGE_ARCH="${IMAGE_ARCH:-amd64}" MILVUS_IMAGE_REPO="${MILVUS_IMAGE_REPO:-quay.io/redhat-et/milvus}" -MILVUS_IMAGE_TAG="${MILVUS_IMAGE_TAG:-standalone-rhel94}" +MILVUS_IMAGE_TAG="${MILVUS_IMAGE_TAG:-standalone-rhel9.5}" CONTAINER_CMD="${CONTAINER_CMD:-podman}" # RH distros package repos use x86_64 rather than amd64, and aarch64 rather than arm64 diff --git a/build/multi-stage/ubi-rhel/Dockerfile b/build/multi-stage/ubi-rhel/Dockerfile index 71d88e3e193f5..fd498d4bc7473 100644 --- a/build/multi-stage/ubi-rhel/Dockerfile +++ b/build/multi-stage/ubi-rhel/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/ubi:9.4-947.1717074712 as vcpkg-installer +FROM registry.access.redhat.com/ubi9:9.5-1732804088 as vcpkg-installer RUN dnf install -y wget zip git gcc gcc-c++ cmake \ dnf-plugins-core ninja-build \ @@ -22,7 +22,7 @@ RUN /opt/vcpkg/bootstrap-vcpkg.sh -disableMetrics && \ #FROM nvcr.io/nvidia/cuda:12.4.1-devel-ubi9 -FROM registry.access.redhat.com/ubi9/ubi:9.4-947.1717074712 as builder +FROM registry.access.redhat.com/ubi9:9.5-1732804088 as builder ARG RH_TARGETARCH ARG TARGETARCH @@ -109,7 +109,7 @@ RUN cp /home/milvus/build/multi-stage/ubi-rhel/configs/* /home/milvus/configs/. ENV CONAN_USER_HOME=/home/milvus/conan RUN make install -FROM registry.access.redhat.com/ubi9/ubi:9.4-947.1717074712 +FROM registry.access.redhat.com/ubi9:9.5-1732804088 ARG TARGETARCH ARG RH_TARGETARCH diff --git a/build/multi-stage/ubi-rhel/README.md b/build/multi-stage/ubi-rhel/README.md index da37f856330a7..6cd731f554b48 100644 --- a/build/multi-stage/ubi-rhel/README.md +++ b/build/multi-stage/ubi-rhel/README.md @@ -6,7 +6,7 @@ The following environment variables can be set for the build, shown here with de ``` MILVUS_IMAGE_REPO="${MILVUS_IMAGE_REPO:-quay.io/redhat-et/milvus}" -MILVUS_IMAGE_TAG="${MILVUS_IMAGE_TAG:-standalone-rhel94}" +MILVUS_IMAGE_TAG="${MILVUS_IMAGE_TAG:-standalone-rhel9.5}" IMAGE_ARCH="${IMAGE_ARCH:-amd64}" RH_TARGETARCH="${RH_TARGETARCH:-x86_64}" BUILD_ARGS="${BUILD_ARGS:---build-arg TARGETARCH=${IMAGE_ARCH} --build-arg RH_TARGETARCH=${RH_TARGETARCH}}" @@ -46,7 +46,7 @@ podman run --rm -d \ --health-start-period=90s \ --health-timeout=20s \ --health-retries=3 \ - quay.io/redhat-et/milvus:standalone-rhel94 \ + quay.io/redhat-et/milvus:standalone-rhel9.5 \ milvus run standalone ``` diff --git a/deployments/podman-kube-play/rag-milvus-ex.yaml b/deployments/podman-kube-play/rag-milvus-ex.yaml index 6c49430425937..9e62220ef9a8c 100644 --- a/deployments/podman-kube-play/rag-milvus-ex.yaml +++ b/deployments/podman-kube-play/rag-milvus-ex.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: milvus-standalone - image: quay.io/redhat-et/milvus:standalone-rhel94 + image: quay.io/redhat-et/milvus:standalone-rhel9.5 args: ["milvus", "run", "standalone"] env: - name: ETCD_DATA_DIR