diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full index be62d177c0f7e205dc346289b2591288096a5f65..417225bcec60d2190801afcd5168f75dca244e98 100644 --- a/scripts/docker/Dockerfile.clang.full +++ b/scripts/docker/Dockerfile.clang.full @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y software-properties-common curl \ xz-utils RUN python -m pip install --upgrade pip \ - && python -m pip install cmake conan>=1.5.1 + && python -m pip install cmake conan>=1.10.0 # Ninja RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \ diff --git a/scripts/docker/Dockerfile.clang.minimal b/scripts/docker/Dockerfile.clang.minimal index fa2d8914ef7162ddabf48d6c4ce427caee41ce3c..b6664aebc9873393afb6bb6f3dd87da00f7695a2 100644 --- a/scripts/docker/Dockerfile.clang.minimal +++ b/scripts/docker/Dockerfile.clang.minimal @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y software-properties-common curl \ xz-utils RUN python -m pip install --upgrade pip \ - && python -m pip install cmake conan>=1.5.1 + && python -m pip install cmake conan>=1.10.0 # Ninja RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \ diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full index f02e9c37c765fa350cf5ac5c853b7eec10062556..78e87d9cff489a41943632080ee5d08c6f00b5cc 100644 --- a/scripts/docker/Dockerfile.gcc.full +++ b/scripts/docker/Dockerfile.gcc.full @@ -8,15 +8,15 @@ RUN apt-get update && apt-get install -y software-properties-common curl \ ccache \ gcc-4.9 g++-4.9 gcc-4.9-base \ git git-lfs \ - python-pip \ + python3-pip \ sudo \ unzip ENV CC=gcc-4.9 ENV CXX=g++-4.9 -RUN python -m pip install --upgrade pip \ - && python -m pip install cmake conan>=1.5.1 +RUN python3 -m pip install --upgrade pip \ + && python3 -m pip install cmake conan>=1.10.0 # Ninja RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \ diff --git a/scripts/docker/Dockerfile.gcc.minimal b/scripts/docker/Dockerfile.gcc.minimal index c35524627b35b4128a2f07713598431fd5837c69..8ce1c9826099eebee0cf6d134b9415fe4ab9f222 100644 --- a/scripts/docker/Dockerfile.gcc.minimal +++ b/scripts/docker/Dockerfile.gcc.minimal @@ -16,7 +16,7 @@ ENV CC=gcc-4.9 ENV CXX=g++-4.9 RUN python -m pip install --upgrade pip \ - && python -m pip install cmake conan>=1.5.1 + && python -m pip install cmake conan>=1.10.0 # Ninja RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \