From 610887974b8cf41d33a1ebd0d864d1dc35df99af Mon Sep 17 00:00:00 2001 From: Whitney Armstrong <warmstrong@anl.gov> Date: Mon, 27 Apr 2020 16:09:39 -0500 Subject: [PATCH] modified: CMakeLists.txt modified: containers/docker/Dockerfile --- CMakeLists.txt | 2 +- containers/docker/Dockerfile | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be839a745..b3cadc43c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ ## PROJECT: hallac_container ################################################################################ cmake_minimum_required (VERSION 3.8) -project (eic_container VERSION 1.1.0) +project (eic_container VERSION 1.1.1) ################################################################################ ## The name of our container diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile index ecfff876d..50aebbab8 100644 --- a/containers/docker/Dockerfile +++ b/containers/docker/Dockerfile @@ -60,15 +60,15 @@ RUN cd /tmp && git clone https://eicweb.phy.anl.gov/EIC/GenFind.git \ && cd /tmp && rm -rf /tmp/GenFind -#RUN cd /tmp \ -# && git clone https://eicweb.phy.anl.gov/EIC/NPDet.git \ -# && source /usr/local/bin/thisroot.sh \ -# && source /usr/local/bin/geant4.sh \ -# && source /usr/local/bin/thisdd4hep.sh \ -# && mkdir -p NPDet/build && cd NPDet/build \ -# && cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_CXX_STANDARD=17 \ -# && make -j30 && make -j4 install \ -# && cd /tmp && rm -rf /tmp/NPDet +RUN cd /tmp \ + && git clone https://eicweb.phy.anl.gov/EIC/NPDet.git \ + && source /usr/local/bin/thisroot.sh \ + && source /usr/local/bin/geant4.sh \ + && source /usr/local/bin/thisdd4hep.sh \ + && mkdir -p NPDet/build && cd NPDet/build \ + && cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_CXX_STANDARD=17 \ + && make -j30 && make -j4 install \ + && cd /tmp && rm -rf /tmp/NPDet RUN cd /tmp \ && git clone https://gitlab.cern.ch/hepmc/HepMC3.git \ -- GitLab