From 502d6c29518c204516ab6c0442c61555c3f98ef6 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Tue, 18 Jul 2023 14:42:21 +0200 Subject: [PATCH] tools: Bump CMake 3.25.2 -> 3.26.4 --- tools/docker/images/centos-7.Dockerfile | 10 +++++----- tools/docker/images/centos-8.Dockerfile | 10 +++++----- tools/docker/images/debian-10.Dockerfile | 10 +++++----- tools/docker/images/debian-11.Dockerfile | 10 +++++----- tools/docker/images/opensuse-leap.Dockerfile | 10 +++++----- tools/docker/images/ubuntu-18.04.Dockerfile | 10 +++++----- tools/docker/images/ubuntu-20.04.Dockerfile | 10 +++++----- tools/docker/minizinc-challenge.Dockerfile | 2 +- tools/docker/python/amd64/manylinux.Dockerfile | 10 +++++----- tools/docker/python/arm64v8/manylinux.Dockerfile | 10 +++++----- tools/docker/test/centos-7/cpp.Dockerfile | 10 +++++----- tools/docker/test/centos-8/cpp.Dockerfile | 10 +++++----- tools/docker/test/debian-10/cpp.Dockerfile | 10 +++++----- tools/docker/test/debian-10/python.Dockerfile | 10 +++++----- tools/docker/test/debian-11/cpp.Dockerfile | 10 +++++----- tools/docker/test/debian-11/python.Dockerfile | 10 +++++----- tools/docker/test/opensuse-leap/cpp.Dockerfile | 10 +++++----- tools/docker/test/ubuntu-18.04/cpp.Dockerfile | 10 +++++----- tools/docker/test/ubuntu-20.04/cpp.Dockerfile | 10 +++++----- tools/release/amd64.Dockerfile | 10 +++++----- tools/release/arm64.Dockerfile | 10 +++++----- 21 files changed, 101 insertions(+), 101 deletions(-) diff --git a/tools/docker/images/centos-7.Dockerfile b/tools/docker/images/centos-7.Dockerfile index 613787a70c6..1197a00c3eb 100644 --- a/tools/docker/images/centos-7.Dockerfile +++ b/tools/docker/images/centos-7.Dockerfile @@ -24,12 +24,12 @@ ENTRYPOINT ["/usr/bin/bash", "--login", "-c"] CMD ["/usr/bin/bash", "--login"] # RUN g++ --version -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh # Install Swig 4.1.1 RUN curl --location-trusted \ diff --git a/tools/docker/images/centos-8.Dockerfile b/tools/docker/images/centos-8.Dockerfile index 032c258f0d8..ba963dee6f3 100644 --- a/tools/docker/images/centos-8.Dockerfile +++ b/tools/docker/images/centos-8.Dockerfile @@ -22,12 +22,12 @@ ENTRYPOINT ["/usr/bin/bash", "--login", "-c"] CMD ["/usr/bin/bash", "--login"] # RUN g++ --version -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh # Install Swig RUN dnf -y update \ diff --git a/tools/docker/images/debian-10.Dockerfile b/tools/docker/images/debian-10.Dockerfile index 9de6555332f..58b3079ae63 100644 --- a/tools/docker/images/debian-10.Dockerfile +++ b/tools/docker/images/debian-10.Dockerfile @@ -13,12 +13,12 @@ RUN apt-get update -qq \ ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh # Install .Net # see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-10- diff --git a/tools/docker/images/debian-11.Dockerfile b/tools/docker/images/debian-11.Dockerfile index 9b42faa2d1f..2376d8d0277 100644 --- a/tools/docker/images/debian-11.Dockerfile +++ b/tools/docker/images/debian-11.Dockerfile @@ -13,12 +13,12 @@ RUN apt-get update -qq \ ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh # Install .Net # see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-11- diff --git a/tools/docker/images/opensuse-leap.Dockerfile b/tools/docker/images/opensuse-leap.Dockerfile index 0ba303b8319..52614856ece 100644 --- a/tools/docker/images/opensuse-leap.Dockerfile +++ b/tools/docker/images/opensuse-leap.Dockerfile @@ -14,12 +14,12 @@ ENV CC=gcc-11 CXX=g++-11 ENTRYPOINT ["/usr/bin/bash", "-c"] CMD ["/usr/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh # Install SWIG RUN zypper refresh \ diff --git a/tools/docker/images/ubuntu-18.04.Dockerfile b/tools/docker/images/ubuntu-18.04.Dockerfile index 459e76b1949..b1cf3b80bba 100644 --- a/tools/docker/images/ubuntu-18.04.Dockerfile +++ b/tools/docker/images/ubuntu-18.04.Dockerfile @@ -20,12 +20,12 @@ ENV CC=gcc-11 CXX=g++-11 ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh # Install SWIG RUN apt-get update -qq \ diff --git a/tools/docker/images/ubuntu-20.04.Dockerfile b/tools/docker/images/ubuntu-20.04.Dockerfile index 5a9ffaa54a1..3c567ba88d5 100644 --- a/tools/docker/images/ubuntu-20.04.Dockerfile +++ b/tools/docker/images/ubuntu-20.04.Dockerfile @@ -13,12 +13,12 @@ RUN apt update -qq \ ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh # Install SWIG RUN apt-get update -qq \ diff --git a/tools/docker/minizinc-challenge.Dockerfile b/tools/docker/minizinc-challenge.Dockerfile index f82f2035ab6..16541103801 100644 --- a/tools/docker/minizinc-challenge.Dockerfile +++ b/tools/docker/minizinc-challenge.Dockerfile @@ -18,7 +18,7 @@ RUN apt update -qq \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENV CC=gcc-11 CXX=g++-11 -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-x86_64.sh" \ && chmod a+x cmake-3.26.4-linux-x86_64.sh \ && ./cmake-3.26.4-linux-x86_64.sh --prefix=/usr/local/ --skip-license \ diff --git a/tools/docker/python/amd64/manylinux.Dockerfile b/tools/docker/python/amd64/manylinux.Dockerfile index 7740198d41a..50b47cc7990 100644 --- a/tools/docker/python/amd64/manylinux.Dockerfile +++ b/tools/docker/python/amd64/manylinux.Dockerfile @@ -13,11 +13,11 @@ RUN yum -y update \ ENTRYPOINT ["/usr/bin/bash", "-c"] CMD ["/usr/bin/bash"] -# Install CMake 3.25.2 -RUN wget -q --no-check-certificate "https://cmake.org/files/v3.25/cmake-3.25.2-linux-x86_64.sh" \ -&& chmod a+x cmake-3.25.2-linux-x86_64.sh \ -&& ./cmake-3.25.2-linux-x86_64.sh --prefix=/usr --skip-license \ -&& rm cmake-3.25.2-linux-x86_64.sh +# Install CMake v3.26.4 +RUN wget -q --no-check-certificate "https://cmake.org/files/v3.26/cmake-3.26.4-linux-x86_64.sh" \ +&& chmod a+x cmake-3.26.4-linux-x86_64.sh \ +&& ./cmake-3.26.4-linux-x86_64.sh --prefix=/usr --skip-license \ +&& rm cmake-3.26.4-linux-x86_64.sh # Install Swig 4.1.1 RUN curl --location-trusted \ diff --git a/tools/docker/python/arm64v8/manylinux.Dockerfile b/tools/docker/python/arm64v8/manylinux.Dockerfile index a779e03d492..b20a9c742f4 100644 --- a/tools/docker/python/arm64v8/manylinux.Dockerfile +++ b/tools/docker/python/arm64v8/manylinux.Dockerfile @@ -15,11 +15,11 @@ RUN yum -y update \ ENTRYPOINT ["/usr/bin/bash", "-c"] CMD ["/usr/bin/bash"] -# Install CMake 3.25.2 -RUN wget -q --no-check-certificate "https://cmake.org/files/v3.25/cmake-3.25.2-linux-aarch64.sh" \ -&& chmod a+x cmake-3.25.2-linux-aarch64.sh \ -&& ./cmake-3.25.2-linux-aarch64.sh --prefix=/usr --skip-license \ -&& rm cmake-3.25.2-linux-aarch64.sh +# Install CMake v3.26.4 +RUN wget -q --no-check-certificate "https://cmake.org/files/v3.26/cmake-3.26.4-linux-aarch64.sh" \ +&& chmod a+x cmake-3.26.4-linux-aarch64.sh \ +&& ./cmake-3.26.4-linux-aarch64.sh --prefix=/usr --skip-license \ +&& rm cmake-3.26.4-linux-aarch64.sh # Install Swig 4.1.1 RUN curl --location-trusted \ diff --git a/tools/docker/test/centos-7/cpp.Dockerfile b/tools/docker/test/centos-7/cpp.Dockerfile index d8f5e8161ef..352ca8178bb 100644 --- a/tools/docker/test/centos-7/cpp.Dockerfile +++ b/tools/docker/test/centos-7/cpp.Dockerfile @@ -21,12 +21,12 @@ ENTRYPOINT ["/usr/bin/bash", "--login", "-c"] CMD ["/usr/bin/bash", "--login"] # RUN g++ --version -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh WORKDIR /root ADD or-tools_amd64_centos-7_cpp_v*.tar.gz . diff --git a/tools/docker/test/centos-8/cpp.Dockerfile b/tools/docker/test/centos-8/cpp.Dockerfile index bb4fe5511ba..7bbebe07615 100644 --- a/tools/docker/test/centos-8/cpp.Dockerfile +++ b/tools/docker/test/centos-8/cpp.Dockerfile @@ -19,12 +19,12 @@ ENTRYPOINT ["/usr/bin/bash", "--login", "-c"] CMD ["/usr/bin/bash", "--login"] # RUN g++ --version -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh WORKDIR /root ADD or-tools_amd64_centos-8_cpp_v*.tar.gz . diff --git a/tools/docker/test/debian-10/cpp.Dockerfile b/tools/docker/test/debian-10/cpp.Dockerfile index b90deccf4e4..55d853a582f 100644 --- a/tools/docker/test/debian-10/cpp.Dockerfile +++ b/tools/docker/test/debian-10/cpp.Dockerfile @@ -8,12 +8,12 @@ RUN apt-get update \ ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh WORKDIR /root ADD or-tools_amd64_debian-10_cpp_v*.tar.gz . diff --git a/tools/docker/test/debian-10/python.Dockerfile b/tools/docker/test/debian-10/python.Dockerfile index 2e0a619a03c..cc3bbbd28d3 100644 --- a/tools/docker/test/debian-10/python.Dockerfile +++ b/tools/docker/test/debian-10/python.Dockerfile @@ -8,12 +8,12 @@ RUN apt-get update \ ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh WORKDIR /root ADD or-tools_amd64_debian-10_python_v*.tar.gz . diff --git a/tools/docker/test/debian-11/cpp.Dockerfile b/tools/docker/test/debian-11/cpp.Dockerfile index 0959c03962e..d17571b3993 100644 --- a/tools/docker/test/debian-11/cpp.Dockerfile +++ b/tools/docker/test/debian-11/cpp.Dockerfile @@ -8,12 +8,12 @@ RUN apt-get update \ ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh WORKDIR /root ADD or-tools_amd64_debian-11_cpp_v*.tar.gz . diff --git a/tools/docker/test/debian-11/python.Dockerfile b/tools/docker/test/debian-11/python.Dockerfile index 7f767ce30a6..3fbabcdac6b 100644 --- a/tools/docker/test/debian-11/python.Dockerfile +++ b/tools/docker/test/debian-11/python.Dockerfile @@ -8,12 +8,12 @@ RUN apt-get update \ ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh WORKDIR /root ADD or-tools_amd64_debian-11_python_v*.tar.gz . diff --git a/tools/docker/test/opensuse-leap/cpp.Dockerfile b/tools/docker/test/opensuse-leap/cpp.Dockerfile index 363c17d657a..b8a6de69de8 100644 --- a/tools/docker/test/opensuse-leap/cpp.Dockerfile +++ b/tools/docker/test/opensuse-leap/cpp.Dockerfile @@ -12,12 +12,12 @@ ENV CC=gcc-11 CXX=g++-11 ENTRYPOINT ["/usr/bin/bash", "-c"] CMD ["/usr/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh WORKDIR /root ADD or-tools_amd64_opensuse-leap_cpp_v*.tar.gz . diff --git a/tools/docker/test/ubuntu-18.04/cpp.Dockerfile b/tools/docker/test/ubuntu-18.04/cpp.Dockerfile index 2567199783d..cee16412047 100644 --- a/tools/docker/test/ubuntu-18.04/cpp.Dockerfile +++ b/tools/docker/test/ubuntu-18.04/cpp.Dockerfile @@ -17,12 +17,12 @@ ENV CC=gcc-11 CXX=g++-11 ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh #ENV TZ=America/Los_Angeles #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/tools/docker/test/ubuntu-20.04/cpp.Dockerfile b/tools/docker/test/ubuntu-20.04/cpp.Dockerfile index ca0e957277b..6c0e97455d3 100644 --- a/tools/docker/test/ubuntu-20.04/cpp.Dockerfile +++ b/tools/docker/test/ubuntu-20.04/cpp.Dockerfile @@ -9,12 +9,12 @@ RUN apt-get update \ ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] -# Install CMake 3.25.2 +# Install CMake v3.26.4 RUN ARCH=$(uname -m) \ -&& wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-${ARCH}.sh" \ -&& chmod a+x cmake-3.25.2-linux-${ARCH}.sh \ -&& ./cmake-3.25.2-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ -&& rm cmake-3.25.2-linux-${ARCH}.sh +&& wget -q "https://cmake.org/files/v3.26/cmake-3.26.4-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.26.4-linux-${ARCH}.sh \ +&& ./cmake-3.26.4-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.26.4-linux-${ARCH}.sh WORKDIR /root ADD or-tools_amd64_ubuntu-20.04_cpp_v*.tar.gz . diff --git a/tools/release/amd64.Dockerfile b/tools/release/amd64.Dockerfile index 59da7aacb71..995be6d789c 100644 --- a/tools/release/amd64.Dockerfile +++ b/tools/release/amd64.Dockerfile @@ -15,11 +15,11 @@ RUN yum -y update \ ENTRYPOINT ["/usr/bin/bash", "-c"] CMD ["/usr/bin/bash"] -# Install CMake 3.25.2 -RUN wget -q --no-check-certificate "https://cmake.org/files/v3.25/cmake-3.25.2-linux-x86_64.sh" \ -&& chmod a+x cmake-3.25.2-linux-x86_64.sh \ -&& ./cmake-3.25.2-linux-x86_64.sh --prefix=/usr --skip-license \ -&& rm cmake-3.25.2-linux-x86_64.sh +# Install CMake v3.26.4 +RUN wget -q --no-check-certificate "https://cmake.org/files/v3.26/cmake-3.26.4-linux-x86_64.sh" \ +&& chmod a+x cmake-3.26.4-linux-x86_64.sh \ +&& ./cmake-3.26.4-linux-x86_64.sh --prefix=/usr --skip-license \ +&& rm cmake-3.26.4-linux-x86_64.sh # Install Swig 4.1.1 RUN curl --location-trusted \ diff --git a/tools/release/arm64.Dockerfile b/tools/release/arm64.Dockerfile index dd1e2a6b967..11c8d725db6 100644 --- a/tools/release/arm64.Dockerfile +++ b/tools/release/arm64.Dockerfile @@ -22,11 +22,11 @@ RUN dnf -y update \ ENTRYPOINT ["/usr/bin/bash", "-c"] CMD ["/usr/bin/bash"] -# Install CMake 3.25.2 -RUN wget -q --no-check-certificate "https://cmake.org/files/v3.25/cmake-3.25.2-linux-aarch64.sh" \ -&& chmod a+x cmake-3.25.2-linux-aarch64.sh \ -&& ./cmake-3.25.2-linux-aarch64.sh --prefix=/usr --skip-license \ -&& rm cmake-3.25.2-linux-aarch64.sh +# Install CMake v3.26.4 +RUN wget -q --no-check-certificate "https://cmake.org/files/v3.26/cmake-3.26.4-linux-aarch64.sh" \ +&& chmod a+x cmake-3.26.4-linux-aarch64.sh \ +&& ./cmake-3.26.4-linux-aarch64.sh --prefix=/usr --skip-license \ +&& rm cmake-3.26.4-linux-aarch64.sh # Install Swig 4.1.1 RUN curl --location-trusted \