diff --git a/CentOS8/Dockerfile-environment b/CentOS8/Dockerfile-environment index b904534..f86f288 100644 --- a/CentOS8/Dockerfile-environment +++ b/CentOS8/Dockerfile-environment @@ -1,6 +1,6 @@ ############################################################################### # Repository: mucoll-environment -# Tag: 1.3-centos8 +# Tag: 1.4-centos8 ############################################################################### FROM centos:centos8 @@ -14,7 +14,8 @@ RUN wget -O /etc/yum.repos.d/EGI-trustanchors.repo http://repository.egi.eu/sw/p ln -s /etc/grid-security/certificates/USERTrustRSACertificationAuthority.pem /etc/pki/ca-trust/source/anchors/ && \ 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/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 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 \ diff --git a/CentOS8/Dockerfile-ilc-base b/CentOS8/Dockerfile-ilc-base index 5ce9172..600368e 100644 --- a/CentOS8/Dockerfile-ilc-base +++ b/CentOS8/Dockerfile-ilc-base @@ -1,13 +1,13 @@ ############################################################################### # Repository: mucoll-ilc-base -# Tag: 1.3-centos8 +# Tag: 1.4-centos8 ############################################################################### -FROM infnpd/mucoll-environment:1.3-centos8 +FROM infnpd/mucoll-environment:1.4-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 3a0d79b762a64d394628857134847e7fc77e4078 && \ + cd /opt/MuonCutil && git checkout v02-05-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 && \ @@ -15,4 +15,3 @@ RUN cd /opt && git clone https://github.com/MuonColliderSoft/MuonCutil.git && \ ./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 index a91bda3..34a9c46 100644 --- a/CentOS8/Dockerfile-ilc-framework +++ b/CentOS8/Dockerfile-ilc-framework @@ -1,16 +1,16 @@ ############################################################################### # Repository: mucoll-ilc-framework -# Tag: 1.3-centos8 +# Tag: 1.4-centos8 ############################################################################### -FROM infnpd/mucoll-ilc-base:1.3-centos8 +FROM infnpd/mucoll-ilc-base:1.4-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-00-MC + cd /opt/ilcsoft/muonc/detector-simulation && git checkout v01-01-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 index 4a0ba45..d604b37 100644 --- 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.3-centos8 . -docker build -f Dockerfile-ilc-base -t infnpd/mucoll-ilc-base:1.3-centos8 . -docker build -f Dockerfile-ilc-framework -t infnpd/mucoll-ilc-framework:1.3-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 . ``` 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.3-centos8 +docker run -ti --rm --entrypoint /bin/bash infnpd/mucoll-ilc-framework:1.4-centos8 ``` and inspect its content.