diff --git a/Jenkinsfile b/Jenkinsfile index d8d547fcbb2b0484151e9c2119dd36b2f519fe18..406d17526bb8a30edf50bbc82eed85d3230b9522 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 29adf2082cc1a5a7beed3fa858d822f0f412475b..3b14b97d0cc0ae910a8e9221a684c54148f9f7ac 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