Merge pull request #20 from openshift-cherrypick-robot/cherry-pick-19…

…-to-release-4.5 [release-4.5] Bug 1851390: Add iproute package to get `ss` tool for port wait
openshift · Jul 13, 2020 · f8e4212 · f8e4212
2 parents 6cdb5d3 + 3082e3b
commit f8e4212
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -10,6 +10,7 @@ COPY *.repo /etc/yum.repos.d/
 RUN INSTALL_PKGS=" \
       which tar wget hostname sysvinit-tools util-linux \
       socat tree findutils lsof bind-utils shadow-utils \
+      iproute \
       " && \
     echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
     yum install -y ${INSTALL_PKGS} && \

diff --git a/base/Dockerfile.centos7 b/base/Dockerfile.centos7
@@ -9,6 +9,7 @@ FROM openshift/origin-source
 RUN INSTALL_PKGS=" \
       which tar wget hostname sysvinit-tools util-linux \
       socat tree findutils lsof bind-utils shadow-utils \
+      iproute \
       " && \
     echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
     yum install -y ${INSTALL_PKGS} && \

diff --git a/base/Dockerfile.rhel b/base/Dockerfile.rhel
@@ -2,7 +2,7 @@ FROM registry.access.redhat.com/ubi7/ubi-minimal:latest
 RUN INSTALL_PKGS=" \
       which tar wget hostname shadow-utils \
       socat findutils lsof bind-utils gzip \
-      procps-ng rsync \
+      procps-ng rsync iproute \
       " && \
     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 && \

diff --git a/base/Dockerfile.rhel7 b/base/Dockerfile.rhel7
@@ -9,6 +9,7 @@ FROM rhel7
 RUN INSTALL_PKGS=" \
       which tar wget hostname sysvinit-tools util-linux \
       socat tree findutils lsof bind-utils shadow-utils \
+      iproute \
       " && \
     echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
     yum --disablerepo=origin-local-release install -y $INSTALL_PKGS && \