build in codebuild

Author: thatguyinabeanie

Dockerfile

@@ -1,11 +1,11 @@
 # syntax=docker/dockerfile:1
 
-# ECR and base image configuration
-ARG ECR_ACCOUNT_ID=1234567890123
-ARG ECR_REGION=us-east-999
-ARG BASE_IMAGE_NAME=ubuntu-fips
+# ECR and base image configuration - extracted from CodeBuild environment
+ARG ECR_ACCOUNT_ID
+ARG ECR_REGION
+ARG BASE_IMAGE_NAME=civis-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} 
+ARG ECR_URI=${ECR_ACCOUNT_ID}.dkr.ecr-fips.${ECR_REGION}.amazonaws.com/${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
 
 FROM ${ECR_URI} as ubuntu-fips-s6
 # set version labels

buildspec/merge_master.yaml

@@ -4,10 +4,15 @@ 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"
   build:
     commands:
       - echo Building the Docker image...
-      - docker build -t ${FIPS_REPOSITORY_URI}:latest .
+      - 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}
   post_build:
     commands:

buildspec/push.yaml

@@ -5,11 +5,16 @@ phases:
       - 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)"
+      # 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 Building the Docker image...
       - echo $FIPS_REPOSITORY_URI
       - echo $COMMIT_HASH_SHORT
       - echo $BRANCH_NAME
-      - docker build --tag ${FIPS_REPOSITORY_URI}:${COMMIT_HASH_SHORT} --tag ${FIPS_REPOSITORY_URI}:${BRANCH_NAME} .
+      - echo "ECR Account ID: $ECR_ACCOUNT_ID"
+      - echo "ECR Region: $ECR_REGION"
+      - docker build --build-arg ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID} --build-arg ECR_REGION=${ECR_REGION} --tag ${FIPS_REPOSITORY_URI}:${COMMIT_HASH_SHORT} --tag ${FIPS_REPOSITORY_URI}:${BRANCH_NAME} .
       # We have a life cycle policy in place to expire and delete images from dev branches,
       # so there are no issues with pushing as many of these images as there may be.
       - docker image push --all-tags ${FIPS_REPOSITORY_URI}

buildspec/release.yaml

@@ -5,11 +5,16 @@ 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 Building the Docker image...
       - PATCH_TAG=${TAG_NAME#"v"} # major.minor.patch
       - MINOR_TAG=${PATCH_TAG%.*} # major.minor
       - MAJOR_TAG=${MINOR_TAG%.*} # major
-      - docker build -t ${FIPS_REPOSITORY_URI}:${PATCH_TAG} -t ${FIPS_REPOSITORY_URI}:${MINOR_TAG} -t ${FIPS_REPOSITORY_URI}:${MAJOR_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:
     commands:

docker-compose.yml

@@ -1,7 +1,6 @@
 ---
 services:
   docker-linux-server-ubuntu-fips:
-    image: gabemendoza1/docker-linuxserver-ubuntu-fips:${VERSION:-jammy-22.04}
     build:
       context: .
       dockerfile: Dockerfile