diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c1cf164285c9093504601104c28aee5b3185737..276c6327520632af03bd645579aa0f31a08e20e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,3 +17,5 @@ build:
- python publish_images.py
tags:
- docker
+ only:
+ - master
diff --git a/base/centos-full-root6:7 b/base/centos-full-root6:7
new file mode 100644
index 0000000000000000000000000000000000000000..907ba0178d96daf0cd30f4ce975cb4a90baff3ef
--- /dev/null
+++ b/base/centos-full-root6:7
@@ -0,0 +1,40 @@
+FROM centos:7.4.1708
+ MAINTAINER Tamas Gal <tgal@km3net.de>
+
+ RUN yum install -y man sed cygpath grep test && yum clean -y all
+ RUN yum install -y csh git subversion tar vim wget zsh && yum clean -y all
+ RUN yum install -y ant bison compat-gcc-34-g77 flex flex-devel gcc gcc-c++ gcc-gfortran gdb glibc-static make pakchois cmake boost-devel rpmdevtools && yum clean -y all
+ RUN yum install -y bzip2-devel gzip && yum clean -y all
+ RUN yum install -y fftw-devel libgpg-error libproxy openssh-server openssl-devel && yum clean -y all
+ RUN yum install -y gtk2-devel libX11 libX11-common libX11-devel libXext libXext-devel libXft libXft-devel libXpm libXpm-devel && yum clean -y all
+ RUN yum install -y doxygen texlive texlive-*.noarch && yum clean -y all
+
+ 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
+ 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
+ RUN echo 'export XDG_DATA_DIRS=/opt/rh/rh-python36/root/usr/share:/usr/local/share:/usr/share' >> /etc/profile.d/python36.sh
+ RUN echo 'export PKG_CONFIG_PATH=/opt/rh/rh-python36/root/usr/lib64/pkgconfig' >> /etc/profile.d/python36.sh
+ RUN source /etc/profile.d/python36.sh && pip install -U pip setuptools
+
+ RUN wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+ RUN rpm -ivh epel-release-latest-7.noarch.rpm
+ RUN yum install -y cmake3
+ RUN rm -rf epel-release-latest-7.noarch.rpm
+
+ RUN export ROOT_VERSION=6.14.06 && \
+ 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 .. && \
+ 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
diff --git a/base/centos-full:7 b/base/centos-full:7
index 3b869bd2aa35760b93fa6203678a33562f4ea5cc..8ec489491fa02f2fabbc9050b3363aefe7b96cd2 100644
--- a/base/centos-full:7
+++ b/base/centos-full:7
@@ -3,11 +3,11 @@ FROM centos:7.4.1708
RUN yum install -y man sed cygpath grep test && yum clean -y all
RUN yum install -y csh git subversion tar vim wget zsh && yum clean -y all
- RUN yum install -y ant bison compat-gcc-34-g77 flex flex-devel gcc gcc-c++ gcc-gfortran gdb glibc-static make pakchois cmake boost-devel rpmdevtools && yum clean -y all
+ RUN yum install -y ant bison compat-gcc-34-g77 flex flex-devel gcc gcc-c++ gcc-gfortran gdb glibc-static make pakchois cmake boost-devel rpmdevtools strace && yum clean -y all
RUN yum install -y bzip2-devel gzip && yum clean -y all
RUN yum install -y fftw-devel libgpg-error libproxy openssh-server openssl-devel && yum clean -y all
RUN yum install -y gtk2-devel libX11 libX11-common libX11-devel libXext libXext-devel libXft libXft-devel libXpm libXpm-devel && yum clean -y all
- RUN yum install -y doxygen texlive texlive-*.noarch && yum clean -y all
+ RUN yum install -y doxygen ghostscript texlive texlive-*.noarch && yum clean -y all
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
diff --git a/base/centos:7 b/base/centos:7
index 2e06be881917e8533fa753aa5766d93ccef90545..d6851c9c5b589f903235ac6817ab897b62791c47 100644
--- a/base/centos:7
+++ b/base/centos:7
@@ -2,5 +2,5 @@ FROM centos:7.4.1708
MAINTAINER Tamas Gal <tgal@km3net.de>
RUN yum install -y git subversion wget && yum clean -y all
- RUN yum install -y ant bison flex-devel gcc gcc-c++ gcc-gfortran gdb make cmake glibc-static && yum clean -y all
+ RUN yum install -y ant bison flex-devel gcc gcc-c++ gcc-gfortran gdb make cmake glibc-static strace && yum clean -y all
RUN yum install -y doxygen && yum clean -y all
diff --git a/base/texlive:2017 b/base/texlive:2017
index 815f140a66cb7073eb1c07fe6bc37146711d18af..cf6454bde2d30efac9abf5b13760b1573ca2fb38 100644
--- a/base/texlive:2017
+++ b/base/texlive:2017
@@ -7,9 +7,8 @@ ARG BUILD_DATE
LABEL org.label-schema.build-date=$BUILD_DATE \
maintainer="Tamas Gal <tgal@km3net.de>"
-
-RUN apt-get update \
- && apt-get install -y gnupg wget curl git make libgetopt-long-descriptive-perl \
+RUN apt-get update
+RUN apt-get install -y gnupg wget curl git make libgetopt-long-descriptive-perl \
libdigest-perl-md5-perl python-pygments fontconfig && rm -rf /var/lib/apt/lists/*
WORKDIR /