From b9a9d3995f475c174e5c30b7571476156fd3dd61 Mon Sep 17 00:00:00 2001 From: baloola <baloola-mu@hotmail.com> Date: Sat, 21 Nov 2020 17:55:59 +0100 Subject: [PATCH] fix typo --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7729db4b..b1cd25d0 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":$CI_COMMIT_TAG || true + - docker pull "$IMAGE_7":latest || 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 @@ -68,13 +68,13 @@ build-master-staging: - docker pull "$IMAGE_4":"$TAG_USED" || true - docker build --cache-from "$IMAGE_4":"$TAG_USED" -t "$IMAGE_4":dev -t "$IMAGE_4":"$TAG_USED" cache/ - IMAGE_5="$CI_REGISTRY_IMAGE/fluentd" - - docker pull "$IMAGE_6":"$TAG_USED" || true + - docker pull "$IMAGE_5":"$TAG_USED" || true - docker build --cache-from "$IMAGE_5":"$TAG_USED" -t "$IMAGE_5":dev -t "$IMAGE_5":"$TAG_USED" fluentd/ - IMAGE_6="$CI_REGISTRY_IMAGE/pvs_ingestor" - 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":$CI_COMMIT_TAG || true + - docker pull "$IMAGE_7":"$TAG_USED" || 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 -- GitLab