From 042d18a29fbab37187894beaf0d96631c2106308 Mon Sep 17 00:00:00 2001
From: Hrithik Kulkarni <hkulkarni@confluent.io>
Date: Tue, 19 Aug 2025 10:47:37 +0530
Subject: [PATCH 1/9] update to python 3.11

---
 base/Dockerfile.ubi8 | 13 ++++++++-----
 base/pom.xml         |  4 ++--
 pom.xml              |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8
index e946cfbd2e..299462f58f 100644
--- a/base/Dockerfile.ubi8
+++ b/base/Dockerfile.ubi8
@@ -53,7 +53,7 @@ ENV CUB_CLASSPATH='"/usr/share/java/cp-base-new/*"'
 ARG OPENSSL_VERSION=""
 ARG WGET_VERSION=""
 ARG NETCAT_VERSION=""
-ARG PYTHON39_VERSION=""
+ARG PYTHON310_VERSION=""
 ARG TAR_VERSION=""
 ARG PROCPS_VERSION=""
 ARG KRB5_WORKSTATION_VERSION=""
@@ -85,8 +85,10 @@ RUN microdnf --nodocs install yum \
         "openssl${OPENSSL_VERSION}" \
         "wget${WGET_VERSION}" \
         "nmap-ncat${NETCAT_VERSION}" \
-        "python39${PYTHON39_VERSION}" \
-        "python39-pip${PYTHON_PIP_VERSION}" \
+        "python311${PYTHON311_VERSION}"
+
+RUN yum --nodocs install -y --setopt=install_weak_deps=False \
+        "python3.11-pip${PYTHON_PIP_VERSION}" \
         "tar${TAR_VERSION}" \
         "procps-ng${PROCPS_VERSION}" \
         "krb5-workstation${KRB5_WORKSTATION_VERSION}" \
@@ -100,8 +102,9 @@ RUN microdnf --nodocs install yum \
         "libcurl${CURL_VERSION}" \
         "zulu11-ca-jdk-headless${ZULU_OPENJDK_VERSION}" "zulu11-ca-jre-headless${ZULU_OPENJDK_VERSION}" \
     && alternatives --set python /usr/bin/python3 \
-    && python3 -m pip install --upgrade "setuptools${PYTHON_SETUPTOOLS_VERSION}" \
-    && python3 -m pip install --prefer-binary --prefix=/usr/local --upgrade "${PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC}" \
+    && python3 -m pip install --upgrade "setuptools${PYTHON_SETUPTOOLS_VERSION}"
+
+RUN python3 -m pip install --prefer-binary --prefix=/usr/local --upgrade "${PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC}" \
     && yum remove -y git \
     && yum clean all \
     && rm -rf /tmp/* \
diff --git a/base/pom.xml b/base/pom.xml
index c98b586a8c..add22b2540 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -126,7 +126,7 @@
                         <OPENSSL_VERSION>-${ubi8.openssl.version}</OPENSSL_VERSION>
                         <WGET_VERSION>-${ubi8.wget.version}</WGET_VERSION>
                         <NETCAT_VERSION>-${ubi8.netcat.version}</NETCAT_VERSION>
-                        <PYTHON39_VERSION>-${ubi8.python39.version}</PYTHON39_VERSION>
+                        <PYTHON311_VERSION>${ubi8.python311.version}</PYTHON311_VERSION>
                         <TAR_VERSION>-${ubi8.tar.version}</TAR_VERSION>
                         <PROCPS_VERSION>-${ubi8.procps.version}</PROCPS_VERSION>
                         <KRB5_WORKSTATION_VERSION>-${ubi8.krb5.workstation.version}</KRB5_WORKSTATION_VERSION>
@@ -156,7 +156,7 @@
                           <OPENSSL_VERSION>-${ubi8.openssl.version}</OPENSSL_VERSION>
                           <WGET_VERSION>-${ubi8.wget.version}</WGET_VERSION>
                           <NETCAT_VERSION>-${ubi8.netcat.version}</NETCAT_VERSION>
-                          <PYTHON39_VERSION>-${ubi8.python39.version}</PYTHON39_VERSION>
+                          <PYTHON311_VERSION>${ubi8.python311.version}</PYTHON311_VERSION>
                           <TAR_VERSION>-${ubi8.tar.version}</TAR_VERSION>
                           <PROCPS_VERSION>-${ubi8.procps.version}</PROCPS_VERSION>
                           <KRB5_WORKSTATION_VERSION>-${ubi8.krb5.workstation.version}</KRB5_WORKSTATION_VERSION>
diff --git a/pom.xml b/pom.xml
index 36b954181e..521910d91f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
         <ubi8.openssl.version>1:1.1.1k-14.el8_6</ubi8.openssl.version>
         <ubi8.wget.version>1.19.5-12.el8_10</ubi8.wget.version>
         <ubi8.netcat.version>7.92-1.el8</ubi8.netcat.version>
-        <ubi8.python39.version>3.9.20-1.module+el8.10.0+22342+478c159e</ubi8.python39.version>
+        <ubi8.python311.version>3.11.13-1.el8_10</ubi8.python311.version>
         <ubi8.tar.version>1.30-10.el8_10</ubi8.tar.version>
         <ubi8.procps.version>3.3.15-14.el8</ubi8.procps.version>
         <ubi8.krb5.workstation.version>1.18.2-32.el8_10</ubi8.krb5.workstation.version>
@@ -49,7 +49,7 @@
         <!-- ZULU OpenJDK Package Version -->
         <ubi.zulu.openjdk.version>11.0.28-1</ubi.zulu.openjdk.version>
         <!-- Python Module Versions -->
-        <ubi8.python.pip.version>20.*</ubi8.python.pip.version>
+        <ubi8.python.pip.version>23.*</ubi8.python.pip.version>
         <ubi.python.setuptools.version>78.1.1</ubi.python.setuptools.version>
         <ubi.python.confluent.docker.utils.version>v0.0.162</ubi.python.confluent.docker.utils.version>
         <!-- In base/{pom.xml,Dockerfile.ubi} this property is used to to fail a build if the Yum/Dnf package manager

From 0d6f0020cabae0c94867fc3c7451bcec2cfdfa47 Mon Sep 17 00:00:00 2001
From: Hrithik Kulkarni <hkulkarni@confluent.io>
Date: Tue, 19 Aug 2025 12:26:19 +0530
Subject: [PATCH 2/9] minor fix

---
 base/Dockerfile.ubi8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8
index 299462f58f..5cbf69f209 100644
--- a/base/Dockerfile.ubi8
+++ b/base/Dockerfile.ubi8
@@ -53,7 +53,7 @@ ENV CUB_CLASSPATH='"/usr/share/java/cp-base-new/*"'
 ARG OPENSSL_VERSION=""
 ARG WGET_VERSION=""
 ARG NETCAT_VERSION=""
-ARG PYTHON310_VERSION=""
+ARG PYTHON311_VERSION=""
 ARG TAR_VERSION=""
 ARG PROCPS_VERSION=""
 ARG KRB5_WORKSTATION_VERSION=""

From 881366ef0df901cbd2ee1bedc53b47fb2f67d046 Mon Sep 17 00:00:00 2001
From: Hrithik Kulkarni <hkulkarni@confluent.io>
Date: Tue, 19 Aug 2025 12:36:04 +0530
Subject: [PATCH 3/9] minor fix

---
 base/Dockerfile.ubi8 | 2 +-
 base/pom.xml         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8
index 5cbf69f209..27e033b269 100644
--- a/base/Dockerfile.ubi8
+++ b/base/Dockerfile.ubi8
@@ -85,7 +85,7 @@ RUN microdnf --nodocs install yum \
         "openssl${OPENSSL_VERSION}" \
         "wget${WGET_VERSION}" \
         "nmap-ncat${NETCAT_VERSION}" \
-        "python311${PYTHON311_VERSION}"
+        "python3.11${PYTHON311_VERSION}"
 
 RUN yum --nodocs install -y --setopt=install_weak_deps=False \
         "python3.11-pip${PYTHON_PIP_VERSION}" \
diff --git a/base/pom.xml b/base/pom.xml
index add22b2540..a420258e6f 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -126,7 +126,7 @@
                         <OPENSSL_VERSION>-${ubi8.openssl.version}</OPENSSL_VERSION>
                         <WGET_VERSION>-${ubi8.wget.version}</WGET_VERSION>
                         <NETCAT_VERSION>-${ubi8.netcat.version}</NETCAT_VERSION>
-                        <PYTHON311_VERSION>${ubi8.python311.version}</PYTHON311_VERSION>
+                        <PYTHON311_VERSION>-${ubi8.python311.version}</PYTHON311_VERSION>
                         <TAR_VERSION>-${ubi8.tar.version}</TAR_VERSION>
                         <PROCPS_VERSION>-${ubi8.procps.version}</PROCPS_VERSION>
                         <KRB5_WORKSTATION_VERSION>-${ubi8.krb5.workstation.version}</KRB5_WORKSTATION_VERSION>
@@ -156,7 +156,7 @@
                           <OPENSSL_VERSION>-${ubi8.openssl.version}</OPENSSL_VERSION>
                           <WGET_VERSION>-${ubi8.wget.version}</WGET_VERSION>
                           <NETCAT_VERSION>-${ubi8.netcat.version}</NETCAT_VERSION>
-                          <PYTHON311_VERSION>${ubi8.python311.version}</PYTHON311_VERSION>
+                          <PYTHON311_VERSION>-${ubi8.python311.version}</PYTHON311_VERSION>
                           <TAR_VERSION>-${ubi8.tar.version}</TAR_VERSION>
                           <PROCPS_VERSION>-${ubi8.procps.version}</PROCPS_VERSION>
                           <KRB5_WORKSTATION_VERSION>-${ubi8.krb5.workstation.version}</KRB5_WORKSTATION_VERSION>

From 6596f1afda922373ab62a740c7523bdadd640b20 Mon Sep 17 00:00:00 2001
From: Hrithik Kulkarni <hkulkarni@confluent.io>
Date: Tue, 19 Aug 2025 12:57:41 +0530
Subject: [PATCH 4/9] upgrade pip

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 521910d91f..27e5d8eb05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
         <!-- ZULU OpenJDK Package Version -->
         <ubi.zulu.openjdk.version>11.0.28-1</ubi.zulu.openjdk.version>
         <!-- Python Module Versions -->
-        <ubi8.python.pip.version>23.*</ubi8.python.pip.version>
+        <ubi8.python.pip.version>22.*</ubi8.python.pip.version>
         <ubi.python.setuptools.version>78.1.1</ubi.python.setuptools.version>
         <ubi.python.confluent.docker.utils.version>v0.0.162</ubi.python.confluent.docker.utils.version>
         <!-- In base/{pom.xml,Dockerfile.ubi} this property is used to to fail a build if the Yum/Dnf package manager

From fd4a54cc7742ba96855b4bc1b03d3bbfa4480b1b Mon Sep 17 00:00:00 2001
From: Hrithik Kulkarni <hkulkarni@confluent.io>
Date: Fri, 29 Aug 2025 11:17:42 +0530
Subject: [PATCH 5/9] use updated docker compose

---
 base/Dockerfile.ubi8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8
index 27e033b269..cdff0a4100 100644
--- a/base/Dockerfile.ubi8
+++ b/base/Dockerfile.ubi8
@@ -74,7 +74,7 @@ ARG PYTHON_SETUPTOOLS_VERSION=""
 ARG PYTHON_CONFLUENT_DOCKER_UTILS_VERSION="master"
 
 # This can be overriden for an offline/air-gapped builds
-ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@${PYTHON_CONFLUENT_DOCKER_UTILS_VERSION}"
+ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@update-docker-compose-1"
 
 RUN microdnf --nodocs install yum \
     && rpm --import https://www.azul.com/files/0xB1998361219BD9C9.txt \

From 237c95262193a3e6793cdf5596a376a30de994d9 Mon Sep 17 00:00:00 2001
From: Hrithik Kulkarni <hkulkarni@confluent.io>
Date: Fri, 29 Aug 2025 11:21:19 +0530
Subject: [PATCH 6/9] trigger build


From 6731eb086910abad1e8b0c822c46133fc3331ce0 Mon Sep 17 00:00:00 2001
From: Hrithik Kulkarni <hkulkarni@confluent.io>
Date: Fri, 29 Aug 2025 15:38:37 +0530
Subject: [PATCH 7/9] update python version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 27e5d8eb05..98dd45a466 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
         <ubi8.openssl.version>1:1.1.1k-14.el8_6</ubi8.openssl.version>
         <ubi8.wget.version>1.19.5-12.el8_10</ubi8.wget.version>
         <ubi8.netcat.version>7.92-1.el8</ubi8.netcat.version>
-        <ubi8.python311.version>3.11.13-1.el8_10</ubi8.python311.version>
+        <ubi8.python311.version>3.11.13-2.el8_10</ubi8.python311.version>
         <ubi8.tar.version>1.30-10.el8_10</ubi8.tar.version>
         <ubi8.procps.version>3.3.15-14.el8</ubi8.procps.version>
         <ubi8.krb5.workstation.version>1.18.2-32.el8_10</ubi8.krb5.workstation.version>

From d864b7c90fab43e2a0d771fbdc00e91164ef5dcd Mon Sep 17 00:00:00 2001
From: Hrithik Kulkarni <hkulkarni@confluent.io>
Date: Fri, 29 Aug 2025 15:46:09 +0530
Subject: [PATCH 8/9] update tar

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 98dd45a466..0506a9bcba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
         <ubi8.wget.version>1.19.5-12.el8_10</ubi8.wget.version>
         <ubi8.netcat.version>7.92-1.el8</ubi8.netcat.version>
         <ubi8.python311.version>3.11.13-2.el8_10</ubi8.python311.version>
-        <ubi8.tar.version>1.30-10.el8_10</ubi8.tar.version>
+        <ubi8.tar.version>1.30-11.el8_10</ubi8.tar.version>
         <ubi8.procps.version>3.3.15-14.el8</ubi8.procps.version>
         <ubi8.krb5.workstation.version>1.18.2-32.el8_10</ubi8.krb5.workstation.version>
         <ubi8.iputils.version>20180629-11.el8</ubi8.iputils.version>

From 7c1df68a3dbc7a6b70b9eea445e945cb0006e97d Mon Sep 17 00:00:00 2001
From: Hrithik Kulkarni <hkulkarni@confluent.io>
Date: Fri, 29 Aug 2025 16:12:11 +0530
Subject: [PATCH 9/9] replace docker compose in docker utils

---
 base/Dockerfile.ubi8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8
index cdff0a4100..8f50436b99 100644
--- a/base/Dockerfile.ubi8
+++ b/base/Dockerfile.ubi8
@@ -74,7 +74,7 @@ ARG PYTHON_SETUPTOOLS_VERSION=""
 ARG PYTHON_CONFLUENT_DOCKER_UTILS_VERSION="master"
 
 # This can be overriden for an offline/air-gapped builds
-ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@update-docker-compose-1"
+ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@replace-docker-compose"
 
 RUN microdnf --nodocs install yum \
     && rpm --import https://www.azul.com/files/0xB1998361219BD9C9.txt \