Base oneapi_jug_xl off jug_xl

Use baseargs in Dockerfiles to base oneapi_jug_xl off jug_xl

.gitlab-ci.yml

@@ -272,9 +272,10 @@ oneapi_jug_xl:default:
   script:
     - cp containers/jug/setup_detectors.py containers/oneapi
     - cp detectors.yaml containers/oneapi
-    - sed 's/^FROM.*$/FROM ${DOCKER_REGISTRY}oneapi_jug_dev:${INTERNAL_TAG}/' containers/jug/xl.Dockerfile |  
-      docker build \- -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} 
+    -  docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} 
+                   -f containers/jug/xl.Dockerfile 
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
+                   --build-arg BASEIMAGE="oneapi_jug_dev"
                    --build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
                    --build-arg NPDET_VERSION=${NPDET_VERSION}
                    --build-arg EICD_VERSION=${EICD_VERSION}
@@ -602,8 +603,7 @@ cleanup:
   stage: finalize
   dependencies:
     - version
-  rules:
-    - when: always
+  when: always
   script:
     ## remove the pipeline specific export from eicweb if needed
     - echo "Cleaning up pipeline specific docker tags if needed"