CI: Upgrade Ubi8 to Ubi9.

pspoerri · pspoerri · commit aca2f1fee579 · 2024-04-23T08:40:39.000+02:00
Signed-off-by: Pascal Sp&ouml;rri &lt;psp@zurich.ibm.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,9 +33,9 @@ jobs:
             buildType: Release
           # - buildTarget: ubuntu22.04
           #   buildType: Debug
-          # - buildTarget: ubi8
-          #   buildType: Release
-          # - buildTarget: ubi8
+          - buildTarget: ubi9
+            buildType: Release
+          # - buildTarget: ubi9
           #   buildType: Debug
     runs-on: ubuntu-latest
     env:
diff --git a/docker/Dockerfile-base_ubi9 b/docker/Dockerfile-base_ubi9
@@ -3,14 +3,15 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-FROM registry.access.redhat.com/ubi8/ubi
+FROM registry.access.redhat.com/ubi9/ubi
 
 RUN yum install -y  \
     git unzip \
     clang wget  \
     gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-runtime \
-    curl libcurl-devel \
+    libcurl-devel \
     openssl-devel \
+    zlib-devel \
     python3.11 python3.11-devel \
     java-11-openjdk java-11-openjdk-devel
 
diff --git a/docker/Dockerfile_ubi9 b/docker/Dockerfile_ubi9
@@ -4,13 +4,13 @@
 #
 
 ARG GIT_REVISION
-FROM geds-build/ubi8:${GIT_REVISION} as builder
+FROM geds-build/ubi9:${GIT_REVISION} as builder
 
-FROM registry.access.redhat.com/ubi8/ubi
+FROM registry.access.redhat.com/ubi9/ubi
 
 RUN yum install -y  \
     curl \
-    gcc-toolset-12-runtime \
+    gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-runtime \
     openssl-devel \
     python3.11 \
     java-11-openjdk java-11-openjdk-devel
@@ -21,6 +21,9 @@ ENV PATH=/opt/rh/gcc-toolset-12/root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbi
     LD_LIBRARY_PATH=/opt/rh/gcc-toolset-12/root/usr/lib64:/opt/rh/gcc-toolset-12/root/usr/lib \
     PKG_CONFIG_PATH=/opt/rh/gcc-toolset-12/root/usr/lib64/pkgconfig
 
+ENV CC=/opt/rh/gcc-toolset-12/root/usr/bin/gcc \
+    CXX=/opt/rh/gcc-toolset-12/root/usr/bin/g++
+
 EXPOSE 4380
 EXPOSE 4381
 EXPOSE 4382
