Skip to content

Commit

Permalink
Changed version in path
Browse files Browse the repository at this point in the history
  • Loading branch information
pandreetto committed Nov 26, 2020
1 parent 72989c4 commit a62757e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CentOS8/Dockerfile-ilc-base
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM infnpd/mucoll-environment:1.3-centos8

RUN cd /opt && git clone https://github.com/MuonColliderSoft/MuonCutil.git && \
git clone https://github.com/iLCSoft/iLCInstall.git && \
cd /opt/MuonCutil && git checkout v02-04-MC && \
cd /opt/MuonCutil && git checkout 3a0d79b762a64d394628857134847e7fc77e4078 && \
cd /opt/iLCInstall && git checkout v02-02 && \
sed -i 's|/usr/bin/env python|/usr/bin/env python2|g' ilcsoft-install && \
mkdir releases/development && \
Expand Down
11 changes: 7 additions & 4 deletions CentOS8/Dockerfile-ilc-framework
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ FROM infnpd/mucoll-ilc-base:1.3-centos8
RUN cd /opt/iLCInstall && \
./ilcsoft-install releases/development/release-ilcsoft.cfg --install-prefix=/opt/ilcsoft -v -i

RUN cd /opt/ilcsoft/v02-04-MC && \
RUN cd /opt/ilcsoft/muonc && \
git clone https://github.com/MuonColliderSoft/detector-simulation.git && \
cd /opt/ilcsoft/v02-04-MC/detector-simulation && git checkout v01-00-MC
cd /opt/ilcsoft/muonc/detector-simulation && git checkout v01-00-MC

RUN sed -i 's|/bin/env python|/usr/bin/env python2|g' /opt/ilcsoft/v02-04-MC/CEDViewer/v01-17-01/bin/ced2go
RUN sed -i -e 's|/bin/env python|/usr/bin/env python2|g' /opt/ilcsoft/muonc/CEDViewer/*/bin/ced2go

RUN sed -i -e 's|@DD4HEP_USE_HEPMC3@|OFF|g' /opt/ilcsoft/muonc/DD4hep/*/lib/python3.6/site-packages/DDSim/Helper/HepMC3.py

COPY profile.d_ilcsoft.sh /etc/profile.d/ilcsoft.sh

RUN sed -i -e 's|:\$MARLIN_DLL||g' /opt/ilcsoft/v02-04-MC/init_ilcsoft.sh
RUN sed -i -e 's|:\$MARLIN_DLL||g' /opt/ilcsoft/muonc/init_ilcsoft.sh


2 changes: 1 addition & 1 deletion CentOS8/profile.d_ilcsoft.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source /opt/ilcsoft/v02-03-MC/init_ilcsoft.sh
source /opt/ilcsoft/muonc/init_ilcsoft.sh

0 comments on commit a62757e

Please sign in to comment.