Refactoring script for ecr AWS_REGION

devopscorner · Jan 7, 2023 · f57c010 · f57c010
1 parent 57f0960
commit f57c010
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/compose/ecr-build.sh b/compose/ecr-build.sh
@@ -8,7 +8,8 @@
 set -e
 
 export AWS_ACCOUNT_ID=$1
-export CI_REGISTRY="${AWS_ACCOUNT_ID}.dkr.ecr.ap-southeast-1.amazonaws.com"
+export AWS_REGION="ap-southeast-1"
+export CI_REGISTRY="$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com"
 export CI_ECR_PATH=$3
 
 export IMAGE="$CI_REGISTRY/$CI_ECR_PATH"

diff --git a/compose/ecr-pull.sh b/compose/ecr-pull.sh
@@ -8,7 +8,8 @@
 set -e
 
 export AWS_ACCOUNT_ID=$1
-export CI_REGISTRY="${AWS_ACCOUNT_ID}.dkr.ecr.ap-southeast-1.amazonaws.com"
+export AWS_REGION="ap-southeast-1"
+export CI_REGISTRY="$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com"
 export CI_ECR_PATH=$2
 
 export IMAGE="$CI_REGISTRY/$CI_ECR_PATH"
@@ -22,8 +23,8 @@ login_ecr() {
   echo "============="
   echo "  Login ECR  "
   echo "============="
-  PASSWORD=$(aws ecr get-login-password --region ap-southeast-1)
-  echo $PASSWORD | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.ap-southeast-1.amazonaws.com
+  PASSWORD=$(aws ecr get-login-password --region $AWS_REGION)
+  echo $PASSWORD | docker login --username AWS --password-stdin $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com
   echo '- DONE -'
   echo ''
 }

diff --git a/compose/ecr-push.sh b/compose/ecr-push.sh
@@ -8,7 +8,8 @@
 set -e
 
 export AWS_ACCOUNT_ID=$1
-export CI_REGISTRY="${AWS_ACCOUNT_ID}.dkr.ecr.ap-southeast-1.amazonaws.com"
+export AWS_REGION="ap-southeast-1"
+export CI_REGISTRY="$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com"
 export CI_ECR_PATH=$2
 
 export IMAGE="$CI_REGISTRY/$CI_ECR_PATH"
@@ -17,8 +18,8 @@ login_ecr() {
   echo "============="
   echo "  Login ECR  "
   echo "============="
-  PASSWORD=$(aws ecr get-login-password --region ap-southeast-1)
-  echo $PASSWORD | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.ap-southeast-1.amazonaws.com
+  PASSWORD=$(aws ecr get-login-password --region $AWS_REGION)
+  echo $PASSWORD | docker login --username AWS --password-stdin $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com
   echo '- DONE -'
   echo ''
 }

diff --git a/compose/ecr-tag.sh b/compose/ecr-tag.sh
@@ -8,7 +8,8 @@
 set -e
 
 export AWS_ACCOUNT_ID=$1
-export CI_REGISTRY="${AWS_ACCOUNT_ID}.dkr.ecr.ap-southeast-1.amazonaws.com"
+export AWS_REGION="ap-southeast-1"
+export CI_REGISTRY="$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com"
 export CI_ECR_PATH=$2
 
 export IMAGE="$CI_REGISTRY/$CI_ECR_PATH"