candidate root 6.20.04 image

base/centos-full-root6.18.04:7 → base/centos-full-root6.20.04:7

@@ -13,7 +13,10 @@ FROM docker.km3net.de/base/centos:7
  RUN curl -L http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.2.0.8-x86_64-cc7-gcc48-opt.tgz > clhep.tgz && tar -C /usr/local/ --strip-components=1 -xvzf clhep.tgz
 
  RUN yum install -y centos-release-scl
- RUN yum install -y rh-python36
+ 
+# aart: root requires python-devel.
+ RUN yum install -y rh-python36-python-devel
+
  RUN echo 'export LD_LIBRARY_PATH=/opt/rh/rh-python36/root/usr/lib64:$LD_LIBRARY_PATH' >> /etc/profile.d/python36.sh
  RUN echo "export X_SCLS=rh-python36" >> /etc/profile.d/python36.sh
  RUN echo 'export PATH=/opt/rh/rh-python36/root/usr/bin:$PATH' >> /etc/profile.d/python36.sh
@@ -40,16 +43,26 @@ FROM docker.km3net.de/base/centos:7
     mv pythia6 pythia6428 && cd pythia6428 && \
     ./makePythia6.linuxx8664 && echo "export PYTHIA6=/pythia6428" > /etc/profile.d/genie.sh
 
- #ROOT6
- RUN source /etc/profile.d/genie.sh && cd / && rm -rf /usr/local/root && \
-    export ROOT_VERSION=6.18.04 && \
-    cd /tmp && \
-    wget https://root.cern.ch/download/root_v$ROOT_VERSION.source.tar.gz && \
-    tar xvzf root_v$ROOT_VERSION.source.tar.gz && cd root-$ROOT_VERSION && \
-    mkdir obj && cd obj && \
-    cmake3 .. -Dpythia6=ON -DPYTHIA6_LIBRARY=/pythia6428/libPythia6.so && \
-    make && \
-    cd .. && \
-    mv obj /opt/root-$ROOT_VERSION && \
-    rm -rf /tmp/root* && \
-    echo "cd /opt/root-$ROOT_VERSION && source bin/thisroot.sh && cd -" >> /etc/profile.d/root_env.sh && cd
+
+# aart: there'ss is a bug in the the root cmake procedure that fires when numpy is not found
+# so just install it, I guess...
+# see https://github.com/root-project/root/commit/89c089127f9ac57ca45348f7ac8c71624b68955d
+
+RUN python3 -m pip install numpy 
+ENV PYTHONPATH="/usr/local/lib64/python3.6/site-packages:${PYTHONPATH}"
+
+
+#ROOT6
+RUN source /etc/profile.d/genie.sh && cd / && rm -rf /usr/local/root && \
+   export ROOT_VERSION=6.20.04 && \
+   source /etc/profile.d/python36.sh && \
+   cd /tmp && \
+   wget https://root.cern.ch/download/root_v$ROOT_VERSION.source.tar.gz && \
+   tar xvzf root_v$ROOT_VERSION.source.tar.gz && cd root-$ROOT_VERSION && \
+   mkdir obj && cd obj && \
+   cmake3 .. -Dpythia6=ON -DPYTHIA6_LIBRARY=/pythia6428/libPythia6.so && \
+   make && \
+   cd .. && \
+   mv obj /opt/root-$ROOT_VERSION && \
+   rm -rf /tmp/root* && \
+   echo "cd /opt/root-$ROOT_VERSION && source bin/thisroot.sh && cd -" >> /etc/profile.d/root_env.sh && cd