New release of MC software

CentOS8/Dockerfile-environment

@@ -1,6 +1,6 @@
 ###############################################################################
 #  Repository: mucoll-environment
-#  Tag:        1.1-centos8
+#  Tag:        1.2-centos8
 ###############################################################################
 
 FROM centos:centos8
@@ -16,7 +16,7 @@ RUN wget -O /etc/yum.repos.d/EGI-trustanchors.repo http://repository.egi.eu/sw/p
     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
 
-RUN yum -y install vim-enhanced xorg-x11-xauth screen git subversion rsync make \
+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 \
                    libSM-devel libX11-devel libXext-devel libXft-devel libXmu-devel libXpm-devel \
                    libjpeg-turbo-devel libpng-devel libtiff-devel mesa-libGLU-devel \

CentOS8/Dockerfile-ilc-base

@@ -1,13 +1,13 @@
 ###############################################################################
 #  Repository: mucoll-ilc-base
-#  Tag:        1.1-centos8
+#  Tag:        1.2-centos8
 ###############################################################################
 
-FROM infnpd/mucoll-environment:1.1-centos8
+FROM infnpd/mucoll-environment:1.2-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-02-MC && \
+    cd /opt/MuonCutil && git checkout v02-03-MC && \
     cd /opt/iLCInstall && git checkout v02-02 && \
     sed -i 's|/usr/bin/env python|/usr/bin/env python2|g' ilcsoft-install && \
     mkdir releases/development && \

CentOS8/Dockerfile-ilc-framework

@@ -1,19 +1,20 @@
 ###############################################################################
 #  Repository: mucoll-ilc-framework
-#  Tag:        1.1-centos8
+#  Tag:        1.2-centos8
 ###############################################################################
 
-FROM infnpd/mucoll-ilc-base:1.1-centos8
+FROM infnpd/mucoll-ilc-base:1.2-centos8
 
 RUN cd /opt/iLCInstall && \
     ./ilcsoft-install releases/development/release-ilcsoft.cfg --install-prefix=/opt/ilcsoft -v -i
 
-RUN cd /opt/ilcsoft/v02-02-MC && \
-    git clone https://github.com/MuonColliderSoft/detector-simulation.git
+RUN cd /opt/ilcsoft/v02-03-MC && \
+    git clone https://github.com/MuonColliderSoft/detector-simulation.git && \
+    cd /opt/ilcsoft/v02-03-MC/detector-simulation && git checkout v01-00-MC
 
-RUN sed -i 's|/bin/env python|/usr/bin/env python2|g' /opt/ilcsoft/v02-02-MC/CEDViewer/v01-17-01/bin/ced2go
+RUN sed -i 's|/bin/env python|/usr/bin/env python2|g' /opt/ilcsoft/v02-03-MC/CEDViewer/v01-17-01/bin/ced2go
 
 COPY profile.d_ilcsoft.sh /etc/profile.d/ilcsoft.sh
 
-RUN sed -i -e 's|:\$MARLIN_DLL||g' /opt/ilcsoft/v02-02-MC/init_ilcsoft.sh
+RUN sed -i -e 's|:\$MARLIN_DLL||g' /opt/ilcsoft/v02-03-MC/init_ilcsoft.sh
 

CentOS8/profile.d_ilcsoft.sh

@@ -1,2 +1,2 @@
-source /opt/ilcsoft/v02-02-MC/init_ilcsoft.sh
+source /opt/ilcsoft/v02-03-MC/init_ilcsoft.sh
 

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.1-centos8 .
-docker build -f Dockerfile-ilc-base -t infnpd/mucoll-ilc-base:1.1-centos8 .
-docker build -f Dockerfile-ilc-framework -t infnpd/mucoll-ilc-framework:1.1-centos8 .
+docker build -f Dockerfile-environment -t infnpd/mucoll-environment:1.2-centos8 .
+docker build -f Dockerfile-ilc-base -t infnpd/mucoll-ilc-base:1.2-centos8 .
+docker build -f Dockerfile-ilc-framework -t infnpd/mucoll-ilc-framework:1.2-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.1-centos8
+docker run -ti --rm --entrypoint /bin/bash infnpd/mucoll-ilc-framework:1.2-centos8
 ```
 and inspect its content.