Commit 211ab5f0 authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'fix_dockerbuild' into 'master' 

Fix Docker Build: Allow Inferring Version via Git

See merge request allpix-squared/allpix-squared!577
parents 6bf3d7a9 afb9a4a8

.dockerignore

+1 −0
Original line number Diff line number Diff line 
# Exclude everything from Docker build context that is not necessary:

*

!.git

!3rdparty

!cmake

!CMakeLists.txt

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -574,14 +574,14 @@ deploy-cvmfs: 
    dependencies: []

    script:

        - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json

        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/$DOCKER_FILE --destination $IMAGE_DESTINATION

        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/$DOCKER_FILE --destination $IMAGE_DESTINATION --build-arg ALLPIX_BUILD_ENV="$ALLPIX_BUILD_ENV"

        - echo "Image pushed successfully to ${IMAGE_DESTINATION}"



deploy-docker-latest:

    extends: .deploy-docker

    variables:

        IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}:latest

        ALLPIX_BUILD_ENV: "Docker"

        ALLPIX_BUILD_ENV: "CI/Docker"

    only:

        - schedules@allpix-squared/allpix-squared
@@ -589,6 +589,6 @@ deploy-docker-tag: 
    extends: .deploy-docker

    variables:

        IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

        ALLPIX_BUILD_ENV: "Docker"

        ALLPIX_BUILD_ENV: "CI/Docker"

    only:

        - tags@allpix-squared/allpix-squared

cmake/tools.cmake

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ FUNCTION(get_version project_version) 
            ENDIF()

        ELSE(GIT_FOUND)

            MESSAGE(STATUS "Git repository present, but could not find git executable.")

            SET(${project_version} "${${project_version}}-unknown")

        ENDIF(GIT_FOUND)

    ELSE(NOT source_package)

        # If we don't have git we can not really do anything

etc/docker/Dockerfile

+1 −0
Original line number Diff line number Diff line 
FROM gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:latest

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

ARG ALLPIX_BUILD_ENV="Docker"



# Copy currently checked out git revision:

COPY . /opt/allpix-squared

etc/docker/Dockerfile.deps

+1 −1
Original line number Diff line number Diff line
@@ -125,6 +125,6 @@ RUN mkdir -p ${GEANT4DIR}/{src,build} && \ 




# Install Allpix Squared dependencies

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

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



CMD ["bash"]