From b3bad4245eec124d1dbb5749c42a156fc6ffd4b5 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Tue, 26 May 2020 22:10:08 -0500
Subject: [PATCH] modified: containers/docker/Dockerfile
---
containers/docker/Dockerfile | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile
index 9f274b061..5e468ef16 100644
--- a/containers/docker/Dockerfile
+++ b/containers/docker/Dockerfile
@@ -14,9 +14,18 @@ RUN cd /tmp \
&& wget http://lcgapp.cern.ch/project/simu/HepPDT/download/HepPDT-3.04.01.tar.gz \
&& tar -zxf HepPDT-3.04.01.tar.gz \
&& cd HepPDT-3.04.01 \
- && ./configure && make -j10 && make install \
+ && ./configure && make -j30 && make install \
&& cd /tmp && rm -r HepPDT-3.04.01
+RUN cd /tmp \
+ && git clone https://gitlab.cern.ch/hepmc/HepMC3.git \
+ && mkdir HepMC3/build && cd HepMC3/build \
+ && cmake ../. -DHEPMC3_ENABLE_ROOTIO=ON -DCMAKE_INSTALL_PREFIX=$HOME/stow/hepmc3 -DHEPMC3_BUILD_EXAMPLES=ON \
+ && make -j20 \
+ && make install \
+ && cd /tmp && rm -rf /tmp/HepMC3
+
+
RUN cd /tmp \
&& git clone https://github.com/acts-project/acts.git \
&& source /usr/local/bin/thisroot.sh \
@@ -34,7 +43,6 @@ RUN cd /tmp \
&& make -j30 && make -j4 install \
&& cd /tmp && rm -rf /tmp/acts
-
RUN cd /tmp \
&& source /usr/local/bin/thisroot.sh \
&& source /usr/local/bin/geant4.sh \
@@ -78,13 +86,5 @@ RUN cd /tmp \
&& make -j30 && make -j4 install \
&& cd /tmp && rm -rf /tmp/NPDet
-RUN cd /tmp \
- && git clone https://gitlab.cern.ch/hepmc/HepMC3.git \
- && mkdir HepMC3/build && cd HepMC3/build \
- && cmake ../. -DHEPMC3_ENABLE_ROOTIO=ON -DCMAKE_INSTALL_PREFIX=$HOME/stow/hepmc3 -DHEPMC3_BUILD_EXAMPLES=ON \
- && make -j20 \
- && make install \
- && cd /tmp && rm -rf /tmp/HepMC3
-
--
GitLab