From 56fc2fe49c0e1cfd10a83b00226b935ccee01c2c Mon Sep 17 00:00:00 2001 From: Chance Zibolski Date: Fri, 9 Aug 2019 14:10:21 -0700 Subject: [PATCH] base/*: Set skip_missing_names_on_install=0 in /etc/yum.conf Ensure yum install fails if a package is missing. --- base/Dockerfile | 2 +- base/Dockerfile.centos7 | 2 +- base/Dockerfile.rhel | 1 + base/Dockerfile.rhel7 | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index dde8ff0..2b43af4 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -11,8 +11,8 @@ RUN INSTALL_PKGS=" \ which tar wget hostname sysvinit-tools util-linux \ socat tree findutils lsof bind-utils shadow-utils \ " && \ + echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \ yum install -y ${INSTALL_PKGS} && \ - rpm -V ${INSTALL_PKGS} && \ yum clean all && \ mkdir -p /var/lib/origin diff --git a/base/Dockerfile.centos7 b/base/Dockerfile.centos7 index 502907f..ed2cc6a 100644 --- a/base/Dockerfile.centos7 +++ b/base/Dockerfile.centos7 @@ -10,8 +10,8 @@ RUN INSTALL_PKGS=" \ which tar wget hostname sysvinit-tools util-linux \ socat tree findutils lsof bind-utils shadow-utils \ " && \ + echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \ yum install -y ${INSTALL_PKGS} && \ - rpm -V ${INSTALL_PKGS} && \ yum clean all && \ mkdir -p /var/lib/origin diff --git a/base/Dockerfile.rhel b/base/Dockerfile.rhel index 77e8f95..18f13fb 100644 --- a/base/Dockerfile.rhel +++ b/base/Dockerfile.rhel @@ -5,6 +5,7 @@ RUN INSTALL_PKGS=" \ procps-ng rsync \ " && \ 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 ${INSTALL_PKGS} && \ yum clean all && rm -rf /var/cache/* LABEL io.k8s.display-name="OpenShift Base" \ diff --git a/base/Dockerfile.rhel7 b/base/Dockerfile.rhel7 index e7456fa..cbb0f3a 100644 --- a/base/Dockerfile.rhel7 +++ b/base/Dockerfile.rhel7 @@ -10,8 +10,8 @@ RUN INSTALL_PKGS=" \ which tar wget hostname sysvinit-tools util-linux \ socat tree findutils lsof bind-utils shadow-utils \ " && \ + echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \ yum --disablerepo=origin-local-release install -y $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ yum clean all && \ mkdir -p /var/lib/origin