diff --git a/Dockerfile.redhat b/Dockerfile.redhat index 043e1e736f..9a001979d2 100644 --- a/Dockerfile.redhat +++ b/Dockerfile.redhat @@ -87,7 +87,7 @@ RUN git clone --recurse-submodules --depth 1 --branch v2.10.16 https://github.co patch -d /azure/azure-storage-cpp/ -p1 2 is treated like 2 on this platform +ARG GENAI_SDL_OPS="${SDL_OPS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" # hadolint ignore=DL3003 RUN if [ "$ov_use_binary" == "0" ]; then true ; else exit 0 ; fi ; \ - git clone https://github.com/$ov_genai_org/openvino.genai /openvino_genai && cd /openvino_genai && git checkout $ov_genai_branch && git submodule update --init --recursive ; \ - cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCMAKE_CXX_FLAGS=" ${SDL_OPS} ${LTO_CXX_FLAGS} " -DCMAKE_SHARED_LINKER_FLAGS="${LTO_LD_FLAGS}" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DENABLE_SYSTEM_ICU="True" -DBUILD_TOKENIZERS=OFF -DENABLE_SAMPLES=OFF -DENABLE_TOOLS=OFF -DENABLE_TESTS=OFF -DENABLE_XGRAMMAR=ON -S ./ -B ./build/ ; \ - cmake --build ./build/ --parallel $JOBS && cp /openvino_genai/build/openvino_genai/lib*.so* /opt/intel/openvino/runtime/lib/intel64/ ; \ - cp -r /openvino_genai/src/cpp/include/* /opt/intel/openvino/runtime/include/ ; \ - cp /openvino_genai/build/src/cpp/openvino/genai/version.hpp /opt/intel/openvino/runtime/include/openvino/genai/ ; \ + git clone https://github.com/$ov_genai_org/openvino.genai /openvino_genai && cd /openvino_genai && git checkout $ov_genai_branch && git submodule update --init --recursive && \ + cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCMAKE_CXX_FLAGS=" ${GENAI_SDL_OPS} ${LTO_CXX_FLAGS} " -DCMAKE_SHARED_LINKER_FLAGS="${LTO_LD_FLAGS}" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DENABLE_SYSTEM_ICU="True" -DBUILD_TOKENIZERS=OFF -DENABLE_SAMPLES=OFF -DENABLE_TOOLS=OFF -DENABLE_TESTS=OFF -DENABLE_XGRAMMAR=ON -S ./ -B ./build/ && \ + cmake --build ./build/ --parallel $JOBS && cp /openvino_genai/build/openvino_genai/lib*.so* /opt/intel/openvino/runtime/lib/intel64/ && \ + cp -r /openvino_genai/src/cpp/include/* /opt/intel/openvino/runtime/include/ && \ + cp /openvino_genai/build/src/cpp/openvino/genai/version.hpp /opt/intel/openvino/runtime/include/openvino/genai/ && \ if ! [[ $debug_bazel_flags == *"_py_off"* ]]; then \ cp -r /openvino_genai/build/openvino_genai/*py* /opt/intel/openvino/python/ ; \ fi diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index f3883cf986..d76f3ade1a 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -72,12 +72,12 @@ RUN git clone --recurse-submodules --depth 1 --branch v2.10.16 https://github.co patch -d /azure/cpprestsdk/ -p1 < /ovms/third_party/cpprest/rest_sdk_v2.10.16.patch && \ patch -d /azure/azure-storage-cpp/ -p1