Skip to content

Commit

Permalink
Revert "HPCC-33262 Ensure rpm-build is available in CentOS 7 builds"
Browse files Browse the repository at this point in the history
This reverts commit a2d1a9b.
  • Loading branch information
GordonSmith committed Jan 24, 2025
1 parent c8ffc30 commit 1105ff7
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 19 deletions.
4 changes: 0 additions & 4 deletions dockerfiles/vcpkg/amazonlinux.dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
7 changes: 2 additions & 5 deletions dockerfiles/vcpkg/centos-7-rh-python38.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
4 changes: 0 additions & 4 deletions dockerfiles/vcpkg/centos-7.dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
4 changes: 0 additions & 4 deletions dockerfiles/vcpkg/centos-8.dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
4 changes: 2 additions & 2 deletions dockerfiles/vcpkg/rockylinux-8.dockerfile
Original file line number Diff line number Diff line change
@@ -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"]

0 comments on commit 1105ff7

Please sign in to comment.