Merge branch 'master' of git.km3net.de:common/dockerfiles

base/daq-singularity

+FROM centos:7.4.1708
+  MAINTAINER Kay Graf <kay.graf@km3net.de>
+#Install Singularity as described on https://github.com/sylabs/singularity/blob/master/INSTALL.md
+  RUN	yum groupinstall -y 'Development Tools' && \
+  	yum install -y epel-release && \
+  	yum install -y golang openssl-devel libuuid-devel libseccomp-devel squashfs-tools
+  RUN yum -y update && yum install -y rpm-build wget
+  
+  RUN 	export VERSION=3.1.0 RC=-rc4 && \
+	wget https://github.com/sylabs/singularity/releases/download/v${VERSION}${RC}/singularity-${VERSION}.tar.gz && \
+	rpmbuild -tb singularity-${VERSION}.tar.gz && \
+    	rpm -ivh ~/rpmbuild/RPMS/x86_64/singularity-${VERSION}${RC}.el7.x86_64.rpm && \
+    	rm -rf ~/rpmbuild singularity-${VERSION}*.tar.gz
+
+  RUN   wget https://git.km3net.de/common/jpp/raw/master/Singularity?inline=false -O Singularity
+  RUN	singularity build Jpp.sif Singularity

base/km3sim:4.10.05

+# Machine to install OMGsim with Geant4.10.01.p03
+FROM docker.km3net.de/base/centos-full:7
+ MAINTAINER Vladimir Kulikovskiy <vkulikovskiy@km3net.de>
+
+# create folder for additional non-standard CentOS7 software
+ RUN mkdir $HOME/KM3Sim
+
+# Install newer cmake
+ RUN yum remove cmake -y
+
+ RUN cd $HOME/KM3Sim && wget https://cmake.org/files/v3.6/cmake-3.6.2.tar.gz && \
+    tar xzf cmake-3.6.2.tar.gz && rm cmake-3.6.2.tar.gz && cd cmake-3.6.2 && \
+    ./bootstrap --prefix=/usr/local > bootstrap.log && make > make.log && make install > make_install.log
+    
+# Make Geant4
+ RUN yum install -y xerces-c xerces-c-devel libX11-devel libXmu-devel motif motif-devel
+ RUN cd $HOME/KM3Sim && wget http://cern.ch/geant4-data/releases/geant4.10.05.tar.gz && tar xf geant4.10.05.tar.gz && rm geant4.10.05.tar.gz && \
+    mkdir geant4.10.05_build && cd geant4.10.05_build && \
+    cmake -DCMAKE_INSTALL_PREFIX=$HOME/KM3Sim/geant4.10.05_build -DGEANT4_USE_GDML=ON -DGEANT4_INSTALL_DATA=ON -DGEANT4_XERCESC_INCLUDE_DIR=/usr/include/xercesc/ -DGEANT4_XERCESC_LIBRARY=/usr/lib64/ $HOME/KM3Sim/geant4.10.05 && \
+    make -j4 > make.log && make install > make_install.log

base/mono:5

 FROM mono:5
  MAINTAINER Tamas Gal <tgal@km3net.de>
 
- RUN apt-get update -qq && apt-get install -y -qq procps 
+ RUN apt-get update -qq && apt-get install -y -qq procps
+ RUN apt-get update -qq && apt-get install -y -qq git

base/omgsim:4.10.01

@@ -14,15 +14,15 @@ FROM docker.km3net.de/base/centos-full:7
  RUN mkdir $HOME/OMGsim
 
 # Make libconfig
- RUN cd $HOME/OMGsim && wget https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.2.tar.gz && tar xf libconfig-1.7.2.tar.gz -C /tmp && rm libconfig-1.7.2.tar.gz
- RUN export LIBCONFIG_ROOT=`pwd`/libconfig-1.7.2 && cd /tmp/libconfig-1.7.2/ && ./configure --prefix $LIBCONFIG_ROOT && make && make install && cd -
- RUN rm -rf /tmp/libconfig-1.7.2/
- RUN export LD_LIBRARY_PATH=${LIBCONFIG_ROOT}/lib:${LD_LIBRARY_PATH}
- RUN export CPLUS_INCLUDE_PATH=${LIBCONFIG_ROOT}/include
+ RUN cd $HOME/OMGsim && wget https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.2.tar.gz && tar xf libconfig-1.7.2.tar.gz -C /tmp && rm libconfig-1.7.2.tar.gz && \
+    export LIBCONFIG_ROOT=`pwd`/libconfig-1.7.2 && cd /tmp/libconfig-1.7.2/ && ./configure --prefix $LIBCONFIG_ROOT && make && make install && cd - && \
+    rm -rf /tmp/libconfig-1.7.2/ && \
+    export LD_LIBRARY_PATH=${LIBCONFIG_ROOT}/lib:${LD_LIBRARY_PATH} && \
+    export CPLUS_INCLUDE_PATH=${LIBCONFIG_ROOT}/include
 
 # Make Geant4 and dependencies
  RUN yum install -y libX11-devel libXmu-devel motif motif-devel
- RUN cd $HOME/OMGsim && wget http://cern.ch/geant4-data/releases/geant4.10.01.p03.tar.gz && tar xf geant4.10.01.p03.tar.gz && \ 
+ RUN cd $HOME/OMGsim && wget http://cern.ch/geant4-data/releases/geant4.10.01.p03.tar.gz && tar xf geant4.10.01.p03.tar.gz && rm geant4.10.01.p03.tar.gz && \ 
     mkdir geant4.10.01.p03-build && cd geant4.10.01.p03-build && \
     cmake -DCMAKE_INSTALL_PREFIX=../geant4.10.01.p03-install ../geant4.10.01.p03 -DGEANT4_INSTALL_DATA=ON -DGEANT4_USE_XM=ON && \
     make -j4 install > /dev/null