From de704ad55d2e07d160ece6b265f64e8201be0055 Mon Sep 17 00:00:00 2001
From: mdefende <mdefende@uab.edu>
Date: Mon, 4 Nov 2024 13:51:00 -0600
Subject: [PATCH] update build tagging
---
.gitlab-ci.yml | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb8c917..88cf972 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
default:
before_script:
- - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
interruptible: true
stages:
@@ -28,7 +28,22 @@ get-cookie:
- cookies.txt
expire_in: 5 minutes
-docker-build:
+build-latest:
+ stage: build
+ image: docker:latest
+ services:
+ - docker:dind
+ dependencies:
+ - get-cookie
+ script:
+ - echo "Building and tagging as latest"
+ - docker pull $CI_REGISTRY_IMAGE:latest || true
+ - docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:latest .
+ - docker push $CONTAINER_IMAGE:latest
+ only:
+ - main
+
+build-version:
stage: build
image: docker:latest
services:
@@ -36,7 +51,10 @@ docker-build:
dependencies:
- get-cookie
script:
+ - echo "Building and tagging as $CI_COMMIT_REF_NAME"
- docker pull $CI_REGISTRY_IMAGE:latest || true
- - docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CI_REGISTRY_IMAGE:latest .
- - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
- - docker push $CI_REGISTRY_IMAGE:latest
+ - docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME#v} .
+ - docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME#v}
+ only:
+ - tags
+ - /^v\d+\.\d+$/
\ No newline at end of file
--
GitLab