[gjs/ci-use-mozjs-latest: 1/4] ci: Define once some image template duplicated variables




commit d2f100d8955b5af2bb23224b43655e81c0029371
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date:   Mon Oct 12 14:51:45 2020 +0200

    ci: Define once some image template duplicated variables

 .gitlab-ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68d81a0d..d0087e92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -320,21 +320,23 @@ zeal_11:
     - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
 
     # Where the real magic happens
-    - buildah bud -f $DOCKERFILE -t "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" $ARGS
+    - buildah bud -f $DOCKERFILE -t "$IMAGE_NAME" $ARGS
 
     # Prepare to publish
-    - buildah tag "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" "$CI_REGISTRY_IMAGE:job-${CI_JOB_ID}_$CI_JOB_NAME"
+    - buildah tag "$IMAGE_NAME" "$IMAGE_JOB_NAME"
     - buildah images
     - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
     # Publish (if running on a schedule)
     - |
       if [[ "$CI_PIPELINE_SOURCE" == "schedule" ]]; then
-        buildah push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
-        buildah push "$CI_REGISTRY_IMAGE:job-${CI_JOB_ID}_$CI_JOB_NAME"
+        buildah push "$IMAGE_NAME"
+        buildah push "$IMAGE_JOB_NAME"
       fi
 
 .Docker variables: &docker_variables
+  IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_JOB_NAME
+  IMAGE_JOB_NAME: CI_REGISTRY_IMAGE:job-${CI_JOB_ID}_$CI_JOB_NAME
   STORAGE_DRIVER: vfs
   BUILDAH_FORMAT: docker
   BUILDAH_ISOLATION: chroot


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]