Merge pull request #109 from RH-steve-grubb/ovms-poc-dockerfile

Reset Dockerfile.redhat to original values + bazel capi fix

Author: MohammadiIram

Dockerfile.redhat

@@ -17,18 +17,18 @@
 ARG BASE_IMAGE=registry.access.redhat.com/ubi9/ubi:9.6
 ARG BUILD_IMAGE=build
 ARG PKG_IMAGE=pkg
-ARG RELEASE_BASE_IMAGE=registry.access.redhat.com/ubi9-minimal:9.6
+ARG RELEASE_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.6
 
 FROM $BASE_IMAGE as base_build
 ARG BASE_IMAGE=registry.access.redhat.com/ubi9/ubi:9.6
 
 SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
 
-ARG JOBS=16
-ARG VERBOSE_LOGS=ON
-ARG LTO_ENABLE=ON
-ARG LTO_CXX_FLAGS="-flto=auto -ffat-lto-objects -march=haswell"
-ARG LTO_LD_FLAGS="-flto=auto -ffat-lto-objects"
+ARG JOBS=8
+ARG VERBOSE_LOGS=OFF
+ARG LTO_ENABLE=OFF
+ARG LTO_CXX_FLAGS=""
+ARG LTO_LD_FLAGS="-Wl,-z,relro"
 
 # hadolint ignore=DL3041
 RUN echo -e "max_parallel_downloads=8\nretries=50" >> /etc/dnf/dnf.conf && \
@@ -101,13 +101,13 @@ RUN if [ "$VERBOSE_LOGS" == "ON" ] ; then export VERBOSE=1 ; fi && ./install_ope
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
 FROM base_build as build
-ARG BASE_IMAGE=registry.access.redhat.com/ubi9/ubi:9.6
+ARG BASE_IMAGE
 
 SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
 
-ARG JOBS=16
-ARG VERBOSE_LOGS=ON
-ARG LTO_ENABLE=ON
+ARG JOBS=40
+ARG VERBOSE_LOGS=OFF
+ARG LTO_ENABLE=OFF
 
 # hadolint ignore=DL3041
 RUN dnf install -y https://rpmfind.net/linux/almalinux/8.10/PowerTools/x86_64/os/Packages/opencl-headers-2.2-1.20180306gite986688.el8.noarch.rpm && \
@@ -167,15 +167,15 @@ RUN  dnf install -y https://github.com/linux-test-project/lcov/releases/download
 
 ENV TF_SYSTEM_LIBS="curl"
 ENV TEST_LOG="/root/.cache/bazel/_bazel_root/bc57d4817a53cab8c785464da57d1983/execroot/ovms/bazel-out/test.log"
-ARG ov_source_branch=releases/2025/2
-ARG ov_contrib_branch=releases/2025/2
-ARG ov_source_org=opendatahub-io
-ARG ov_contrib_org=opendatahub-io
+ARG ov_source_branch=c01cd93e24d1cd78bfbb401eed51c08fb93e0816
+ARG ov_contrib_branch=master
+ARG ov_source_org=openvinotoolkit
+ARG ov_contrib_org=openvinotoolkit
 ARG ov_use_binary=0
 ARG DLDT_PACKAGE_URL
 ARG TEMP_DIR=/tmp/openvino_installer
 ARG CMAKE_BUILD_TYPE=Release
-ARG debug_bazel_flags="--strip=always --define MEDIAPIPE_DISABLE=0 --define PYTHON_DISABLE=0 --config=mp_on_py_on --verbose_failures --//:distro=redhat --local_ram_resources=23552 --local_cpu_resources=16"
+ARG debug_bazel_flags="--strip=always  --config=mp_on_py_on --//:distro=redhat"
 
 ################### BUILD OPENVINO FROM SOURCE - buildarg ov_use_binary=0  ############################
 # hadolint ignore=DL3041
@@ -233,7 +233,7 @@ ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
 ENV OPENVINO_TOKENIZERS_PATH_GENAI=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
 ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/openvino/runtime/lib/intel64/:/opt/opencv/lib/:/opt/intel/openvino/runtime/3rdparty/tbb/lib/
 
-ARG ov_tokenizers_branch=releases/2025/2
+ARG ov_tokenizers_branch=85be884a69f10270703f81f970a5ee596a4c8df7
 # hadolint ignore=DL3003
 RUN git clone https://github.com/openvinotoolkit/openvino_tokenizers.git /openvino_tokenizers && cd /openvino_tokenizers && git checkout $ov_tokenizers_branch && git submodule update --init --recursive
 WORKDIR /openvino_tokenizers/build
@@ -292,7 +292,7 @@ ENV PYTHONPATH=/opt/intel/openvino/python:/ovms/bazel-bin/src/python/binding
 
 WORKDIR /ovms
 
-ARG PROJECT_VERSION="2025.2.0"
+ARG PROJECT_VERSION="2025.2"
 LABEL description="OpenVINO Model Server"
 ARG minitrace_flags
 
@@ -334,8 +334,8 @@ RUN python3 -c "import json; m={'PROJECT_VERSION':'${PROJECT_VERSION}','OPENVINO
 
 FROM $BUILD_IMAGE as capi-build
 # C api shared library
-ARG CAPI_FLAGS="--strip=always --config=mp_off_py_off --verbose_failures --//:distro=redhat --local_ram_resources=23552 --local_cpu_resources=16 --subcommands"
-ARG JOBS=16
+ARG CAPI_FLAGS="--strip=always  --config=mp_off_py_off --//:distro=redhat"
+ARG JOBS=40
 #RUN bazel build --jobs $JOBS ${CAPI_FLAGS} //src:ovms_shared
 
 RUN mkdir -p /tmp/bazel-output && \
@@ -392,7 +392,7 @@ WORKDIR /
 ARG BASE_OS=redhat
 ARG ov_use_binary=0
 ARG FUZZER_BUILD=0
-ARG debug_bazel_flags="--strip=always --define MEDIAPIPE_DISABLE=0 --define PYTHON_DISABLE=0 --config=mp_on_py_on --verbose_failures --//:distro=redhat --local_ram_resources=23552 --local_cpu_resources=16"
+ARG debug_bazel_flags="--strip=always  --config=mp_on_py_on --//:distro=redhat"
 COPY --from=capi-build /ovms_release/lib/libovms_shared.so /ovms_release/lib/
 COPY create_package.sh /
 RUN ./create_package.sh ; if ! [[ $debug_bazel_flags == *"_py_off"* ]]; then \
@@ -417,11 +417,11 @@ LABEL "description"="OpenVINO(TM) Model Server is a solution for serving AI mode
 LABEL "maintainer"="[email protected]"
 ARG INSTALL_RPMS_FROM_URL=
 ARG INSTALL_DRIVER_VERSION="24.52.32224"
-ARG GPU=1
-ARG debug_bazel_flags="--strip=always --define MEDIAPIPE_DISABLE=0 --define PYTHON_DISABLE=0 --config=mp_on_py_on --verbose_failures --//:distro=redhat --local_ram_resources=23552 --local_cpu_resources=16"
+ARG GPU=0
+ARG debug_bazel_flags=
 LABEL bazel-build-flags=${debug_bazel_flags}
 LABEL supported-devices="CPU=1 GPU=${GPU}"
-ARG RELEASE_BASE_IMAGE=registry.access.redhat.com/ubi9-minimal:9.6
+ARG RELEASE_BASE_IMAGE
 LABEL base-image=${RELEASE_BASE_IMAGE}
 
 ENV PYTHONPATH=/ovms/lib/python:/ovms/python_deps