From bdaa02e83eda8f55fbde589d60d38eef16562d32 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 24 Jan 2025 08:03:04 +0000 Subject: [PATCH] Revert "HPCC-33262 Ensure rpm-build is available in CentOS 7 builds" This reverts commit 305d7e651222dd6d47b170809457bfac61c120a8. --- dockerfiles/vcpkg/amazonlinux.dockerfile | 4 ---- dockerfiles/vcpkg/centos-7.dockerfile | 4 ---- dockerfiles/vcpkg/centos-8.dockerfile | 4 ---- vcpkg | 2 +- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/dockerfiles/vcpkg/amazonlinux.dockerfile b/dockerfiles/vcpkg/amazonlinux.dockerfile index 611624825e4..fb839a05198 100644 --- 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"] \ No newline at end of file diff --git a/dockerfiles/vcpkg/centos-7.dockerfile b/dockerfiles/vcpkg/centos-7.dockerfile index 7710004b72f..4b9cc79cd4e 100644 --- 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"] \ No newline at end of file diff --git a/dockerfiles/vcpkg/centos-8.dockerfile b/dockerfiles/vcpkg/centos-8.dockerfile index 55d6e30e457..108398a2711 100644 --- 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"] \ No newline at end of file diff --git a/vcpkg b/vcpkg index 2840b572362..1376f1b0682 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 2840b572362aef554fd054ea0eae05b7808a6819 +Subproject commit 1376f1b06824b6b154cde5448f42902aecb7223b