diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d360a9a4c725d18d951923fbc10b00edc9e7b97a..7729db4b6ba92a035ec4c7eba81a75f34fc98e84 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