From de1d6b9681dc88a10fd4a69944025f764b185418 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 8 Jan 2018 10:33:02 +0100
Subject: [PATCH] [Jenkins] Force re-installation of Conan sysreqs on Docker.
---
Jenkinsfile | 2 ++
scripts/docker/Dockerfile.gcc.minimal | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d8d547fcbb2..406d17526bb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,6 +23,8 @@ pipeline {
}
steps {
script {
+ //conanClearSysreqs // see https://github.com/conan-io/conan/issues/2262
+ sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;'
configure {
cmakeOptions =
'-DOGS_USE_CONAN=ON ' +
diff --git a/scripts/docker/Dockerfile.gcc.minimal b/scripts/docker/Dockerfile.gcc.minimal
index 29adf2082cc..3b14b97d0cc 100644
--- a/scripts/docker/Dockerfile.gcc.minimal
+++ b/scripts/docker/Dockerfile.gcc.minimal
@@ -31,10 +31,6 @@ RUN adduser --uid 500 --disabled-password --gecos "" jenkins \
# Set password for the jenkins user (you may want to alter this).
&& echo "jenkins:jenkins" | chpasswd
-# Is handled by VTK with x11=True but does not work when conan cache is shared
-# between container, see https://github.com/conan-io/conan/issues/2262
-RUN apt-get -y install libsm-dev libx11-dev libxext-dev libxt-dev libglu1-mesa-dev
-
USER jenkins
ENV CCACHE_DIR=/home/jenkins/cache/ccache
RUN mkdir -p $CCACHE_DIR
--
GitLab