From be1785d5ba344484863c2ec91e89ba824f427e46 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 24 Jan 2025 08:17:29 +0000 Subject: [PATCH] Revert "HPCC-33262 Ensure rpm-build is available in CentOS 7 builds" This reverts commit a2d1a9bf6fd308e619424b7e7189787d9a215963. --- dockerfiles/vcpkg/amazonlinux.dockerfile | 4 ---- dockerfiles/vcpkg/centos-7-rh-python38.dockerfile | 7 ++----- dockerfiles/vcpkg/centos-7.dockerfile | 4 ---- dockerfiles/vcpkg/centos-8.dockerfile | 4 ---- dockerfiles/vcpkg/rockylinux-8.dockerfile | 4 ++-- vcpkg | 2 +- 6 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dockerfiles/vcpkg/amazonlinux.dockerfile b/dockerfiles/vcpkg/amazonlinux.dockerfile index 0021c8c1308..c7ea3c4e138 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"] diff --git a/dockerfiles/vcpkg/centos-7-rh-python38.dockerfile b/dockerfiles/vcpkg/centos-7-rh-python38.dockerfile index 3db736b8289..8752d764d67 100644 --- 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 index 19ab3186f89..04d1ba29af5 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"] 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/dockerfiles/vcpkg/rockylinux-8.dockerfile b/dockerfiles/vcpkg/rockylinux-8.dockerfile index 91e189d2734..17c76d889b3 100644 --- a/dockerfiles/vcpkg/rockylinux-8.dockerfile +++ b/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"] diff --git a/vcpkg b/vcpkg index 215af089be1..ddf0c6df807 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 215af089be1c1ffcca5b4fdffda55b85f15dd5f6 +Subproject commit ddf0c6df807a454c74f33d7ba75037314bf9a79c