From 663fec1131636df41823c58823972b38a3d0219f Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 5 Dec 2018 10:43:53 +0100
Subject: [PATCH] [Docker] Bumped Conan to 1.10.0
---
scripts/docker/Dockerfile.clang.full | 2 +-
scripts/docker/Dockerfile.clang.minimal | 2 +-
scripts/docker/Dockerfile.gcc.full | 6 +++---
scripts/docker/Dockerfile.gcc.minimal | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full
index be62d177c0f..417225bcec6 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 fa2d8914ef7..b6664aebc98 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 f02e9c37c76..78e87d9cff4 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 c35524627b3..8ce1c982609 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 \
--
GitLab