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

Merge branch 'p-bump-docker-deps' into 'master' 

Bump Docker Dependencies

See merge request allpix-squared/allpix-squared!1010
parents 8304ec26 2635f4fe

.gitlab-ci.yml

+1 −1
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:v4"

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

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

    DOCKER_FILE: etc/docker/Dockerfile

etc/docker/Dockerfile

+1 −1
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2018-2023 CERN and the Allpix Squared authors

# SPDX-License-Identifier: MIT



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

FROM gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:v5

MAINTAINER Simon Spannagel <simon.spannagel@cern.ch>

ARG ALLPIX_BUILD_ENV="Docker"

etc/docker/Dockerfile.deps

+17 −48
Original line number Diff line number Diff line
@@ -15,42 +15,33 @@ RUN apt-get install -y zlib1g-dev 
# Add layer for LCIO

ENV LCIO_VERSION 02-19-01



ENV LCIODIR="/opt/lcio"

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

ENV LD_LIBRARY_PATH="$LCIODIR/lib:$LD_LIBRARY_PATH"

ENV LIBPATH="$LCIODIR/lib:$LIBPATH"

ENV CMAKE_PREFIX_PATH="$LCIODIR:$CMAKE_PREFIX_PATH"



ENV LCIODIR="/tmp/lcio"

RUN mkdir -p ${LCIODIR}/{src,build} && \

    curl -o ${LCIODIR}/lcio.${LCIO_VERSION}.tar.gz \

            https://codeload.github.com/iLCSoft/LCIO/tar.gz/v${LCIO_VERSION} && \

    tar zxf ${LCIODIR}/lcio.${LCIO_VERSION}.tar.gz -C ${LCIODIR}/src && \

    rm -f ${LCIODIR}/lcio.${LCIO_VERSION}.tar.gz && \

    cd ${LCIODIR}/build && \

    cmake -DCMAKE_INSTALL_PREFIX=../ \

    cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ \

        -DBUILD_TESTING=OFF \

          ../src/LCIO-${LCIO_VERSION} && \

    make -j`grep -c processor /proc/cpuinfo` && \

    make install && \

    rm -rf ${LCIODIR}/{src,build}

    rm -rf ${LCIODIR}





# Install ROOT dependencies

RUN apt-get install -y dpkg-dev libx11-dev libxpm-dev libxft-dev libxext-dev libssl-dev python3 python3-dev python3-pip python3-tk python-is-python3

RUN apt-get install -y dpkg-dev libx11-dev libxpm-dev libxft-dev libxext-dev libssl-dev python3 python3-dev python3-pip python3-tk python-is-python3 git



# Install helpful Python packages

RUN pip3 install --upgrade pip && \

    pip3 install numpy matplotlib scipy pandas



# Add layer for ROOT6

ENV ROOT6_VERSION 6.26.10



ENV ROOTSYS="/opt/root6"

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

ENV LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"

ENV LIBPATH="$ROOTSYS/lib:$LIBPATH"

ENV PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"

ENV CMAKE_PREFIX_PATH="$ROOTSYS:$CMAKE_PREFIX_PATH"

ENV ROOT6_VERSION 6.28.00

ENV PYTHONPATH="/usr/local/lib:$PYTHONPATH"



ENV ROOTSYS="/tmp/root6"

RUN mkdir -p ${ROOTSYS}/{src,build} && \

    curl -o ${ROOTSYS}/root.${ROOT6_VERSION}.tar.gz \

            https://root.cern.ch/download/root_v${ROOT6_VERSION}.source.tar.gz && \
@@ -78,12 +69,11 @@ RUN mkdir -p ${ROOTSYS}/{src,build} && \ 
           -Ddataframe=OFF \

           -Dpython3=ON \

           -DPYTHON_EXECUTABLE=/usr/bin/python3 \

           -DCMAKE_INSTALL_PREFIX=../ \

           -DCMAKE_CXX_STANDARD=17 \

           ../src/root-${ROOT6_VERSION} && \

    make -j`grep -c processor /proc/cpuinfo` && \

    make install && \

    rm -rf ${ROOTSYS}/{src,build}

    rm -rf ${ROOTSYS}





# Install Geant4 dependencies
@@ -92,21 +82,7 @@ RUN apt-get install -y libxerces-c-dev 
# Add layer for Geant4

ENV GEANT4_VERSION 11.1.1



ENV GEANT4DIR="/opt/geant4"

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

ENV LD_LIBRARY_PATH="$GEANT4DIR/lib:$LD_LIBRARY_PATH"

ENV G4NEUTRONHPDATA="$GEANT4DIR/share/Geant4/data/G4NDL4.7"

ENV G4LEDATA="$GEANT4DIR/share/Geant4/data/G4EMLOW8.2"

ENV G4LEVELGAMMADATA="$GEANT4DIR/share/Geant4/data/PhotonEvaporation5.7"

ENV G4RADIOACTIVEDATA="$GEANT4DIR/share/Geant4/data/RadioactiveDecay5.6"

ENV G4PARTICLEXSDATA="$GEANT4DIR/share/Geant4/data/G4PARTICLEXS4.0"

ENV G4PIIDATA="$GEANT4DIR/share/Geant4/data/G4PII1.3"

ENV G4REALSURFACEDATA="$GEANT4DIR/share/Geant4/data/RealSurface2.2"

ENV G4SAIDXSDATA="$GEANT4DIR/share/Geant4/data/G4SAIDDATA2.0"

ENV G4ABLADATA="$GEANT4DIR/share/Geant4/data/G4ABLA3.1"

ENV G4INCLDATA="$GEANT4DIR/share/Geant4/data/G4INCL1.0"

ENV G4ENSDFSTATEDATA="$GEANT4DIR/share/Geant4/data/G4ENSDFSTATE2.3"



ENV GEANT4DIR="/tmp/geant4"

RUN mkdir -p ${GEANT4DIR}/{src,build} && \

    curl -o ${GEANT4DIR}/geant4.${GEANT4_VERSION}.tar.gz \

            https://geant4-data.web.cern.ch/geant4-data/releases/source/geant4-v${GEANT4_VERSION}.tar.gz && \
@@ -117,39 +93,32 @@ RUN mkdir -p ${GEANT4DIR}/{src,build} && \ 
          -DGEANT4_USE_GDML=ON \

          -DGEANT4_USE_SYSTEM_CLHEP=OFF \

          -DGEANT4_BUILD_MULTITHREADED=ON \

          -DCMAKE_INSTALL_PREFIX=../ \

          -DGEANT4_BUILD_CXXSTD=17 \

          -DGEANT4_BUILD_BUILTIN_BACKTRACE=OFF \

          ../src/geant4-v${GEANT4_VERSION} && \

    make -j`grep -c processor /proc/cpuinfo` && \

    make install && \

    rm -rf ${GEANT4DIR}/{src,build} && \

    rm -rf ${GEANT4DIR}/share/Geant4-${GEANT4_VERSION_PATH}/examples

    rm -rf ${GEANT4DIR} && \

    rm -rf /usr/local/share/Geant4-${GEANT4_VERSION_PATH}/examples



# Add layer for HepMC3

ENV HEPMC3_VERSION 3.2.6



ENV HEPMC3DIR="/opt/hepmc3"

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

ENV LD_LIBRARY_PATH="$HEPMC3DIR/lib:$LD_LIBRARY_PATH"

ENV LIBPATH="$HEPMC3DIR/lib:$LIBPATH"

ENV CMAKE_PREFIX_PATH="$HEPMC3DIR:$CMAKE_PREFIX_PATH"



ENV HEPMC3DIR="/tmp/hepmc3"

RUN mkdir -p ${HEPMC3DIR}/{src,build} && \

    curl -o ${HEPMC3DIR}/hepmc3.${HEPMC3_VERSION}.tar.gz \

            https://gitlab.cern.ch/hepmc/HepMC3/-/archive/${HEPMC3_VERSION}/HepMC3-${HEPMC3_VERSION}.tar.gz && \

    tar zxf ${HEPMC3DIR}/hepmc3.${HEPMC3_VERSION}.tar.gz -C ${HEPMC3DIR}/src && \

    rm -f ${HEPMC3DIR}/hepmc3.${HEPMC3_VERSION}.tar.gz && \

    cd ${HEPMC3DIR}/build && \

    cmake -DCMAKE_INSTALL_PREFIX=../ \

          -DHEPMC3_ENABLE_ROOTIO=ON \

    cmake -DHEPMC3_ENABLE_ROOTIO=ON \

          -DHEPMC3_ENABLE_PYTHON=ON \

           ../src/HepMC3-${HEPMC3_VERSION} && \

    make -j`grep -c processor /proc/cpuinfo` && \

    make install && \

    rm -rf ${HEPMC3DIR}/{src,build}

    rm -rf ${HEPMC3DIR}



# Install Allpix Squared dependencies

RUN apt-get install -y libpqxx-dev postgresql-server-dev-all libeigen3-dev libboost-random-dev python3-lxml git

RUN apt-get install -y libpqxx-dev postgresql-server-dev-all libeigen3-dev libboost-random-dev python3-lxml



CMD ["bash"]

etc/scripts/create_deposition_file.py

100644 → 100755
+2 −0
Original line number Diff line number Diff line 
#!/usr/bin/python3



# SPDX-FileCopyrightText: 2020-2023 CERN and the Allpix Squared authors

# SPDX-License-Identifier: MIT

etc/scripts/create_hepmc3_file.py

100644 → 100755
+2 −0
Original line number Diff line number Diff line 
#!/usr/bin/python3



# SPDX-FileCopyrightText: 2022-2023 CERN and the Allpix Squared authors

# SPDX-License-Identifier: MIT