Merge pull request #16028 from stevekuznetsov/skuznets/remove-epel-fr…

…om-dockerfiles Automatic merge from submit-queue (batch tested with PRs 16054, 16057, 15440, 16028, 16055) Remove EPEL from our base images
openshift · Aug 31, 2017 · 9078128 · 9078128
2 parents 23933d6 + fe50627
commit 9078128
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
@@ -6,7 +6,7 @@
 #
 FROM openshift/origin-source
 
-RUN INSTALL_PKGS="bsdtar ceph-common device-mapper device-mapper-persistent-data e2fsprogs epel-release ethtool findutils git hostname iptables lsof nmap-ncat socat sysvinit-tools tar tree util-linux wget which xfsprogs" && \
+RUN INSTALL_PKGS="bsdtar ceph-common device-mapper device-mapper-persistent-data e2fsprogs ethtool findutils git hostname iptables lsof nmap-ncat socat sysvinit-tools tar tree util-linux wget which xfsprogs" && \
     yum install -y ${INSTALL_PKGS} && \
     rpm -V ${INSTALL_PKGS} && \
     yum clean all && \

diff --git a/images/base/Dockerfile.centos7 b/images/base/Dockerfile.centos7
@@ -6,7 +6,7 @@
 #
 FROM openshift/origin-source
 
-RUN INSTALL_PKGS="bsdtar ceph-common device-mapper device-mapper-persistent-data e2fsprogs epel-release ethtool findutils git hostname iptables lsof nmap-ncat socat sysvinit-tools tar tree util-linux wget which xfsprogs" && \
+RUN INSTALL_PKGS="bsdtar ceph-common device-mapper device-mapper-persistent-data e2fsprogs ethtool findutils git hostname iptables lsof nmap-ncat socat sysvinit-tools tar tree util-linux wget which xfsprogs" && \
     yum --disablerepo=origin-local-release install -y ${INSTALL_PKGS} && \
     rpm -V ${INSTALL_PKGS} && \
     yum clean all && \