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/dockerfiles/vcpkg/rockylinux-8.dockerfile b/dockerfiles/vcpkg/rockylinux-8.dockerfile index 17c76d889b3..91e189d2734 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 ddf0c6df807..215af089be1 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit ddf0c6df807a454c74f33d7ba75037314bf9a79c +Subproject commit 215af089be1c1ffcca5b4fdffda55b85f15dd5f6