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

.gitlab-ci.yml

@@ -17,3 +17,5 @@ build:
         - python publish_images.py
     tags:
         - docker
+    only:
+        - master

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
 

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

base/singularity:2.5

@@ -2,8 +2,7 @@ FROM debian:stretch
   MAINTAINER Tamas Gal <tgal@km3net.de>
 
   RUN apt-get update -qq && apt-get install -y wget bzip2 python-pip git
-  RUN apt-get install -y build-essential squashfs-tools libtool autotools-dev libarchive-dev automake autoconf uuid-dev libssl-dev sudo
+  RUN apt-get install -y build-essential squashfs-tools libtool autotools-dev libarchive-dev automake autoconf uuid-dev libssl-dev
 
   RUN pip install sregistry[all]
-  RUN sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
   RUN cd /tmp && git clone -b vault/release-2.5 https://www.github.com/sylabs/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && make install

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 /