Changes for the next release

MuonColliderSoft · Mar 3, 2021 · e5335e4 · e5335e4
1 parent d63f58a
commit e5335e4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/CentOS8/Dockerfile-environment b/CentOS8/Dockerfile-environment
@@ -1,6 +1,6 @@
 ###############################################################################
 #  Repository: mucoll-environment
-#  Tag:        1.4-centos8
+#  Tag:        1.5-centos8
 ###############################################################################
 
 FROM centos:centos8
@@ -15,7 +15,7 @@ RUN wget -O /etc/yum.repos.d/EGI-trustanchors.repo http://repository.egi.eu/sw/p
     ln -s /etc/grid-security/certificates/GEANTeScienceSSLCA4.pem /etc/pki/ca-trust/source/anchors/ && \
     update-ca-trust extract && \
     wget -O /etc/yum.repos.d/geant4.repo https://cld-smact-02.pd.infn.it/artifacts/repository/repo-files/geant4.repo && \
-    wget -O /etc/yum.repos.d/root.repo https://cld-smact-02.pd.infn.it/artifacts/repository/repo-files/root.repo
+    wget -O /etc/yum.repos.d/root.repo https://cld-smact-02.pd.infn.it/artifacts/repository/repo-files/root-c17.repo
 
 RUN yum -y install vim-enhanced xorg-x11-xauth screen git subversion rsync make gdb valgrind graphviz \
                    sshpass zip doxygen rpm-build gcc gcc-c++ patch \
@@ -28,7 +28,7 @@ RUN yum -y install vim-enhanced xorg-x11-xauth screen git subversion rsync make
                    eigen3-devel boost169-devel mesa-dri-drivers mlocate emacs eog \
                    root root-gdml root-graf3d-eve root-genvector python3-root root-tmva \
                    root-geom root-graf3d-eve7 root-gui-browserv7 root-tpython \
-                   root-unuran root-minuit2 root-smatrix gsl-devel geant4-devel clhep-devel
+                   root-unuran root-minuit2 root-smatrix gsl-devel geant4-devel clhep-devel HepMC3-devel
 
 ## all datasets in the container !!!!
 RUN geant4-dataset-download

diff --git a/CentOS8/Dockerfile-ilc-base b/CentOS8/Dockerfile-ilc-base
@@ -1,13 +1,13 @@
 ###############################################################################
 #  Repository: mucoll-ilc-base
-#  Tag:        1.4-centos8
+#  Tag:        1.5-centos8
 ###############################################################################
 
-FROM infnpd/mucoll-environment:1.4-centos8
+FROM infnpd/mucoll-environment:1.5-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-05-MC && \
+    cd /opt/MuonCutil && git checkout a01c1660da963d4b7cb299b1dd0e1f0c52164b18 && \
     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
@@ -1,9 +1,9 @@
 ###############################################################################
 #  Repository: mucoll-ilc-framework
-#  Tag:        1.4-centos8
+#  Tag:        1.5-centos8
 ###############################################################################
 
-FROM infnpd/mucoll-ilc-base:1.4-centos8
+FROM infnpd/mucoll-ilc-base:1.5-centos8
 
 RUN cd /opt/iLCInstall && \
     ./ilcsoft-install releases/development/release-ilcsoft.cfg --install-prefix=/opt/ilcsoft -v -i
@@ -14,8 +14,6 @@ RUN cd /opt/ilcsoft/muonc && \
 
 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/muonc/init_ilcsoft.sh

diff --git a/README.md b/README.md
@@ -5,13 +5,13 @@ Docker files for Muon Collider software
 The incremental images for the framework can be built with the following command:
 ```
 cd CentOS8
-docker build -f Dockerfile-environment -t infnpd/mucoll-environment:1.4-centos8 .
-docker build -f Dockerfile-ilc-base -t infnpd/mucoll-ilc-base:1.4-centos8 .
-docker build -f Dockerfile-ilc-framework -t infnpd/mucoll-ilc-framework:1.4-centos8 .
+docker build -f Dockerfile-environment -t infnpd/mucoll-environment:1.5-centos8 .
+docker build -f Dockerfile-ilc-base -t infnpd/mucoll-ilc-base:1.5-centos8 .
+docker build -f Dockerfile-ilc-framework -t infnpd/mucoll-ilc-framework:1.5-centos8 .
 ```
 
 A useful way to test the image is running a shell on the container:
 ```
-docker run -ti --rm --entrypoint /bin/bash infnpd/mucoll-ilc-framework:1.4-centos8
+docker run -ti --rm --entrypoint /bin/bash infnpd/mucoll-ilc-framework:1.5-centos8
 ```
 and inspect its content.