update buildspec defs

Author: thatguyinabeanie

Dockerfile

@@ -1,6 +1,13 @@
 # syntax=docker/dockerfile:1
 
-FROM gabemendoza1/docker-linuxserver-ubuntu-fips:jammy-22.04 as docker-code-server-python
+# ECR and base image configuration - extracted from CodeBuild environment
+ARG ECR_ACCOUNT_ID
+ARG ECR_REGION
+ARG BASE_IMAGE_NAME=docker-linuxserver-ubuntu-fips
+ARG BASE_IMAGE_TAG=jammy-22.04
+ARG ECR_URI=${ECR_ACCOUNT_ID}.dkr.ecr-fips.${ECR_REGION}.amazonaws.com/${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
+
+FROM ${ECR_URI} as docker-code-server-python
 
 ARG DEBIAN_FRONTEND="noninteractive"
 
@@ -19,8 +26,7 @@ RUN echo "**** install Python 3.12 ****" && \
   apt-get install -y \
     python3.12 \
     python3.12-dev \
-    python3.12-venv \
-    python3.12-distutils && \
+    python3.12-venv && \
   update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1 && \
   update-alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \
   curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12 && \
@@ -31,7 +37,7 @@ RUN echo "**** install Python 3.12 ****" && \
   apt-get clean && \
   rm -rf \
     /var/lib/apt/lists/* \
-    /tmp/* 
+    /tmp/*
 
 FROM docker-code-server-python
 ARG BUILD_DATE

buildspec/merge_master.yaml

@@ -2,12 +2,15 @@ version: 0.2
 phases:
   pre_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 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}
       - 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

@@ -1,5 +1,10 @@
 version: 0.2
 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...
@@ -9,9 +14,7 @@ phases:
       - 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} .
-      # 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 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} .
       - docker image push --all-tags ${FIPS_REPOSITORY_URI}
   post_build:
     commands:

buildspec/release.yaml

@@ -1,15 +1,19 @@
-
 version: 0.2
 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}
       - 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} .
+      - 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:
     commands:

docker-compose.yml

@@ -1,13 +1,18 @@
 ---
 services:
   docker-code-server:
-    image: gabemendoza1/docker-code-server:jammy22.04-python3.12-codeserver-v${CODE_RELEASE:-4.102.1}
+    image: "${ECR_ACCOUNT_ID}.dkr.ecr-fips.${ECR_REGION}.amazonaws.com/docker-code-server:${IMAGE_TAG:-local}"
+    pull_policy: build
     build:
       context: .
       dockerfile: Dockerfile
       platforms:
         - linux/amd64
       args:
+        - ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID}
+        - ECR_REGION=${ECR_REGION:-us-east-1}
+        - BASE_IMAGE_NAME=${BASE_IMAGE_NAME:-docker-linuxserver-ubuntu-fips}
+        - BASE_IMAGE_TAG=${BASE_IMAGE_TAG:-jammy-22.04}
         - VERSION=${VERSION:-4.102.1}
         - CODE_RELEASE=${CODE_RELEASE:-4.102.1}
     environment: