From 7179ee23a5cc34529f7e8d7d25d9333f41c57cbd Mon Sep 17 00:00:00 2001 From: root Date: Mon, 10 Nov 2025 04:57:56 -0500 Subject: [PATCH 1/2] Rhel ubi 9.6 changes --- open_ce/images/builder/ubi9/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/open_ce/images/builder/ubi9/Dockerfile b/open_ce/images/builder/ubi9/Dockerfile index 9783b94e..02a03bb7 100644 --- a/open_ce/images/builder/ubi9/Dockerfile +++ b/open_ce/images/builder/ubi9/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/ubi +FROM registry.access.redhat.com/ubi9/ubi:9.6 ENV CONDA_HOME=${CONDA_HOME:-/opt/conda} ENV PATH=$CONDA_HOME/bin:$PATH @@ -16,7 +16,7 @@ ARG LIMIT_BUILD_RESOURCES=0 ENV LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES} RUN export ARCH="$(uname -m)" && \ - yum repolist && yum install -y rsync openssh-clients diffutils procps binutils git-lfs glibc-devel file psmisc libxcrypt-compat openssl-devel && \ + yum repolist && yum install -y rsync openssh-clients diffutils procps binutils git-lfs glibc-devel file psmisc libxcrypt-compat openssl-devel java-11-openjdk-devel && \ # Create CICD Group groupadd --non-unique --gid ${GROUP_ID} ${CICD_GROUP} && \ # Adduser Builder From 4d706c00687dcefd7855b823898cf71b3e8cf353 Mon Sep 17 00:00:00 2001 From: Archana-Shinde1 Date: Thu, 13 Nov 2025 06:53:33 -0500 Subject: [PATCH 2/2] ubi 9.6 changes to use JDK from RHEL --- open_ce/images/builder/ubi9/Dockerfile-p10 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/open_ce/images/builder/ubi9/Dockerfile-p10 b/open_ce/images/builder/ubi9/Dockerfile-p10 index b12adc0e..52f0b68f 100644 --- a/open_ce/images/builder/ubi9/Dockerfile-p10 +++ b/open_ce/images/builder/ubi9/Dockerfile-p10 @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/ubi +FROM registry.access.redhat.com/ubi9/ubi:9.6 ENV CONDA_HOME=${CONDA_HOME:-/opt/conda} ENV PATH=$CONDA_HOME/bin:$PATH @@ -16,7 +16,7 @@ ARG LIMIT_BUILD_RESOURCES=0 ENV LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES} RUN export ARCH="$(uname -m)" && \ - yum install -y yum-utils rsync openssh-clients diffutils procps git-lfs gcc-toolset-12 gcc-toolset-13 glibc-devel file libxcrypt-compat psmisc libX11-devel openssl openssl-libs openssl-devel && \ + yum install -y yum-utils rsync openssh-clients diffutils procps git-lfs gcc-toolset-12 gcc-toolset-13 glibc-devel file libxcrypt-compat psmisc libX11-devel openssl openssl-libs openssl-devel java-11-openjdk-devel && \ yum-config-manager --set-enabled codeready-builder-for-rhel-9-ppc64le-rpms && \ yum install -y libtirpc-devel && \ # Create CICD Group