Changed container version

MuonColliderSoft · Nov 3, 2021 · 8ce1198 · 8ce1198
1 parent 49d6746
commit 8ce1198
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/CentOS8/Dockerfile-environment b/CentOS8/Dockerfile-environment
@@ -1,6 +1,6 @@
 ###############################################################################
 #  Repository: mucoll-environment
-#  Tag:        1.5-centos8
+#  Tag:        1.6-centos8
 ###############################################################################
 
 FROM centos:centos8

diff --git a/CentOS8/Dockerfile-ilc-base b/CentOS8/Dockerfile-ilc-base
@@ -1,15 +1,14 @@
 ###############################################################################
 #  Repository: mucoll-ilc-base
-#  Tag:        1.5-centos8
+#  Tag:        1.6-centos8
 ###############################################################################
 
-FROM infnpd/mucoll-environment:1.5-centos8
+FROM infnpd/mucoll-environment:1.6-centos8
 
 RUN cd /opt && git clone https://github.com/MuonColliderSoft/MuonCutil.git && \
     git clone https://github.com/MuonColliderSoft/iLCInstall.git && \
-    cd /opt/MuonCutil && git checkout 0769c7c790d47a71f7a9a012dcbfb1d2a23d34dd && \
-    cd /opt/iLCInstall && git checkout aee417fceb83b6f1892bdd492dca8e358a520c5c && \
-    sed -i 's|/usr/bin/env python|/usr/bin/env python2|g' ilcsoft-install && \
+    cd /opt/MuonCutil && git checkout v02-07-MC && \
+    cd /opt/iLCInstall && git checkout v02-03-01-MC && \
     mkdir releases/development && \
     cp /opt/MuonCutil/releases/development/* releases/development && \
     ./ilcsoft-install releases/development/release-base.cfg --install-prefix=/opt/ilcsoft -v -i

diff --git a/CentOS8/Dockerfile-ilc-framework b/CentOS8/Dockerfile-ilc-framework
@@ -1,16 +1,16 @@
 ###############################################################################
 #  Repository: mucoll-ilc-framework
-#  Tag:        1.5-centos8
+#  Tag:        1.6-centos8
 ###############################################################################
 
-FROM infnpd/mucoll-ilc-base:1.5-centos8
+FROM infnpd/mucoll-ilc-base:1.6-centos8
 
 RUN cd /opt/iLCInstall && \
     ./ilcsoft-install releases/development/release-ilcsoft.cfg --install-prefix=/opt/ilcsoft -v -i
 
 RUN cd /opt/ilcsoft/muonc && \
     git clone https://github.com/MuonColliderSoft/detector-simulation.git && \
-    cd /opt/ilcsoft/muonc/detector-simulation && git checkout v01-01-MC
+    cd /opt/ilcsoft/muonc/detector-simulation && git checkout v01-02-MC
 
 RUN sed -i -e 's|/bin/env python|/usr/bin/env python2|g' /opt/ilcsoft/muonc/CEDViewer/*/bin/ced2go
 

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