From 28ef11a030eea78bc16bb6034f6f41075d8d01c3 Mon Sep 17 00:00:00 2001 From: Whitney Armstrong <warmstrong@anl.gov> Date: Thu, 12 Mar 2020 15:12:58 -0400 Subject: [PATCH] Here we go again! what is wrong with genfit's install? --- CMakeLists.txt | 2 +- containers/docker/Dockerfile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4941138e3..73c7842f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ ## PROJECT: hallac_container ################################################################################ cmake_minimum_required (VERSION 3.8) -project (eic_container VERSION 0.9.10) +project (eic_container VERSION 0.9.11) ################################################################################ ## The name of our container diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile index 41fe609f3..264e354d8 100644 --- a/containers/docker/Dockerfile +++ b/containers/docker/Dockerfile @@ -46,11 +46,12 @@ RUN cd /tmp \ && make -j30 && make -j4 install \ && cd /tmp && rm -rf /tmp/podio -RUN cd /tmp && git clone https://github.com/GenFit/GenFit.git \ +RUN mkdir /usr/local/src && cd /usr/local/src \ + && git clone https://github.com/GenFit/GenFit.git \ && mkdir -p /tmp/GenFit/build \ && cd /tmp/GenFit/build \ - && cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_CXX_STANDARD=17 \ - && make VERBOSE=1 \ + && cmake /usr/local/src/GenFit/. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_CXX_STANDARD=17 \ + && make -j4 \ && make -j4 install \ && cd /tmp && rm -rf /tmp/GenFit -- GitLab