diff options
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ce4cd4..5fc013b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ container_scanning: stage: test variables: DOTENV: '.env.legacy' - IMAGE_TAG: "${MAJOR}-${CI_COMMIT_REF_SLUG}-stable" + IMAGE_TAG: "${MAJOR}-${CI_COMMIT_SHA}-stable" only: - branches except: @@ -66,19 +66,19 @@ container_scanning: extends: .QA:test-release variables: DOTENV: ".env.12-3-stable" - IMAGE_TAG: "${MAJOR}-3_${CI_COMMIT_REF_SLUG}-stable" + IMAGE_TAG: "${MAJOR}-3_${CI_COMMIT_SHA}-stable" 12-2-test-release: extends: .QA:test-release variables: DOTENV: ".env.12-2-stable" - IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_REF_SLUG}-stable" + IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_SHA}-stable" 12-1-test-release: extends: .QA:test-release variables: DOTENV: ".env.legacy" - IMAGE_TAG: "${MAJOR}-1_${CI_COMMIT_REF_SLUG}-stable" + IMAGE_TAG: "${MAJOR}-1_${CI_COMMIT_SHA}-stable" QA:java-maven: extends: .QA @@ -119,10 +119,7 @@ QA:go: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - export SOURCE_IMAGE=$TMP_IMAGE - - echo $IMAGE_TAG - - echo $CI_JOB_NAME - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME} - - echo $TARGET_IMAGE - | if [ -z "$DOTENV" ]; then docker pull $SOURCE_IMAGE |