Commit cd6ca20f authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Update dependencies docker image, now at v4

parent f8e54ea3

.gitlab-ci.yml

+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


variables:

    REPOSITORY: "https://gitlab.cern.ch/allpix-squared/allpix-squared.git"

    DOCKER_DEPS_IMAGE: "gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:v3"

    DOCKER_DEPS_IMAGE: "gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:v4"

    EOS_PATH: "/eos/project/a/allpix-squared/www/"

    DOCKER_FILE: etc/docker/Dockerfile
@@ -461,7 +461,6 @@ docs:doxygen: 
    extends: .doc

    image: $DOCKER_DEPS_IMAGE

    script:

        - apt install -y unzip doxygen

        - curl -sL https://github.com/matusnovak/doxybook2/releases/download/v1.5.0/doxybook2-linux-amd64-v1.5.0.zip --output /tmp/doxybook2-linux64.zip

        - unzip /tmp/doxybook2-linux64.zip -d /usr/local/

        - cmake -DBUILD_DOCS_ONLY=ON ..

etc/docker/Dockerfile.deps

+5 −5
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ MAINTAINER Simon Spannagel <simon.spannagel@cern.ch> 
SHELL ["/bin/bash", "-c"]



# Install basic build requirements

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata curl cmake g++ gcc binutils

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata curl cmake g++ gcc binutils unzip doxygen



# Install LCIO dependencies

RUN apt-get install -y zlib1g-dev



# Add layer for LCIO

ENV LCIO_VERSION 02-16-01

ENV LCIO_VERSION 02-19-01



ENV LCIODIR="/opt/lcio"

ENV PATH="$LCIODIR/bin:$PATH"
@@ -42,7 +42,7 @@ RUN pip3 install --upgrade pip && \ 
    pip3 install numpy matplotlib scipy pandas



# Add layer for ROOT6

ENV ROOT6_VERSION 6.26.04

ENV ROOT6_VERSION 6.26.10



ENV ROOTSYS="/opt/root6"

ENV PATH="$ROOTSYS/bin:$PATH"
@@ -90,7 +90,7 @@ RUN mkdir -p ${ROOTSYS}/{src,build} && \ 
RUN apt-get install -y libxerces-c-dev



# Add layer for Geant4

ENV GEANT4_VERSION 11.0.2

ENV GEANT4_VERSION 11.1.1



ENV GEANT4DIR="/opt/geant4"

ENV PATH="$GEANT4DIR/bin:$PATH"
@@ -126,7 +126,7 @@ RUN mkdir -p ${GEANT4DIR}/{src,build} && \ 
    rm -rf ${GEANT4DIR}/share/Geant4-${GEANT4_VERSION_PATH}/examples



# Add layer for HepMC3

ENV HEPMC3_VERSION 3.2.5

ENV HEPMC3_VERSION 3.2.6



ENV HEPMC3DIR="/opt/hepmc3"

ENV PATH="$HEPMC3DIR/bin:$PATH"