update merge_master.yaml and release.yaml

Author: thatguyinabeanie

buildspec/merge_master.yaml

@@ -4,11 +4,10 @@ phases:
     commands:
       - echo Logging in to Amazon ECR...
       - aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${FIPS_REPOSITORY_URI}
-      # Extract ECR account ID and region from FIPS_REPOSITORY_URI
       - export ECR_ACCOUNT_ID="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f1)"
       - export ECR_REGION="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f4)"
-      - echo "ECR Account ID: $ECR_ACCOUNT_ID"
-      - echo "ECR Region: $ECR_REGION"
+      - echo "ECR Account ID:" $ECR_ACCOUNT_ID
+      - echo "ECR Region:" $ECR_REGION
   build:
     commands:
       - echo Building the Docker image...

buildspec/release.yaml

@@ -5,15 +5,14 @@ phases:
     commands:
       - echo Logging in to Amazon ECR...
       - aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${FIPS_REPOSITORY_URI}
-      # Extract ECR account ID and region from FIPS_REPOSITORY_URI
       - export ECR_ACCOUNT_ID="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f1)"
       - export ECR_REGION="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f4)"
-      - echo "ECR Account ID: $ECR_ACCOUNT_ID"
-      - echo "ECR Region: $ECR_REGION"
+      - echo "ECR Account ID:" $ECR_ACCOUNT_ID
+      - echo "ECR Region:" $ECR_REGION
       - echo Building the Docker image...
-      - PATCH_TAG=${TAG_NAME#"v"} # major.minor.patch
-      - MINOR_TAG=${PATCH_TAG%.*} # major.minor
-      - MAJOR_TAG=${MINOR_TAG%.*} # major
+      - PATCH_TAG=${TAG_NAME#"v"}
+      - MINOR_TAG=${PATCH_TAG%.*}
+      - MAJOR_TAG=${MINOR_TAG%.*}
       - docker build --build-arg ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID} --build-arg ECR_REGION=${ECR_REGION} -t ${FIPS_REPOSITORY_URI}:${PATCH_TAG} -t ${FIPS_REPOSITORY_URI}:${MINOR_TAG} -t ${FIPS_REPOSITORY_URI}:${MAJOR_TAG} .
       - docker image push --all-tags  ${FIPS_REPOSITORY_URI}
   post_build: