From 2726a58239e5c699b2764a668dda60929203b634 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 23 Sep 2019 10:00:47 +0200
Subject: [PATCH] [Docker] Update Conan to 1.18.5
Fixed in 1.18.5: https://github.com/conan-io/conan/issues/5780
---
scripts/docker/Dockerfile.clang.full | 4 ++--
scripts/docker/Dockerfile.gcc.full | 4 ++--
scripts/docker/Dockerfile.gcc.gui | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full
index 03bee48e030..43c19429c57 100644
--- a/scripts/docker/Dockerfile.clang.full
+++ b/scripts/docker/Dockerfile.clang.full
@@ -82,12 +82,12 @@ RUN apt-get update -y && \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
-RUN pip3 install conan==1.18.0
+RUN pip3 install conan==1.18.5
RUN mkdir -p /opt/conan && \
chmod 777 /opt/conan
ENV CONAN_USER_HOME=/opt/conan
LABEL org.opengeosys.pm=conan \
- org.opengeosys.pm.conan.version=1.18.0
+ org.opengeosys.pm.conan.version=1.18.5
LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# Include-what-you-use for clang version 7
diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full
index efd77f6c985..80346963eea 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -75,12 +75,12 @@ RUN apt-get update -y && \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
-RUN pip3 install conan==1.18.0
+RUN pip3 install conan==1.18.5
RUN mkdir -p /opt/conan && \
chmod 777 /opt/conan
ENV CONAN_USER_HOME=/opt/conan
LABEL org.opengeosys.pm=conan \
- org.opengeosys.pm.conan.version=1.18.0
+ org.opengeosys.pm.conan.version=1.18.5
LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# cppcheck version 1.87
diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui
index ab968209ec4..5e71307df97 100644
--- a/scripts/docker/Dockerfile.gcc.gui
+++ b/scripts/docker/Dockerfile.gcc.gui
@@ -83,12 +83,12 @@ RUN apt-get update -y && \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
-RUN pip3 install conan==1.18.0
+RUN pip3 install conan==1.18.5
RUN mkdir -p /opt/conan && \
chmod 777 /opt/conan
ENV CONAN_USER_HOME=/opt/conan
LABEL org.opengeosys.pm=conan \
- org.opengeosys.pm.conan.version=1.18.0
+ org.opengeosys.pm.conan.version=1.18.5
LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# cppcheck version 1.87
--
GitLab