always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/docker: Fix CMake version

Browse Source 
need at least 3.18
This commit is contained in:
Corentin Le Molgat
2022-03-04 16:00:39 +01:00
parent bc598dda01
commit a3ef28e824
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/docker/amd64/opensuse-leap.Dockerfile
View File

@@ -6,12 +6,18 @@ LABEL maintainer="corentinl@google.com"
ENV PATH=/usr/local/bin:$PATH
RUN zypper update -y \
&& zypper install -y git gcc11 gcc11-c++ cmake \
wget which lsb-release util-linux pkgconfig autoconf libtool zlib-devel \
wget which lsb-release util-linux pkgconfig autoconf libtool gzip zlib-devel \
&& zypper clean -a
ENV CC=gcc-11 CXX=g++-11
ENTRYPOINT ["/usr/bin/bash", "-c"]
CMD ["/usr/bin/bash"]
# Install CMake 3.21.1
RUN wget -q "https://cmake.org/files/v3.21/cmake-3.21.1-linux-x86_64.sh" \
&& chmod a+x cmake-3.21.1-linux-x86_64.sh \
&& ./cmake-3.21.1-linux-x86_64.sh --prefix=/usr/local/ --skip-license \
&& rm cmake-3.21.1-linux-x86_64.sh
# Swig Install
RUN zypper update -y \
&& zypper install -y swig \

6
tools/docker/amd64/ubuntu-20.04.Dockerfile
View File

@@ -23,6 +23,12 @@ ENV CC=gcc-11 CXX=g++-11
ENTRYPOINT ["/bin/bash", "-c"]
CMD ["/bin/bash"]
# Install CMake 3.21.1
RUN wget -q "https://cmake.org/files/v3.21/cmake-3.21.1-linux-x86_64.sh" \
&& chmod a+x cmake-3.21.1-linux-x86_64.sh \
&& ./cmake-3.21.1-linux-x86_64.sh --prefix=/usr/local/ --skip-license \
&& rm cmake-3.21.1-linux-x86_64.sh
# Swig Install
RUN apt-get update -qq \
&& apt-get install -yq swig \