.gitlab-ci.yml

@@ -2,9 +2,7 @@ image: alpine
 
 variables:
   ## External images
-  # FIXME:
-  #DOCKER_IMAGE: docker.io/docker:24.0.5
-  DOCKER_IMAGE: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
+  DOCKER_IMAGE: docker.io/docker:24.0.5
   SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.4
 
   ## Application versions used for the main release 
@@ -131,6 +129,8 @@ version:
 ## base job settings for all docker interactions
 .docker:
   image: ${DOCKER_IMAGE}
+  services: 
+    - docker:dind
   before_script:
     - # Login to registries
       if [[ -n "${EXPORT_TAG}" ]] ; then
@@ -145,9 +145,7 @@ version:
                                       ${GH_REGISTRY} ;
         fi ;
         if [[ -n "${CI_REGISTRY}" ]] ; then
-          ./gitlab-ci/docker_login.sh -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
-                                      -n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
-                                      ${CI_REGISTRY} ;
+          docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} ;
         fi ;
       fi
   after_script: