From bc52497bd0ce83fa48889e4e8aa04e924d27e671 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 8 Nov 2024 11:19:01 +0100 Subject: [PATCH] tools/release: use preinstalled cmake and swig --- tools/release/amd64.Dockerfile | 20 +------------------- tools/release/arm64.Dockerfile | 20 +------------------- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/tools/release/amd64.Dockerfile b/tools/release/amd64.Dockerfile index 7f0e7d6d00..c88283679c 100644 --- a/tools/release/amd64.Dockerfile +++ b/tools/release/amd64.Dockerfile @@ -3,6 +3,7 @@ #FROM quay.io/pypa/manylinux2014_x86_64:latest AS env # Use dnf FROM quay.io/pypa/manylinux_2_28_x86_64:latest AS env +# note: CMake 3.30.5 and SWIG 4.2.1 are already installed ############# ## SETUP ## @@ -19,25 +20,6 @@ RUN dnf -y update \ ENTRYPOINT ["/usr/bin/bash", "-c"] CMD ["/usr/bin/bash"] -# Install CMake 3.28.3 -RUN wget -q --no-check-certificate "https://cmake.org/files/v3.28/cmake-3.28.3-linux-x86_64.sh" \ -&& chmod a+x cmake-3.28.3-linux-x86_64.sh \ -&& ./cmake-3.28.3-linux-x86_64.sh --prefix=/usr --skip-license \ -&& rm cmake-3.28.3-linux-x86_64.sh - -# Install SWIG 4.2.1 -RUN curl --location-trusted \ - --remote-name "https://downloads.sourceforge.net/project/swig/swig/swig-4.2.1/swig-4.2.1.tar.gz" \ - -o swig-4.2.1.tar.gz \ -&& tar xvf swig-4.2.1.tar.gz \ -&& rm swig-4.2.1.tar.gz \ -&& cd swig-4.2.1 \ -&& ./configure --prefix=/usr \ -&& make -j 4 \ -&& make install \ -&& cd .. \ -&& rm -rf swig-4.2.1 - # Install .Net # see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install RUN wget -q "https://dot.net/v1/dotnet-install.sh" \ diff --git a/tools/release/arm64.Dockerfile b/tools/release/arm64.Dockerfile index dd4725a4f9..7a6466570a 100644 --- a/tools/release/arm64.Dockerfile +++ b/tools/release/arm64.Dockerfile @@ -6,6 +6,7 @@ #FROM quay.io/pypa/manylinux2014_aarch64:latest AS env # Use dnf FROM quay.io/pypa/manylinux_2_28_aarch64:latest AS env +# note: CMake 3.30.5 and SWIG 4.2.1 are already installed ############# ## SETUP ## @@ -22,25 +23,6 @@ RUN dnf -y update \ ENTRYPOINT ["/usr/bin/bash", "-c"] CMD ["/usr/bin/bash"] -# Install CMake 3.28.3 -RUN wget -q --no-check-certificate "https://cmake.org/files/v3.28/cmake-3.28.3-linux-aarch64.sh" \ -&& chmod a+x cmake-3.28.3-linux-aarch64.sh \ -&& ./cmake-3.28.3-linux-aarch64.sh --prefix=/usr --skip-license \ -&& rm cmake-3.28.3-linux-aarch64.sh - -# Install SWIG 4.2.1 -RUN curl --location-trusted \ - --remote-name "https://downloads.sourceforge.net/project/swig/swig/swig-4.2.1/swig-4.2.1.tar.gz" \ - -o swig-4.2.1.tar.gz \ -&& tar xvf swig-4.2.1.tar.gz \ -&& rm swig-4.2.1.tar.gz \ -&& cd swig-4.2.1 \ -&& ./configure --prefix=/usr \ -&& make -j 4 \ -&& make install \ -&& cd .. \ -&& rm -rf swig-4.2.1 - # Install .Net # see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install RUN wget -q "https://dot.net/v1/dotnet-install.sh" \