chore: Force rebuild of centos-7 nuget packages

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
hpcc-systems · Sep 20, 2024 · c76ccf7 · c76ccf7
1 parent 70ea56a
commit c76ccf7
Showing 1 changed file with 1 addition and 108 deletions.
diff --git a/dockerfiles/centos-7.dockerfile b/dockerfiles/centos-7.dockerfile
@@ -1,93 +1,4 @@
-FROM centos:centos7.9.2009 AS base_build
-
-# Build Tools  ---
-RUN yum update -y && yum install -y \
-    centos-release-scl \
-    https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm && \
-    yum group install -y "Development Tools" && yum install -y \
-    autoconf \
-    autoconf-archive \
-    automake \
-    curl \
-    git \
-    kernel-devel \
-    libtool \
-    perl-IPC-Cmd \
-    python3 \
-    tar \
-    unzip \
-    yum-utils \
-    zip && \
-    yum -y clean all && rm -rf /var/cache
-
-RUN yum install -y devtoolset-11
-
-RUN echo "source /opt/rh/devtoolset-11/enable" >> /etc/bashrc
-SHELL ["/bin/bash", "--login", "-c"]
-
-RUN curl -o pkg-config-0.29.2.tar.gz https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz && \
-    tar xvfz pkg-config-0.29.2.tar.gz
-WORKDIR /pkg-config-0.29.2
-RUN ./configure --prefix=/usr/local/pkg_config/0_29_2 --with-internal-glib && \
-    make && \
-    make install && \
-    ln -s /usr/local/pkg_config/0_29_2/bin/pkg-config /usr/local/bin/ && \
-    mkdir /usr/local/share/aclocal && \
-    ln -s /usr/local/pkg_config/0_29_2/share/aclocal/pkg.m4 /usr/local/share/aclocal/
-
-ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig
-ENV ACLOCAL_PATH=$ACLOCAL_PATH:/usr/local/share/aclocal
-
-RUN curl -o autoconf-2.71.tar.gz https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz && \
-    gunzip autoconf-2.71.tar.gz && \
-    tar xvf autoconf-2.71.tar && \
-    cd autoconf-2.71 && \
-    ./configure && \
-    make && \
-    make install
-
-RUN curl -o autoconf-archive-2021.02.19.tar.xz https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz && \
-    xz -d -v autoconf-archive-2021.02.19.tar.xz && \
-    tar xvf autoconf-archive-2021.02.19.tar && \
-    cd autoconf-archive-2021.02.19 && \
-    ./configure && \
-    make && \
-    make install
-
-RUN curl -o automake-1.16.5.tar.gz https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz && \
-    tar xvzf automake-1.16.5.tar.gz && \
-    cd automake-1.16.5 && \
-    ./configure && \
-    make && \
-    make install
-
-RUN curl -o libtool-2.4.6.tar.gz https://ftp.jaist.ac.jp/pub/GNU/libtool/libtool-2.4.6.tar.gz && \
-    tar xvfz libtool-2.4.6.tar.gz && \
-    cd libtool-2.4.6 && \
-    ./configure --prefix=/usr/local/libtool/2_4_6 && \
-    make && \
-    make install
-
-RUN ln -s /usr/local/libtool/2_4_6/bin/libtool /usr/local/bin/ && \
-    ln -s /usr/local/libtool/2_4_6/bin/libtoolize /usr/local/bin/ && \
-    ln -s /usr/local/libtool/2_4_6/include/libltdl /usr/local/include/ && \
-    ln -s /usr/local/libtool/2_4_6/include/ltdl.h /usr/local/include/ && \
-    ln -s /usr/local/libtool/2_4_6/lib/libltdl.a /usr/local/lib/ && \
-    ln -s /usr/local/libtool/2_4_6/lib/libltdl.la /usr/local/lib/ && \
-    ln -s /usr/local/libtool/2_4_6/lib/libltdl.so /usr/local/lib/ && \
-    ln -s /usr/local/libtool/2_4_6/lib/libltdl.so.7 /usr/local/lib/ && \
-    ln -s /usr/local/libtool/2_4_6/lib/libltdl.so.7.3.1 /usr/local/lib/ && \
-    ln -s /usr/local/libtool/2_4_6/share/aclocal/libtool.m4 /usr/local/share/aclocal/ && \
-    ln -s /usr/local/libtool/2_4_6/share/aclocal/ltargz.m4 /usr/local/share/aclocal/ && \
-    ln -s /usr/local/libtool/2_4_6/share/aclocal/ltdl.m4 /usr/local/share/aclocal/ && \
-    ln -s /usr/local/libtool/2_4_6/share/aclocal/lt~obsolete.m4 /usr/local/share/aclocal/ && \
-    ln -s /usr/local/libtool/2_4_6/share/aclocal/ltoptions.m4 /usr/local/share/aclocal/ && \
-    ln -s /usr/local/libtool/2_4_6/share/aclocal/ltsugar.m4 /usr/local/share/aclocal/ && \
-    ln -s /usr/local/libtool/2_4_6/share/aclocal/ltversion.m4 /usr/local/share/aclocal/ 
-
-# echo /usr/local/lib > /etc/ld.so.conf.d/usr_local_lib.conf
-# ldconfig
-# ldconfig -v
+FROM platform-build-base-centos-7:hpcc-platform-9.8.x AS base_build
 
 FROM base_build AS vcpkg_build
 
@@ -140,24 +51,6 @@ RUN cp -r $(dirname $(dirname `./vcpkg fetch node | tail -n 1`))/* /hpcc-dev/too
 
 FROM base_build
 
-RUN yum makecache && yum install -y \
-    epel-release \
-    java-11-openjdk-devel \
-    python3-devel \
-    wget && \
-    yum update -y && yum install -y \
-    ccache \
-    R-core-devel && \
-    yum -y clean all && rm -rf /var/cache
-
-ENV Rcpp_package=Rcpp_0.12.19.tar.gz
-ENV RInside_package=RInside_0.2.12.tar.gz
-
-RUN wget https://cran.r-project.org/src/contrib/Archive/Rcpp/${Rcpp_package} && \
-    wget https://cran.r-project.org/src/contrib/Archive/RInside/${RInside_package} && \
-    R CMD INSTALL ${Rcpp_package} ${RInside_package} && \
-    rm -f ${Rcpp_package} ${RInside_package}
-
 WORKDIR /hpcc-dev
 
 COPY --from=vcpkg_build /hpcc-dev/build/vcpkg_installed /hpcc-dev/vcpkg_installed