From 37a32a620cc67cd468ab4aad3513fe09496bd554 Mon Sep 17 00:00:00 2001
From: baloola <baloola-mu@hotmail.com>
Date: Sat, 21 Nov 2020 17:18:05 +0100
Subject: [PATCH] fixing sftp:tag
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d360a9a4..7729db4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ build-tag:
- docker pull "$IMAGE_6":latest || true
- docker build --cache-from "$IMAGE_6":latest -t "$IMAGE_6":dev -t "$IMAGE_6":$CI_COMMIT_TAG ingestor/
- IMAGE_7="$CI_REGISTRY_IMAGE/pvs_sftp"
- - docker pull "$IMAGE_7":latest || true
+ - docker pull "$IMAGE_7":$CI_COMMIT_TAG || true
- docker build --cache-from "$IMAGE_7":latest -t "$IMAGE_7":latest -t "$IMAGE_7":$CI_COMMIT_TAG sftp/
- cd ./testing && ./gitlab_test.sh
- if [ $? -ne 0 ]; then exit 1; fi # actually fail build
@@ -74,7 +74,7 @@ build-master-staging:
- docker pull "$IMAGE_6":"$TAG_USED" || true
- docker build --cache-from "$IMAGE_6":"$TAG_USED" -t "$IMAGE_6":dev -t "$IMAGE_6":"$TAG_USED" ingestor/
- IMAGE_7="$CI_REGISTRY_IMAGE/pvs_sftp"
- - docker pull "$IMAGE_7":latest || true
+ - docker pull "$IMAGE_7":$CI_COMMIT_TAG || true
- docker build --cache-from "$IMAGE_7":latest -t "$IMAGE_7":latest -t "$IMAGE_7":$CI_COMMIT_TAG sftp/
- cd ./testing && ./gitlab_test.sh
- if [ $? -ne 0 ]; then exit 1; fi # actually fail build
@@ -84,6 +84,7 @@ build-master-staging:
- docker push "$IMAGE_4":"$TAG_USED"
- docker push "$IMAGE_5":"$TAG_USED"
- docker push "$IMAGE_6":"$TAG_USED"
+ - docker push "$IMAGE_7":"$TAG_USED"
only:
- staging
- master
--
GitLab