From 282d47ed40e3da0a4a043c17de565ae638a3ec67 Mon Sep 17 00:00:00 2001
From: Tru Huynh <tru@pasteur.fr>
Date: Wed, 18 May 2022 17:39:53 +0200
Subject: [PATCH] Docker with single push/multiple tags, singularity builder
upgraded
---
.gitlab-ci.yml | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a623b61..9a7365a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,19 +10,15 @@ docker-build-push:
- registry-gitlab.pasteur.fr/dsi-tools/docker-images/docker:dind
script:
- docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" registry-gitlab.pasteur.fr
- - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" .
- - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME"
- - docker tag "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
- - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
- - export MY_TIME=`date +"%F-%H%M"`
- - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:$MY_TIME"
- - docker push "$CI_REGISTRY_IMAGE:$MY_TIME"
+ - export MY_TIME=`date +"%F-%H%M"`
+ - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_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"
singularity-build-push:
stage: step2
needs: ["docker-build-push"]
image:
- name: quay.io/singularity/singularity:v3.8.4
+ name: quay.io/singularity/singularity:v3.10.0
entrypoint: [""]
script:
- singularity build singularity.sif Singularity
--
GitLab