Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into develop

.gitlab-ci.yml

@@ -15,13 +15,15 @@ build-aws:
   stage: build
   services:
     - docker:dind
+  variables:
+    IMAGE_REPO: faraday-qa
   before_script:
     - apk add --no-cache curl jq python py-pip
     - pip install awscli
   script:
     - eval $(aws ecr get-login --no-include-email --region eu-west-1 | sed 's|https://||')
-    - docker build -t $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA .
-    - docker tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA $REPOSITORY_URL:latest
+    - docker build -t $IMAGE_REPO:$CI_COMMIT_SHA .
+    - docker tag $IMAGE_REPO:$CI_COMMIT_SHA $REPOSITORY_URL:latest
     - docker push $REPOSITORY_URL:latest
 
 build: