Merge pull request #19455 from GordonSmith/HPCC-33262-CENTOS7_BUILD_R…

…PM_REVERT_9_6

Revert "HPCC-33262 Ensure rpm-build is available in CentOS 7 builds"

dockerfiles/vcpkg/amazonlinux.dockerfile

@@ -1,10 +1,6 @@
 ARG VCPKG_REF=latest
 FROM hpccsystems/platform-build-base-amazonlinux:$VCPKG_REF
 
-RUN yum install -y \
-    rpm-build && \
-    yum -y clean all && rm -rf /var/cache 
-
 ENTRYPOINT ["/bin/bash", "--login", "-c"]
 
 CMD ["/bin/bash"]

dockerfiles/vcpkg/centos-7-rh-python38.dockerfile

@@ -2,11 +2,8 @@ ARG VCPKG_REF=latest
 FROM hpccsystems/platform-build-base-centos-7:$VCPKG_REF
 
 RUN yum remove -y python3 python3-devel && \
-    yum install -y \
-    rh-python38 \
-    rh-python38-python-devel \
-    rpm-build && \
-    yum -y clean all && rm -rf /var/cache 
+    yum install -y rh-python38 rh-python38-python-devel && \
+    yum clean all
 
 RUN echo "source /opt/rh/rh-python38/enable" >> /etc/bashrc
 SHELL ["/bin/bash", "--login", "-c"]

dockerfiles/vcpkg/centos-7.dockerfile

@@ -1,10 +1,6 @@
 ARG VCPKG_REF=latest
 FROM hpccsystems/platform-build-base-centos-7:$VCPKG_REF
 
-RUN yum install -y \
-    rpm-build && \
-    yum -y clean all && rm -rf /var/cache 
-
 ENTRYPOINT ["/bin/bash", "--login", "-c"]
 
 CMD ["/bin/bash"]

dockerfiles/vcpkg/centos-8.dockerfile

@@ -1,10 +1,6 @@
 ARG VCPKG_REF=latest
 FROM hpccsystems/platform-build-base-centos-8:$VCPKG_REF
 
-RUN yum install -y \
-    rpm-build && \
-    yum -y clean all && rm -rf /var/cache 
-
 ENTRYPOINT ["/bin/bash", "--login", "-c"]
 
 CMD ["/bin/bash"]

dockerfiles/vcpkg/rockylinux-8.dockerfile

@@ -1,10 +1,10 @@
 ARG VCPKG_REF=latest
 FROM hpccsystems/platform-build-base-rockylinux-8:$VCPKG_REF
 
+ENTRYPOINT ["/bin/bash", "--login", "-c"]
+
 RUN yum install -y \
     rpm-build && \
     yum -y clean all && rm -rf /var/cache 
 
-ENTRYPOINT ["/bin/bash", "--login", "-c"]
-
 CMD ["/bin/bash"]