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

This reverts commit 305d7e6.
hpcc-systems · Jan 24, 2025 · bdaa02e · bdaa02e
1 parent e087520
commit bdaa02e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 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.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
+10 −4		.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