diff --git a/images/tools/Dockerfile b/images/tools/Dockerfile index d801fbc801..23a19771a4 100644 --- a/images/tools/Dockerfile +++ b/images/tools/Dockerfile @@ -7,7 +7,9 @@ FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/ COPY --from=builder /go/src/github.com/openshift/oc/images/tools/sos.conf /etc/sos/ RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done -RUN INSTALL_PKGS="\ +# iotop has been deprecated. iotop-c is used in CentOS 10 and upwards +RUN if yum list iotop >/dev/null 2>&1; then IOTOP_PKG="iotop"; else IOTOP_PKG="iotop-c"; fi && \ + INSTALL_PKGS="\ bash-completion \ bc \ bind-utils \ @@ -21,7 +23,7 @@ RUN INSTALL_PKGS="\ glibc-utils \ gzip \ hwloc \ - iotop \ + $IOTOP_PKG \ iproute \ iputils \ jq \