From 3799d442ad56088cb1988f23242fbe7de722425d Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 12 Apr 2018 21:16:49 +0200
Subject: [PATCH] [Jenkins] Updated Conan in Dockerfiles to 1.2.3.
---
scripts/docker/Dockerfile.clang.full | 2 +-
scripts/docker/Dockerfile.clang.minimal | 2 +-
scripts/docker/Dockerfile.gcc.full | 2 +-
scripts/docker/Dockerfile.gcc.minimal | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full
index 6d643bdee44..da87520732f 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.0.0
+ && python -m pip install cmake conan>=1.2.3
# 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 3cfd2782d40..ff3fb9bada8 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.0.0
+ && python -m pip install cmake conan>=1.2.3
# 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 ca68bce01ff..67c0aa4d8f5 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>=1.0.0
+ && python -m pip install cmake conan>=1.2.3
# 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 5c0147cbd5f..4f68769e5f6 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.0.0
+ && python -m pip install cmake conan>=1.2.3
# Ninja
RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \
--
GitLab