From faf721226138b36d1f1fab7de3873b94081eba16 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Wed, 25 Feb 2026 12:23:12 -0500 Subject: [PATCH 1/2] Update Dockerfile to work on CentOS/RHEL 10 Signed-off-by: jatinsu --- openshift/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openshift/Dockerfile b/openshift/Dockerfile index c48156a7..a5c9edc3 100644 --- a/openshift/Dockerfile +++ b/openshift/Dockerfile @@ -27,7 +27,8 @@ RUN dnf clean all && rm -rf /var/cache/dnf/* \ && dnf update -y \ && dnf install -y catatonit python3.12-cryptography python3.12-devel gcc \ && pushd /usr/local/bin && ln -sf ../../bin/python3.12 python3 && popd \ - && python3 -m ensurepip --upgrade + && python3 -m ensurepip --upgrade \ + && { dnf remove -y python3-six || true; } # Add steps for cachito ENV REMOTE_SOURCES=${REMOTE_SOURCES:-"./openshift/"} From ead9b58ecd02e11f13dc0384e056006781fb8fd8 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Wed, 22 Apr 2026 12:47:49 -0400 Subject: [PATCH 2/2] Add comment for clarity --- openshift/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/openshift/Dockerfile b/openshift/Dockerfile index a5c9edc3..6d99de40 100644 --- a/openshift/Dockerfile +++ b/openshift/Dockerfile @@ -28,6 +28,7 @@ RUN dnf clean all && rm -rf /var/cache/dnf/* \ && dnf install -y catatonit python3.12-cryptography python3.12-devel gcc \ && pushd /usr/local/bin && ln -sf ../../bin/python3.12 python3 && popd \ && python3 -m ensurepip --upgrade \ + # python3-six conflicts with pip-installed packages on RHEl/CentOS 10; remove it if present && { dnf remove -y python3-six || true; } # Add steps for cachito