Merge remote-tracking branch 'origin/develop' into develop

Author: birdofpreyru

circle.yml

@@ -20,14 +20,14 @@ deployment:
     branch: develop
     owner: topcoder-platform
     commands:
-      - docker build --build-arg BUILD_ENV=development -t $DEV_AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/community-app:$CIRCLE_SHA1 .
+      - docker build --build-arg BUILD_ENV=development -t $DEV_AWS_ACCOUNT_ID.dkr.ecr.$DEV_AWS_REGION.amazonaws.com/community-app:$CIRCLE_SHA1 .
       - ./deploy.sh DEV $CIRCLE_SHA1
 
   production:
     tag: /v[0-9]+(\.[0-9]+)*/
     owner: topcoder-platform
     commands:
-      - docker build --build-arg BUILD_ENV=production -t $PROD_AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/community-app:$CIRCLE_TAG .
+      - docker build --build-arg BUILD_ENV=production -t $PROD_AWS_ACCOUNT_ID.dkr.ecr.$PROD_AWS_REGION.amazonaws.com/community-app:$CIRCLE_TAG .
       - ./deploy.sh PROD $CIRCLE_TAG
 
 general:

deploy.sh

@@ -5,6 +5,7 @@ JQ="jq --raw-output --exit-status"
 
 ENV=$1
 TAG=$2
+AWS_REGION=$(eval "echo \$${ENV}_AWS_REGION")
 ACCOUNT_ID=$(eval "echo \$${ENV}_AWS_ACCOUNT_ID")
 
 configure_aws_cli() {