diff --git a/CentOS8/Dockerfile-ilc-base b/CentOS8/Dockerfile-ilc-base index 4916cfa..5ce9172 100644 --- a/CentOS8/Dockerfile-ilc-base +++ b/CentOS8/Dockerfile-ilc-base @@ -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 && \ diff --git a/CentOS8/Dockerfile-ilc-framework b/CentOS8/Dockerfile-ilc-framework index 493b128..a91bda3 100644 --- a/CentOS8/Dockerfile-ilc-framework +++ b/CentOS8/Dockerfile-ilc-framework @@ -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 + diff --git a/CentOS8/profile.d_ilcsoft.sh b/CentOS8/profile.d_ilcsoft.sh index 02ac5b9..9a1f293 100644 --- a/CentOS8/profile.d_ilcsoft.sh +++ b/CentOS8/profile.d_ilcsoft.sh @@ -1,2 +1,2 @@ -source /opt/ilcsoft/v02-03-MC/init_ilcsoft.sh +source /opt/ilcsoft/muonc/init_ilcsoft.sh