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

This reverts commit 623f2ce.
hpcc-systems · Jan 24, 2025 · e93f7f1 · e93f7f1
1 parent d1739d6
commit e93f7f1
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 18 deletions.
diff --git a/dockerfiles/vcpkg/amazonlinux.dockerfile b/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"]
diff --git a/dockerfiles/vcpkg/centos-7-rh-python38.dockerfile b/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"]

diff --git a/dockerfiles/vcpkg/centos-7.dockerfile b/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"]
diff --git a/dockerfiles/vcpkg/centos-8.dockerfile b/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"]
diff --git a/vcpkg b/vcpkg
+0 −1		.dockerignore
+10 −4		.github/workflows/ReceivePR.yml
+3 −1		.github/workflows/prebuild-docker.yml
+13 −1		.github/workflows/prebuild-gh_envs.yml
+0 −44		dockerfiles/CentOS-Base.repo
+4 −4		dockerfiles/build.sh
+5 −5		dockerfiles/centos-7.dockerfile
+1 −4		dockerfiles/centos-8.dockerfile