From dc23d3968b83e07e71459d360a8b2bff1d0368f2 Mon Sep 17 00:00:00 2001
From: ArchanaShinde1 <archana.shinde1@ibm.com>
Date: Fri, 30 May 2025 06:33:24 -0700
Subject: [PATCH 1/2] Dockerfile changes for X

---
 open_ce/images/builder/ubi8/Dockerfile-P | 58 ++++++++++++++++++++++++
 open_ce/images/builder/ubi8/Dockerfile-X | 55 ++++++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 open_ce/images/builder/ubi8/Dockerfile-P
 create mode 100644 open_ce/images/builder/ubi8/Dockerfile-X

diff --git a/open_ce/images/builder/ubi8/Dockerfile-P b/open_ce/images/builder/ubi8/Dockerfile-P
new file mode 100644
index 00000000..aa00a80f
--- /dev/null
+++ b/open_ce/images/builder/ubi8/Dockerfile-P
@@ -0,0 +1,58 @@
+FROM registry.access.redhat.com/ubi8/ubi
+
+ENV CONDA_HOME=${CONDA_HOME:-/opt/conda}
+ENV PATH=$CONDA_HOME/bin:$PATH
+
+ENV OPEN_CE_CONDA_BUILD=3.22.0
+ENV OPEN_CE_CONDA=4.14
+ENV OPENSSL_VER=3.*
+
+ENV CICD_GROUP=cicd
+ARG GROUP_ID=1500
+ENV BUILD_USER=builder
+ARG BUILD_ID=1084
+
+ARG CONDA_ADD_PIP_AS_PYTHON_DEPENDENCY=0
+ENV CONDA_ADD_PIP_AS_PYTHON_DEPENDENCY=${CONDA_ADD_PIP_AS_PYTHON_DEPENDENCY}
+
+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 openssl-devel && \
+    # Create CICD Group
+    groupadd --non-unique --gid ${GROUP_ID} ${CICD_GROUP} && \
+    # Adduser Builder
+    useradd -b /home --non-unique --create-home --gid ${GROUP_ID} --groups wheel \
+    --uid ${BUILD_ID} --comment "User for Building" ${BUILD_USER} && \
+    curl -o /tmp/anaconda.sh https://repo.anaconda.com/miniconda/Miniconda3-py310_22.11.1-1-Linux-${ARCH}.sh && \
+    chmod +x /tmp/anaconda.sh && \
+    /bin/bash /tmp/anaconda.sh -f -b -p /opt/conda && \
+    rm -f /tmp/anaconda.sh && \
+    $CONDA_HOME/bin/conda install -y conda-build=${OPEN_CE_CONDA_BUILD} conda=${OPEN_CE_CONDA} networkx git junit-xml patch && \
+    $CONDA_HOME/bin/conda config --system --add envs_dirs $CONDA_HOME/envs && \
+    $CONDA_HOME/bin/conda config --system --add pkgs_dirs $CONDA_HOME/pkgs && \
+    $CONDA_HOME/bin/conda config --system --set always_yes true && \
+    $CONDA_HOME/bin/conda config --system --set auto_update_conda false && \
+    $CONDA_HOME/bin/conda config --system --set notify_outdated_conda false && \
+    $CONDA_HOME/bin/conda --version && \
+    $CONDA_HOME/bin/conda install openssl=${OPENSSL_VER} && \
+    mkdir -p $CONDA_HOME/conda-bld && \
+    mkdir -p $HOME/.cache && \
+    echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \
+    echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \
+    chown -R ${BUILD_USER}:${CICD_GROUP} ${CONDA_HOME} && \
+    git config --global http.version HTTP/1.1 && \
+    git config --global http.postBuffer 157286400
+
+USER ${BUILD_USER}
+RUN export PATH="${PATH}" && \
+    echo "PATH="${PATH}"" >> ${HOME}/.profile && \
+    mkdir -p $HOME/.cache && \
+    echo ". $CONDA_HOME/etc/profile.d/conda.sh" >> ${HOME}/.bashrc && \
+    echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \
+    echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \
+    echo "conda activate base" >> ${HOME}/.bashrc && \
+    git config --global http.version HTTP/1.1 && \
+    git config --global http.postBuffer 157286400
+
diff --git a/open_ce/images/builder/ubi8/Dockerfile-X b/open_ce/images/builder/ubi8/Dockerfile-X
new file mode 100644
index 00000000..a0fdd0dd
--- /dev/null
+++ b/open_ce/images/builder/ubi8/Dockerfile-X
@@ -0,0 +1,55 @@
+FROM registry.access.redhat.com/ubi8/ubi
+
+ENV CONDA_HOME=${CONDA_HOME:-/opt/conda}
+ENV PATH=$CONDA_HOME/bin:$PATH
+
+ENV OPEN_CE_CONDA_BUILD=3.22.0
+ENV OPEN_CE_CONDA=4.14
+ENV OPENSSL_VER=3.*
+
+ENV CICD_GROUP=cicd
+ARG GROUP_ID=1500
+ENV BUILD_USER=builder
+ARG BUILD_ID=1084
+
+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 openssl-devel && \
+    # Create CICD Group
+    groupadd --non-unique --gid ${GROUP_ID} ${CICD_GROUP} && \
+    # Adduser Builder
+    useradd -b /home --non-unique --create-home --gid ${GROUP_ID} --groups wheel \
+    --uid ${BUILD_ID} --comment "User for Building" ${BUILD_USER} && \
+    curl -o /tmp/anaconda.sh https://repo.anaconda.com/miniconda/Miniconda3-py310_22.11.1-1-Linux-${ARCH}.sh && \
+    chmod +x /tmp/anaconda.sh && \
+    /bin/bash /tmp/anaconda.sh -f -b -p /opt/conda && \
+    rm -f /tmp/anaconda.sh && \
+    $CONDA_HOME/bin/conda install -y conda-build=${OPEN_CE_CONDA_BUILD} conda=${OPEN_CE_CONDA} networkx git junit-xml patch && \
+    $CONDA_HOME/bin/conda config --system --add envs_dirs $CONDA_HOME/envs && \
+    $CONDA_HOME/bin/conda config --system --add pkgs_dirs $CONDA_HOME/pkgs && \
+    $CONDA_HOME/bin/conda config --system --set always_yes true && \
+    $CONDA_HOME/bin/conda config --system --set auto_update_conda false && \
+    $CONDA_HOME/bin/conda config --system --set notify_outdated_conda false && \
+    $CONDA_HOME/bin/conda --version && \
+    $CONDA_HOME/bin/conda install openssl=${OPENSSL_VER} && \
+    mkdir -p $CONDA_HOME/conda-bld && \
+    mkdir -p $HOME/.cache && \
+    echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \
+    echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \
+    chown -R ${BUILD_USER}:${CICD_GROUP} ${CONDA_HOME} && \
+    git config --global http.version HTTP/1.1 && \
+    git config --global http.postBuffer 157286400
+
+USER ${BUILD_USER}
+RUN export PATH="${PATH}" && \
+    echo "PATH="${PATH}"" >> ${HOME}/.profile && \
+    mkdir -p $HOME/.cache && \
+    echo ". $CONDA_HOME/etc/profile.d/conda.sh" >> ${HOME}/.bashrc && \
+    echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \
+    echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \
+    echo "conda activate base" >> ${HOME}/.bashrc && \
+    git config --global http.version HTTP/1.1 && \
+    git config --global http.postBuffer 157286400
+

From c4ac639aa8cb85717cc1abdc46fb81d1e2dc521f Mon Sep 17 00:00:00 2001
From: ArchanaShinde1 <archana.shinde1@ibm.com>
Date: Fri, 30 May 2025 06:39:28 -0700
Subject: [PATCH 2/2] Changes in Dpckerfile of X to fix OSU build

---
 open_ce/images/builder/ubi8/Dockerfile   |  3 --
 open_ce/images/builder/ubi8/Dockerfile-P | 58 ------------------------
 open_ce/images/builder/ubi8/Dockerfile-X | 55 ----------------------
 3 files changed, 116 deletions(-)
 delete mode 100644 open_ce/images/builder/ubi8/Dockerfile-P
 delete mode 100644 open_ce/images/builder/ubi8/Dockerfile-X

diff --git a/open_ce/images/builder/ubi8/Dockerfile b/open_ce/images/builder/ubi8/Dockerfile
index aa00a80f..a0fdd0dd 100644
--- a/open_ce/images/builder/ubi8/Dockerfile
+++ b/open_ce/images/builder/ubi8/Dockerfile
@@ -12,9 +12,6 @@ ARG GROUP_ID=1500
 ENV BUILD_USER=builder
 ARG BUILD_ID=1084
 
-ARG CONDA_ADD_PIP_AS_PYTHON_DEPENDENCY=0
-ENV CONDA_ADD_PIP_AS_PYTHON_DEPENDENCY=${CONDA_ADD_PIP_AS_PYTHON_DEPENDENCY}
-
 ARG LIMIT_BUILD_RESOURCES=0
 ENV LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}
 
diff --git a/open_ce/images/builder/ubi8/Dockerfile-P b/open_ce/images/builder/ubi8/Dockerfile-P
deleted file mode 100644
index aa00a80f..00000000
--- a/open_ce/images/builder/ubi8/Dockerfile-P
+++ /dev/null
@@ -1,58 +0,0 @@
-FROM registry.access.redhat.com/ubi8/ubi
-
-ENV CONDA_HOME=${CONDA_HOME:-/opt/conda}
-ENV PATH=$CONDA_HOME/bin:$PATH
-
-ENV OPEN_CE_CONDA_BUILD=3.22.0
-ENV OPEN_CE_CONDA=4.14
-ENV OPENSSL_VER=3.*
-
-ENV CICD_GROUP=cicd
-ARG GROUP_ID=1500
-ENV BUILD_USER=builder
-ARG BUILD_ID=1084
-
-ARG CONDA_ADD_PIP_AS_PYTHON_DEPENDENCY=0
-ENV CONDA_ADD_PIP_AS_PYTHON_DEPENDENCY=${CONDA_ADD_PIP_AS_PYTHON_DEPENDENCY}
-
-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 openssl-devel && \
-    # Create CICD Group
-    groupadd --non-unique --gid ${GROUP_ID} ${CICD_GROUP} && \
-    # Adduser Builder
-    useradd -b /home --non-unique --create-home --gid ${GROUP_ID} --groups wheel \
-    --uid ${BUILD_ID} --comment "User for Building" ${BUILD_USER} && \
-    curl -o /tmp/anaconda.sh https://repo.anaconda.com/miniconda/Miniconda3-py310_22.11.1-1-Linux-${ARCH}.sh && \
-    chmod +x /tmp/anaconda.sh && \
-    /bin/bash /tmp/anaconda.sh -f -b -p /opt/conda && \
-    rm -f /tmp/anaconda.sh && \
-    $CONDA_HOME/bin/conda install -y conda-build=${OPEN_CE_CONDA_BUILD} conda=${OPEN_CE_CONDA} networkx git junit-xml patch && \
-    $CONDA_HOME/bin/conda config --system --add envs_dirs $CONDA_HOME/envs && \
-    $CONDA_HOME/bin/conda config --system --add pkgs_dirs $CONDA_HOME/pkgs && \
-    $CONDA_HOME/bin/conda config --system --set always_yes true && \
-    $CONDA_HOME/bin/conda config --system --set auto_update_conda false && \
-    $CONDA_HOME/bin/conda config --system --set notify_outdated_conda false && \
-    $CONDA_HOME/bin/conda --version && \
-    $CONDA_HOME/bin/conda install openssl=${OPENSSL_VER} && \
-    mkdir -p $CONDA_HOME/conda-bld && \
-    mkdir -p $HOME/.cache && \
-    echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \
-    echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \
-    chown -R ${BUILD_USER}:${CICD_GROUP} ${CONDA_HOME} && \
-    git config --global http.version HTTP/1.1 && \
-    git config --global http.postBuffer 157286400
-
-USER ${BUILD_USER}
-RUN export PATH="${PATH}" && \
-    echo "PATH="${PATH}"" >> ${HOME}/.profile && \
-    mkdir -p $HOME/.cache && \
-    echo ". $CONDA_HOME/etc/profile.d/conda.sh" >> ${HOME}/.bashrc && \
-    echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \
-    echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \
-    echo "conda activate base" >> ${HOME}/.bashrc && \
-    git config --global http.version HTTP/1.1 && \
-    git config --global http.postBuffer 157286400
-
diff --git a/open_ce/images/builder/ubi8/Dockerfile-X b/open_ce/images/builder/ubi8/Dockerfile-X
deleted file mode 100644
index a0fdd0dd..00000000
--- a/open_ce/images/builder/ubi8/Dockerfile-X
+++ /dev/null
@@ -1,55 +0,0 @@
-FROM registry.access.redhat.com/ubi8/ubi
-
-ENV CONDA_HOME=${CONDA_HOME:-/opt/conda}
-ENV PATH=$CONDA_HOME/bin:$PATH
-
-ENV OPEN_CE_CONDA_BUILD=3.22.0
-ENV OPEN_CE_CONDA=4.14
-ENV OPENSSL_VER=3.*
-
-ENV CICD_GROUP=cicd
-ARG GROUP_ID=1500
-ENV BUILD_USER=builder
-ARG BUILD_ID=1084
-
-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 openssl-devel && \
-    # Create CICD Group
-    groupadd --non-unique --gid ${GROUP_ID} ${CICD_GROUP} && \
-    # Adduser Builder
-    useradd -b /home --non-unique --create-home --gid ${GROUP_ID} --groups wheel \
-    --uid ${BUILD_ID} --comment "User for Building" ${BUILD_USER} && \
-    curl -o /tmp/anaconda.sh https://repo.anaconda.com/miniconda/Miniconda3-py310_22.11.1-1-Linux-${ARCH}.sh && \
-    chmod +x /tmp/anaconda.sh && \
-    /bin/bash /tmp/anaconda.sh -f -b -p /opt/conda && \
-    rm -f /tmp/anaconda.sh && \
-    $CONDA_HOME/bin/conda install -y conda-build=${OPEN_CE_CONDA_BUILD} conda=${OPEN_CE_CONDA} networkx git junit-xml patch && \
-    $CONDA_HOME/bin/conda config --system --add envs_dirs $CONDA_HOME/envs && \
-    $CONDA_HOME/bin/conda config --system --add pkgs_dirs $CONDA_HOME/pkgs && \
-    $CONDA_HOME/bin/conda config --system --set always_yes true && \
-    $CONDA_HOME/bin/conda config --system --set auto_update_conda false && \
-    $CONDA_HOME/bin/conda config --system --set notify_outdated_conda false && \
-    $CONDA_HOME/bin/conda --version && \
-    $CONDA_HOME/bin/conda install openssl=${OPENSSL_VER} && \
-    mkdir -p $CONDA_HOME/conda-bld && \
-    mkdir -p $HOME/.cache && \
-    echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \
-    echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \
-    chown -R ${BUILD_USER}:${CICD_GROUP} ${CONDA_HOME} && \
-    git config --global http.version HTTP/1.1 && \
-    git config --global http.postBuffer 157286400
-
-USER ${BUILD_USER}
-RUN export PATH="${PATH}" && \
-    echo "PATH="${PATH}"" >> ${HOME}/.profile && \
-    mkdir -p $HOME/.cache && \
-    echo ". $CONDA_HOME/etc/profile.d/conda.sh" >> ${HOME}/.bashrc && \
-    echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \
-    echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \
-    echo "conda activate base" >> ${HOME}/.bashrc && \
-    git config --global http.version HTTP/1.1 && \
-    git config --global http.postBuffer 157286400
-