From 1c565efc84e38f5a62fe2968b0a5512a835a9596 Mon Sep 17 00:00:00 2001 From: Tru Huynh <tru@pasteur.fr> Date: Fri, 24 Nov 2023 12:16:57 +0100 Subject: [PATCH] replaced docker build script --- .gitlab-ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48f69b2..d1bd79b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,14 @@ -image: registry-gitlab.pasteur.fr/dsi-tools/docker-images/docker:latest - -services: - - registry-gitlab.pasteur.fr/dsi-tools/docker-images/docker:dind -stages: - - build - build: + image: docker:24 stage: build + before_script: + - i=0; while [ "$i" -lt 12 ]; do docker info && break; sleep 5; i=$(( i + 1 )) ; done + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY script: - - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" registry-gitlab.pasteur.fr - - export MY_TIME=`date +"%F-%H%M"` - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:latest" -t "$CI_REGISTRY_IMAGE:$MY_TIME" . - - docker push "$CI_REGISTRY_IMAGE" + - export MY_TIME=`date +"%F-%H%M"` + - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:latest" -t "$CI_REGISTRY_IMAGE:$MY_TIME" --build-arg="BUILD_OPTIONS=$OPTIONS" -f ./Dockerfile . + - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" + - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" + - docker push "$CI_REGISTRY_IMAGE:latest" + - docker push "$CI_REGISTRY_IMAGE:main" + - docker push "$CI_REGISTRY_IMAGE:$MY_TIME" -- GitLab