Skip to content
Snippets Groups Projects

feat: use official docker image

Merged Wouter Deconinck requested to merge use-official-docker-image into master
All threads resolved!
Compare and
1 file
+ 6
12
Compare changes
  • Side-by-side
  • Inline
+ 6
12
@@ -2,9 +2,7 @@ image: alpine
@@ -2,9 +2,7 @@ image: alpine
variables:
variables:
## External images
## External images
# FIXME:
DOCKER_IMAGE: docker.io/docker:24.0.5
#DOCKER_IMAGE: docker.io/docker:24.0.5
DOCKER_IMAGE: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.4
SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.4
## Application versions used for the main release
## Application versions used for the main release
@@ -131,23 +129,19 @@ version:
@@ -131,23 +129,19 @@ version:
## base job settings for all docker interactions
## base job settings for all docker interactions
.docker:
.docker:
image: ${DOCKER_IMAGE}
image: ${DOCKER_IMAGE}
 
services:
 
- docker:dind
before_script:
before_script:
- # Login to registries
- # Login to registries
if [[ -n "${EXPORT_TAG}" ]] ; then
if [[ -n "${EXPORT_TAG}" ]] ; then
if [[ -n "${DH_REGISTRY}" ]] ; then
if [[ -n "${DH_REGISTRY}" ]] ; then
./gitlab-ci/docker_login.sh -u ${DH_REGISTRY_USER} -p ${DH_EICWEB_TOKEN}
docker login -u ${DH_REGISTRY_USER} -p ${DH_EICWEB_TOKEN} ${DH_REGISTRY} ;
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
${DH_REGISTRY} ;
fi ;
fi ;
if [[ -n "${GH_REGISTRY}" ]] ; then
if [[ -n "${GH_REGISTRY}" ]] ; then
./gitlab-ci/docker_login.sh -u ${GITHUB_REGISTRY_USER} -p ${GITHUB_REGISTRY_TOKEN}
docker login -u ${GITHUB_REGISTRY_USER} -p ${GITHUB_REGISTRY_TOKEN} ${GH_REGISTRY} ;
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
${GH_REGISTRY} ;
fi ;
fi ;
if [[ -n "${CI_REGISTRY}" ]] ; then
if [[ -n "${CI_REGISTRY}" ]] ; then
./gitlab-ci/docker_login.sh -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} ;
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
${CI_REGISTRY} ;
fi ;
fi ;
fi
fi
after_script:
after_script:
Loading