Merge branch 'secure_agent_image_tag-INPLATFORM-388' into 'master'

Secure agent image tag-INPLATFORM-388

See merge request !33

.gitlab-ci.yml

@@ -3,8 +3,8 @@ stages:
   - scan
 
 variables:
-  ECR_IMAGE_TAG: "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/enterprise-integrations/iics_secure_agent:${CI_COMMIT_SHORT_SHA}"
-  DOIT_REGISTRY_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  ECR_IMAGE_TAG: "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/enterprise-integrations/iics_secure_agent:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}"
+  DOIT_REGISTRY_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
 
 before_script:
   - apk update && apk add groff less && apk add py3-pip
@@ -27,8 +27,6 @@ build-master:
     - docker push ${DOIT_REGISTRY_IMAGE_TAG}
     - docker push ${ECR_IMAGE_TAG}
   only:
-    refs:
-      - master
     changes:
       - Dockerfile
       - .gitlab-ci.yml
@@ -43,6 +41,6 @@ image_scan:
   extends: qualys_scan
   variables:
     CI_TOKEN: $CI_TOKEN
-    DOCKER_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+    DOCKER_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
   when: on_success
   allow_failure: false