From 06027c4dabb5c452b0e5e2a3f1e3deef36f5d0cc Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 2 Jul 2018 13:16:09 +0200
Subject: [PATCH] [Jenkins] Updated Conan to 1.5.1 in Docker.
---
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 da87520732f..be62d177c0f 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.2.3
+ && python -m pip install cmake conan>=1.5.1
# 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 ff3fb9bada8..fa2d8914ef7 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.2.3
+ && python -m pip install cmake conan>=1.5.1
# 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 5574b5c6db8..2fc700247fa 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.2.3
+ && python -m pip install cmake conan>=1.5.1
# 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 4f68769e5f6..c35524627b3 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.2.3
+ && python -m pip install cmake conan>=1.5.1
# Ninja
RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \
--
GitLab