From f7d063d3908ed7d2503b7bedfc224133ba7f837e Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Fri, 24 Apr 2026 22:41:14 -0400
Subject: [PATCH] yum.conf: omit docs, weak deps

---
 base/Dockerfile         | 2 ++
 base/Dockerfile.centos7 | 2 ++
 base/Dockerfile.rhel    | 4 +++-
 base/Dockerfile.rhel7   | 2 ++
 base/Dockerfile.rhel9   | 7 ++++---
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 8fff0c382..33731fe6a 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -13,6 +13,8 @@ RUN INSTALL_PKGS=" \
       iproute \
       " && \
     echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
+    echo 'install_weak_deps=0' >> /etc/yum.conf && \
+    echo 'tsflags=nodocs' >> /etc/yum.conf && \
     yum install -y ${INSTALL_PKGS} && \
     yum clean all && \
     mkdir -p /var/lib/origin
diff --git a/base/Dockerfile.centos7 b/base/Dockerfile.centos7
index d5c46dc9a..1deee405e 100644
--- a/base/Dockerfile.centos7
+++ b/base/Dockerfile.centos7
@@ -12,6 +12,8 @@ RUN INSTALL_PKGS=" \
       iproute \
       " && \
     echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
+    echo 'install_weak_deps=0' >> /etc/yum.conf && \
+    echo 'tsflags=nodocs' >> /etc/yum.conf && \
     yum install -y ${INSTALL_PKGS} && \
     yum clean all && \
     mkdir -p /var/lib/origin
diff --git a/base/Dockerfile.rhel b/base/Dockerfile.rhel
index 225e8988e..00521781f 100644
--- a/base/Dockerfile.rhel
+++ b/base/Dockerfile.rhel
@@ -15,7 +15,9 @@ 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} && \
+    echo 'install_weak_deps=0' >> /etc/yum.conf && \
+    echo 'tsflags=nodocs' >> /etc/yum.conf && \
+    yum install -y ${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.rhel7 b/base/Dockerfile.rhel7
index 97e4f7474..6997ca3aa 100644
--- a/base/Dockerfile.rhel7
+++ b/base/Dockerfile.rhel7
@@ -12,6 +12,8 @@ RUN INSTALL_PKGS=" \
       iproute \
       " && \
     echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
+    echo 'install_weak_deps=0' >> /etc/yum.conf && \
+    echo 'tsflags=nodocs' >> /etc/yum.conf && \
     yum --disablerepo=origin-local-release install -y $INSTALL_PKGS && \
     yum clean all && \
     mkdir -p /var/lib/origin
diff --git a/base/Dockerfile.rhel9 b/base/Dockerfile.rhel9
index f5dee2077..25df6c5cc 100644
--- a/base/Dockerfile.rhel9
+++ b/base/Dockerfile.rhel9
@@ -13,21 +13,22 @@ RUN INSTALL_PKGS=" \
       python-unversioned-command util-linux" && \
     echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
     echo 'install_weak_deps=0' >> /etc/yum.conf && \
-    dnf install -y --nodocs ${INSTALL_PKGS} && \
+    echo 'tsflags=nodocs' >> /etc/yum.conf && \
+    dnf install -y ${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" && \
     [ "${VERSION_ID}" = "9" ] && INSTALL_PKGS="${INSTALL_PKGS} centos-release-openstack-zed"; \
-    dnf install -y --nodocs --setopt=install_weak_deps=False ${INSTALL_PKGS} && \
+    dnf install -y ${INSTALL_PKGS} && \
         dnf config-manager --set-enabled rt && \
         dnf clean all && rm -rf /var/cache/*; \
     [ "${VERSION_ID}" = "10" ] && \
         curl -o /etc/yum.repos.d/delorean.repo https://trunk.rdoproject.org/centos10-master/podified-ci-testing/delorean.repo && \
         curl -o /etc/yum.repos.d/delorean-deps.repo https://trunk.rdoproject.org/centos10-master/delorean-deps.repo && \
         # gpgme removed from ubi10-minimal, was in ubi9-minimal required by all builds with github.com/proglottis/gpgme
-        dnf install -y --nodocs --setopt=install_weak_deps=False gpgme && \
+        dnf install -y gpgme && \
         dnf clean all && rm -rf /var/cache/* || true
 
 # Enable x509 common name matching for golang 1.15 and beyond.