Skip to content

Commit

Permalink
update to ubi9.5
Browse files Browse the repository at this point in the history
Signed-off-by: Sally O'Malley <[email protected]>
  • Loading branch information
sallyom committed Dec 10, 2024
1 parent 453f6eb commit d830853
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build/build_multi_stage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build/multi-stage/ubi-rhel/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/multi-stage/ubi-rhel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
Expand Down Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion deployments/podman-kube-play/rag-milvus-ex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d830853

Please sign in to comment.