From 25e1626bdb656c2d5dd6644a994282f52b27f05e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 12 Jul 2019 09:13:57 +0200
Subject: [PATCH] [docker] Added libglu1-mesa-dev to gui image, Conan 1.17.0
---
scripts/docker/Dockerfile.clang.full | 4 ++--
scripts/docker/Dockerfile.gcc.full | 4 ++--
scripts/docker/Dockerfile.gcc.gui | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full
index bb717036bd4..6268af2eb12 100644
--- a/scripts/docker/Dockerfile.clang.full
+++ b/scripts/docker/Dockerfile.clang.full
@@ -73,12 +73,12 @@ RUN apt-get update -y && \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
-RUN pip3 install conan==1.16.0
+RUN pip3 install conan==1.17.0
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.16.0
+ org.opengeosys.pm.conan.version=1.17.0
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 265e52383a7..52b786901d6 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -66,12 +66,12 @@ RUN apt-get update -y && \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
-RUN pip3 install conan==1.16.0
+RUN pip3 install conan==1.17.0
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.16.0
+ org.opengeosys.pm.conan.version=1.17.0
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 aff24b2d470..dcc34b8ebb8 100644
--- a/scripts/docker/Dockerfile.gcc.gui
+++ b/scripts/docker/Dockerfile.gcc.gui
@@ -61,6 +61,7 @@ RUN apt-get update && \
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libgl1-mesa-dev \
+ libglu1-mesa-dev \
libxt-dev \
mesa-common-dev && \
rm -rf /var/lib/apt/lists/*
@@ -73,12 +74,12 @@ RUN apt-get update -y && \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
-RUN pip3 install conan==1.16.0
+RUN pip3 install conan==1.17.0
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.16.0
+ org.opengeosys.pm.conan.version=1.17.0
LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# cppcheck version 1.87
--
GitLab