Update ubi repos for rhel 7

aneoconsulting · Nov 12, 2024 · 519798d · 519798d
1 parent e3cd779
commit 519798d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 1 deletion.
diff --git a/ArmoniK.SDK.Client.Test/CMakeLists.txt b/ArmoniK.SDK.Client.Test/CMakeLists.txt
@@ -22,6 +22,7 @@ add_executable(${PROJECT_NAME} ${SRC_CLIENT_FILES})
 
 target_link_libraries(${PROJECT_NAME} PUBLIC ArmoniK.Api.Common ArmoniK.Api.Client ArmoniK.SDK.Common ArmoniK.SDK.Client)
 target_link_libraries(${PROJECT_NAME} PRIVATE GTest::gtest_main)
+target_link_options(${PROJECT_NAME} PUBLIC "-Wl,--copy-dt-needed-entries")
 target_include_directories(${PROJECT_NAME}
 		PUBLIC
 		"$<BUILD_INTERFACE:${HEADER_FILES_DIR}>"

diff --git a/ArmoniK.SDK.Common/include/armonik/sdk/common/TaskPayload.h b/ArmoniK.SDK.Common/include/armonik/sdk/common/TaskPayload.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <absl/strings/string_view.h>
+#include <cstdint>
 #include <sstream>
 #include <vector>
 

diff --git a/ArmoniK.SDK.DynamicWorker/ubi7.Dockerfile b/ArmoniK.SDK.DynamicWorker/ubi7.Dockerfile
@@ -6,6 +6,10 @@ USER root
 ENV LD_LIBRARY_PATH="/app/install/lib:$LD_LIBRARY_PATH"
 ENV PATH="/app/install/bin:$PATH"
 
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+
 RUN yum --disableplugin=subscription-manager check-update \
     ; yum --disableplugin=subscription-manager \
         install -y git make \
@@ -38,6 +42,7 @@ RUN git clone https://github.com/aneoconsulting/ArmoniK.Api.git -b "${API_VERSIO
     cd build/ && \
     cmake "-DCMAKE_INSTALL_PREFIX=/armonik/api" \
         "-DCMAKE_PREFIX_PATH=/usr/local/grpc" \
+        "-DCMAKE_BUILD_TYPE=Release" \
         "-DBUILD_TEST=OFF" \
         "-DBUILD_CLIENT=OFF" \
         "-DBUILD_WORKER=ON" .. && \
@@ -60,6 +65,7 @@ ARG WORKER_VERSION
 RUN cmake -DCMAKE_INSTALL_PREFIX=/app/install \
     -DCMAKE_PREFIX_PATH=/usr/local/grpc \
     -DARMONIK_API_DIR=/armonik/api \
+    -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_CLIENT=OFF \
     -DBUILD_DYNAMICWORKER=ON \
     -DBUILD_END2END=OFF \

diff --git a/ArmoniK.SDK.Worker.Test/Dockerfile b/ArmoniK.SDK.Worker.Test/Dockerfile
@@ -5,6 +5,9 @@ FROM $DynamicWorkerImage as source
 ARG BuildBaseImage
 FROM $BuildBaseImage AS builder
 USER root
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
 # Install all the necessary dependencies required for the build process
 # These include tools and libraries for building and compiling the source code
 COPY --chmod=755 ./ArmoniK.SDK.Worker.Test/install-dependencies.sh ./install-dependencies.sh

diff --git a/tools/packaging/ubi-rpm.Dockerfile b/tools/packaging/ubi-rpm.Dockerfile
@@ -6,6 +6,10 @@ USER root
 ENV LD_LIBRARY_PATH="/app/install/lib:$LD_LIBRARY_PATH"
 ENV PATH="/app/install/bin:$PATH"
 
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+
 RUN yum --disableplugin=subscription-manager check-update \
     ; yum --disableplugin=subscription-manager \
         install -y git make \

diff --git a/tools/packaging/ubi-tgz.Dockerfile b/tools/packaging/ubi-tgz.Dockerfile
@@ -6,6 +6,10 @@ USER root
 ENV LD_LIBRARY_PATH="/app/install/lib:$LD_LIBRARY_PATH"
 ENV PATH="/app/install/bin:$PATH"
 
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+
 RUN yum --disableplugin=subscription-manager check-update \
     ; yum --disableplugin=subscription-manager \
         install -y git make \

diff --git a/tools/restart-build-env.sh b/tools/restart-build-env.sh
@@ -8,7 +8,7 @@ CONTAINER_NAME="armonik_sdk_env"
 docker stop "${CONTAINER_NAME}"
 DEFAULT_API_DIR="$(pwd)/../../Armonik.Api/packages/cpp/install"
 ARMONIK_API_DIR="${ARMONIK_API_DIR:-${DEFAULT_API_DIR}}"
-REMOTE_BUILD_ADDRESS="${REMOTE_BUILD_ADDRESS:-"127.0.0.1:2222"}"
+REMOTE_BUILD_ADDRESS="${REMOTE_BUILD_ADDRESS:-"127.0.0.1:4443"}"
 SOURCE_DIR="$(pwd)/../"
 
 docker build -t "${IMAGE_NAME}:${IMAGE_TAG}" -f BuildEnv.Dockerfile ${SOURCE_DIR}