diff --git a/tools/docker/images/debian-12.Dockerfile b/tools/docker/images/debian-12.Dockerfile index da883df0ff..eed7fe1714 100644 --- a/tools/docker/images/debian-12.Dockerfile +++ b/tools/docker/images/debian-12.Dockerfile @@ -6,13 +6,20 @@ FROM debian:12 AS env ############# RUN apt-get update -qq \ && apt-get install -qq \ - git pkg-config wget cmake make autoconf libtool zlib1g-dev gawk g++ curl subversion \ + git pkg-config wget make autoconf libtool zlib1g-dev gawk g++ curl subversion \ swig lsb-release libicu-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] +# Install CMake 3.31.0 +RUN ARCH=$(uname -m) \ +&& wget -q "https://cmake.org/files/v3.31/cmake-3.31.0-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.31.0-linux-${ARCH}.sh \ +&& ./cmake-3.31.0-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.31.0-linux-${ARCH}.sh + # 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/docker/test/debian-12/cpp.Dockerfile b/tools/docker/test/debian-12/cpp.Dockerfile index 4627a05010..62125c5b69 100644 --- a/tools/docker/test/debian-12/cpp.Dockerfile +++ b/tools/docker/test/debian-12/cpp.Dockerfile @@ -2,12 +2,19 @@ FROM debian:12 RUN apt-get update \ -&& apt-get install -yq wget build-essential cmake zlib1g-dev \ +&& apt-get install -yq wget build-essential zlib1g-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENTRYPOINT ["/bin/bash", "-c"] CMD ["/bin/bash"] +# Install CMake 3.31.0 +RUN ARCH=$(uname -m) \ +&& wget -q "https://cmake.org/files/v3.31/cmake-3.31.0-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.31.0-linux-${ARCH}.sh \ +&& ./cmake-3.31.0-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.31.0-linux-${ARCH}.sh + WORKDIR /root ADD or-tools_amd64_debian-12_cpp_v*.tar.gz . diff --git a/tools/docker/test/ubuntu-22.04/cpp.Dockerfile b/tools/docker/test/ubuntu-22.04/cpp.Dockerfile index 01ca4b35f2..61f81f2413 100644 --- a/tools/docker/test/ubuntu-22.04/cpp.Dockerfile +++ b/tools/docker/test/ubuntu-22.04/cpp.Dockerfile @@ -3,10 +3,17 @@ FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -qq \ -&& apt-get install -yq build-essential cmake zlib1g-dev \ +&& apt-get install -yq build-essential zlib1g-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +# Install CMake 3.31.0 +RUN ARCH=$(uname -m) \ +&& wget -q "https://cmake.org/files/v3.31/cmake-3.31.0-linux-${ARCH}.sh" \ +&& chmod a+x cmake-3.31.0-linux-${ARCH}.sh \ +&& ./cmake-3.31.0-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \ +&& rm cmake-3.31.0-linux-${ARCH}.sh + WORKDIR /root ADD or-tools_amd64_ubuntu-22.04_cpp_v*.tar.gz .