From 623f2ce92570fc23753841c756297adb9e6b44a3 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 16 Jan 2025 16:48:57 +0000 Subject: [PATCH] HPCC-33262 Ensure rpm-build is available in CentOS 7 builds Signed-off-by: Gordon Smith --- 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 ++++ vcpkg | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dockerfiles/vcpkg/amazonlinux.dockerfile b/dockerfiles/vcpkg/amazonlinux.dockerfile index c7ea3c4e138..0021c8c1308 100644 --- a/dockerfiles/vcpkg/amazonlinux.dockerfile +++ b/dockerfiles/vcpkg/amazonlinux.dockerfile @@ -1,6 +1,10 @@ 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 8752d764d67..3db736b8289 100644 --- a/dockerfiles/vcpkg/centos-7-rh-python38.dockerfile +++ b/dockerfiles/vcpkg/centos-7-rh-python38.dockerfile @@ -2,8 +2,11 @@ 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 && \ - yum clean all + yum install -y \ + rh-python38 \ + rh-python38-python-devel \ + rpm-build && \ + yum -y clean all && rm -rf /var/cache 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 04d1ba29af5..19ab3186f89 100644 --- a/dockerfiles/vcpkg/centos-7.dockerfile +++ b/dockerfiles/vcpkg/centos-7.dockerfile @@ -1,6 +1,10 @@ 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 108398a2711..55d6e30e457 100644 --- a/dockerfiles/vcpkg/centos-8.dockerfile +++ b/dockerfiles/vcpkg/centos-8.dockerfile @@ -1,6 +1,10 @@ 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 4f9147692bc..68065ce8737 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 4f9147692bc222e6f4a503f353e4f78a684e00ea +Subproject commit 68065ce87372beee7345991d4633f5069ed2d9ae