Refactored HS Account id

Author: chrisjwwalker

Jenkinsfile

@@ -63,14 +63,15 @@ pipeline {
         AWS_SECRET_ACCESS_KEY = credentials('aws-secret-key')
         AWS_DEFAULT_REGION = 'eu-west-2'
         ROLE_ARN = credentials('home-server-role-arn')
+        HS_ACCOUNT_ID = credentials('home-server-aws-account-id')
       }
       steps {
         script {
           sh '''
             ./build/aws/assume-role.sh;
-            aws ecr get-login-password | docker login -u AWS --password-stdin "https://$(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.eu-west-2.amazonaws.com"
-            docker tag cjww-development/gatekeeper:${TAG_NAME} $(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.eu-west-2.amazonaws.com/gatekeeper:${TAG_NAME}
-            docker push $(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.eu-west-2.amazonaws.com/gatekeeper:${TAG_NAME}
+            aws ecr get-login-password | docker login -u AWS --password-stdin "https://${HS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com"
+            docker tag cjww-development/gatekeeper:${TAG_NAME} ${HS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/gatekeeper:${TAG_NAME}
+            docker push ${HS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/gatekeeper:${TAG_NAME}
           '''
         }
       }