diff --git a/cmake/docker/centos/Dockerfile b/cmake/docker/centos/Dockerfile index bd5937e064..fcdfee2973 100644 --- a/cmake/docker/centos/Dockerfile +++ b/cmake/docker/centos/Dockerfile @@ -19,11 +19,11 @@ RUN dnf -y update \ RUN echo "source /opt/rh/gcc-toolset-11/enable" >> /etc/bashrc SHELL ["/bin/bash", "--login", "-c"] -# Install CMake 3.25.2 -RUN wget -q "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/local/ --skip-license \ -&& rm cmake-3.25.2-linux-x86_64.sh +# Install CMake 3.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 \ +&& rm cmake-3.26.4-linux-x86_64.sh CMD [ "/usr/bin/bash" ] # Install SWIG 4.1.1 diff --git a/cmake/docker/centos/python.Dockerfile b/cmake/docker/centos/python.Dockerfile index c6a2cc3e01..efc808d654 100644 --- a/cmake/docker/centos/python.Dockerfile +++ b/cmake/docker/centos/python.Dockerfile @@ -1,9 +1,10 @@ FROM ortools/cmake:centos_swig AS env ENV PATH=/root/.local/bin:$PATH RUN dnf -y update \ -&& dnf -y install python39-devel python39-numpy \ +&& dnf -y install python3.11-devel python3.11-numpy \ && dnf clean all \ && rm -rf /var/cache/dnf +RUN python3.11 -m pip install absl-py mypy-protobuf pandas FROM env AS devel WORKDIR /home/project diff --git a/makefiles/docker/centos/Dockerfile b/makefiles/docker/centos/Dockerfile index 48ff06f6a3..a48eb27631 100644 --- a/makefiles/docker/centos/Dockerfile +++ b/makefiles/docker/centos/Dockerfile @@ -20,11 +20,11 @@ RUN dnf -y update \ RUN echo "source /opt/rh/gcc-toolset-11/enable" >> /etc/bashrc SHELL ["/bin/bash", "--login", "-c"] -# Install CMake 3.25.2 -RUN wget -q "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/local/ --skip-license \ -&& rm cmake-3.25.2-linux-x86_64.sh +# Install CMake 3.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 \ +&& rm cmake-3.26.4-linux-x86_64.sh CMD [ "/usr/bin/bash" ] # Install SWIG 4.1.1 diff --git a/makefiles/docker/centos/python.Dockerfile b/makefiles/docker/centos/python.Dockerfile index ca82ace8c9..3bb4f8aa45 100644 --- a/makefiles/docker/centos/python.Dockerfile +++ b/makefiles/docker/centos/python.Dockerfile @@ -1,9 +1,9 @@ FROM ortools/make:centos_swig AS env RUN dnf -y update \ -&& dnf -y install python39-devel python39-numpy python39-pip \ +&& dnf -y install python3.11-devel python3.11-numpy python3.11-pip \ && dnf clean all \ && rm -rf /var/cache/dnf -RUN python3.9 -m pip install absl-py mypy-protobuf pandas +RUN python3.11 -m pip install absl-py mypy-protobuf pandas FROM env AS devel WORKDIR /home/project