Fixed DD4hep multiple input files and update CI

.gitlab-ci.yml

@@ -3,32 +3,27 @@ before_script:
 
 stages:
     - build
+    - build-cleanup
     - deploy
-    - build_cleanup
+    - cleanup
 
-build_test:
+build-image:
     stage: build
     script:
-        - docker build -t argonneeic/base:$CI_COMMIT_REF_SLUG --build-arg BUILD_THREADS=20 .
-    except:
-        - master
+        - bash -c 'if [ "$(docker images -f reference=argonneeic/base:$CI_COMMIT_SHA --format {{.Tag}})" == "" ]; then docker build -t argonneeic/base:$CI_COMMIT_SHA --build-arg BUILD_THREADS=20 .; fi'
 
-build_latest:
-    stage: build
+cleanup-containers:
+    stage: build-cleanup
     script:
-        - docker build -t argonneeic/base --build-arg BUILD_THREADS=20 .
-    only:
-        - master
+        - bash -c 'docker rm $(docker ps -qa --no-trunc --filter "status=exited") || :'
+    when: on_failure
 
-docker_hub_push:
+deploy-to-dockerhub:
     stage: deploy
     script:
+        - bash -c 'docker rmi argonneeic/base:latest || :'
+        - docker tag argonneeic/base:$CI_COMMIT_SHA argonneeic/base
         - bash deploy.sh
+        - docker rmi argonneeic/base:$CI_COMMIT_SHA
     only:
         - master
-
-cleanup_docker_containers:
-    stage: build_cleanup
-    script:
-        - docker rm $(docker ps -qa --no-trunc --filter "status=exited")
-    when: on_failure

Dockerfile

@@ -148,8 +148,8 @@ RUN git clone https://github.com/iLCSoft/LCIO.git \
 ENV ROOT_INCLUDE_PATH=/usr/local:/usr/local/include
 
 # DD4hep
-ENV DD4HEP_CHECKOUT=0e539031db7b74e1874f64f039e02dfc3560a814 \
-    DD4HEP_REPO=https://github.com/AIDASoft/DD4hep.git
+ENV DD4HEP_CHECKOUT=7c5b178254361ec4e3d97c51f941bce515c85341 \
+    DD4HEP_REPO=https://github.com/decibelcooper/DD4hep.git
 
 RUN sudo pacman -S --noconfirm \
         boost \