From 18092cea1724dcd1e6394978f3dae3aca268252b Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Tue, 25 Nov 2025 15:13:35 -0500
Subject: [PATCH 1/2] Test with base-rhel9-minimal-test

---
 base/Dockerfile.rhel9            | 2 +-
 egress/dns-proxy/Dockerfile      | 2 +-
 egress/http-proxy/Dockerfile     | 2 +-
 ipfailover/keepalived/Dockerfile | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base/Dockerfile.rhel9 b/base/Dockerfile.rhel9
index d1f773fe0..646da029e 100644
--- a/base/Dockerfile.rhel9
+++ b/base/Dockerfile.rhel9
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 
 # A ubi9 image will expose python3 as /usr/bin/python. It does not contain
 # python2. Subsequent layers should install if it needed.
diff --git a/egress/dns-proxy/Dockerfile b/egress/dns-proxy/Dockerfile
index 09c1f6c24..d0d1406ae 100644
--- a/egress/dns-proxy/Dockerfile
+++ b/egress/dns-proxy/Dockerfile
@@ -3,7 +3,7 @@
 #
 # The standard name for this image is openshift/origin-egress-dns-proxy
 
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 
 # HAProxy 1.6+ version is needed to leverage DNS resolution at runtime.
 RUN INSTALL_PKGS="haproxy28 rsyslog" && \
diff --git a/egress/http-proxy/Dockerfile b/egress/http-proxy/Dockerfile
index b9c2894c9..1fc406d9c 100644
--- a/egress/http-proxy/Dockerfile
+++ b/egress/http-proxy/Dockerfile
@@ -3,7 +3,7 @@
 #
 # The standard name for this image is openshift/origin-egress-http-proxy
 
-FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.20:base-rhel9-minimal-test
 
 RUN INSTALL_PKGS="squid" && \
     yum install -y $INSTALL_PKGS && \
diff --git a/ipfailover/keepalived/Dockerfile b/ipfailover/keepalived/Dockerfile
index 5811b92ad..bbc572c67 100644
--- a/ipfailover/keepalived/Dockerfile
+++ b/ipfailover/keepalived/Dockerfile
@@ -3,7 +3,7 @@
 #
 # ImageName: openshift/origin-keepalived-ipfailover
 #
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 
 RUN INSTALL_PKGS="kmod keepalived iproute psmisc nmap-ncat net-tools ipset ipset-libs procps-ng" && \
     yum install -y $INSTALL_PKGS && \

From f187011f760fe09b9a490c7e9b3740af2c6be826 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Tue, 2 Dec 2025 16:43:25 -0500
Subject: [PATCH 2/2] microdnf: use 0 rather than False

---
 base/Dockerfile.rhel  | 2 +-
 base/Dockerfile.rhel9 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/base/Dockerfile.rhel b/base/Dockerfile.rhel
index 225e8988e..c6a6c47a7 100644
--- a/base/Dockerfile.rhel
+++ b/base/Dockerfile.rhel
@@ -15,7 +15,7 @@ RUN INSTALL_PKGS=" \
       " && \
     if [ ! -e /usr/bin/yum ]; then ln -s /usr/bin/microdnf /usr/bin/yum; fi && \
     echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
-    yum install -y --setopt=tsflags=nodocs --setopt=install_weak_deps=False ${INSTALL_PKGS} && \
+    yum install -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 ${INSTALL_PKGS} && \
     ( test -e /usr/bin/python ||  alternatives --set python /usr/bin/python3 ) && \
     yum clean all && rm -rf /var/cache/*
 
diff --git a/base/Dockerfile.rhel9 b/base/Dockerfile.rhel9
index 646da029e..6edb35487 100644
--- a/base/Dockerfile.rhel9
+++ b/base/Dockerfile.rhel9
@@ -12,13 +12,13 @@ RUN INSTALL_PKGS=" \
       procps-ng rsync iproute diffutils python3 \
       python-unversioned-command util-linux dbus systemd subscription-manager" && \
     echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
-    dnf install -y --nodocs --setopt=install_weak_deps=False ${INSTALL_PKGS} && \
+    dnf install -y --nodocs --setopt=install_weak_deps=0 ${INSTALL_PKGS} && \
     dnf clean all && rm -rf /var/cache/*
 
 # OKD-specific changes
 RUN source /etc/os-release && [ "${ID}" != "centos" ] && exit 0; \
     INSTALL_PKGS="dnf-plugins-core centos-release-nfv-openvswitch centos-release-openstack-zed" && \
-        dnf install -y --nodocs --setopt=install_weak_deps=False ${INSTALL_PKGS} && \
+        dnf install -y --nodocs --setopt=install_weak_deps=0 ${INSTALL_PKGS} && \
         dnf config-manager --set-enabled rt && \
         dnf clean all && rm -rf /var/cache/*