From bca1d60b04eb2bf9ec13c49a5c87f2c8183e46bc Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 10 Jan 2018 16:52:06 +0100
Subject: [PATCH] [Docker] Bump Conan version.
---
scripts/docker/Dockerfile.clang.minimal | 2 +-
scripts/docker/Dockerfile.gcc.full | 2 +-
scripts/docker/Dockerfile.gcc.minimal | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/docker/Dockerfile.clang.minimal b/scripts/docker/Dockerfile.clang.minimal
index 63b9d0a3f35..4cf5a8dc52c 100644
--- a/scripts/docker/Dockerfile.clang.minimal
+++ b/scripts/docker/Dockerfile.clang.minimal
@@ -14,7 +14,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
+ && python -m pip install cmake conan>=1.0.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 ab95673d4cc..e49359c53dc 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -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
+ && python -m pip install cmake conan>=1.0.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 3b14b97d0cc..5c0147cbd5f 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
+ && python -m pip install cmake conan>=1.0.0
# Ninja
RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \
--
GitLab