update buildspec defs

Author: thatguyinabeanie

Dockerfile

@@ -3,7 +3,7 @@
 # ECR and base image configuration - extracted from CodeBuild environment
 ARG ECR_ACCOUNT_ID=0123456789012
 ARG ECR_REGION=us-east-1
-ARG BASE_IMAGE_NAME=civis-ubuntu-fips
+ARG BASE_IMAGE_NAME=docker-linuxserver-ubuntu-fips
 ARG BASE_IMAGE_TAG=22.04
 ARG ECR_URI=${ECR_ACCOUNT_ID}.dkr.ecr-fips.${ECR_REGION}.amazonaws.com/${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
 

buildspec/merge_master.yaml

@@ -3,12 +3,12 @@ phases:
   pre_build:
     commands:
       - export DOCKER_BUILDKIT=1
-      - echo Logging in to Amazon ECR...
-      - aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${FIPS_REPOSITORY_URI}
       - export ECR_ACCOUNT_ID="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f1)"
       - export ECR_REGION="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f4)"
   build:
     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}
       - echo Building the Docker image...
       - docker build --build-arg ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID} --build-arg ECR_REGION=${ECR_REGION} -t ${FIPS_REPOSITORY_URI}:latest .
       - docker image push --all-tags  ${FIPS_REPOSITORY_URI}

buildspec/push.yaml

@@ -3,13 +3,13 @@ phases:
   pre_build:
     commands:
       - export DOCKER_BUILDKIT=1
+      - export ECR_ACCOUNT_ID="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f1)"
+      - export ECR_REGION="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f4)"
   build:
     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}
       - export COMMIT_HASH_SHORT="$(echo $COMMIT_HASH | cut -c 1-7)"
-      - export ECR_ACCOUNT_ID="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f1)"
-      - export ECR_REGION="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f4)"
       - echo Building the Docker image...
       - echo $COMMIT_HASH_SHORT
       - echo $BRANCH_NAME

buildspec/release.yaml

@@ -4,12 +4,12 @@ phases:
   pre_build:
     commands:
       - export DOCKER_BUILDKIT=1
+      - export ECR_ACCOUNT_ID="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f1)"
+      - export ECR_REGION="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f4)"
   build:
     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}
-      - export ECR_ACCOUNT_ID="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f1)"
-      - export ECR_REGION="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f4)"
       - PATCH_TAG=${TAG_NAME#"v"}
       - MINOR_TAG=${PATCH_TAG%.*}
       - MAJOR_TAG=${MINOR_TAG%.*}