update buildspec defs

Author: thatguyinabeanie

Dockerfile

@@ -1,19 +1,16 @@
 # syntax=docker/dockerfile:1
 
 # ECR and base image configuration - extracted from CodeBuild environment
-ARG ECR_ACCOUNT_ID
-ARG ECR_REGION
+ARG ECR_ACCOUNT_ID=0123456789012
+ARG ECR_REGION=us-east-1
 ARG BASE_IMAGE_NAME=docker-linuxserver-ubuntu-fips
-ARG BASE_IMAGE_TAG=jammy-22.04
+ARG BASE_IMAGE_TAG=ubuntu-fips
 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"
 
-# Set root user home directory to /workspace
-RUN usermod -d /workspace root
-
 # Install Python 3.12
 RUN echo "**** install Python 3.12 ****" && \
   apt-get update && \

buildspec/merge_master.yaml

@@ -10,7 +10,7 @@ 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}
       - 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 build --build-arg ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID} --build-arg ECR_REGION=${ECR_REGION} --build-arg BASE_IMAGE_NAME=docker-linuxserver-ubuntu-fips --build-arg BASE_IMAGE_TAG=ubuntu-fips -t ${FIPS_REPOSITORY_URI}:latest .
       - docker image push --all-tags  ${FIPS_REPOSITORY_URI}
   post_build:
     commands:

buildspec/push.yaml

@@ -14,7 +14,7 @@ phases:
       - echo $FIPS_REPOSITORY_URI
       - echo $COMMIT_HASH_SHORT
       - echo $BRANCH_NAME
-      - 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 build --build-arg ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID} --build-arg ECR_REGION=${ECR_REGION} --build-arg BASE_IMAGE_NAME=docker-linuxserver-ubuntu-fips --build-arg BASE_IMAGE_TAG=ubuntu-fips --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

@@ -13,7 +13,7 @@ phases:
       - 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 build --build-arg ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID} --build-arg ECR_REGION=${ECR_REGION} --build-arg BASE_IMAGE_NAME=docker-linuxserver-ubuntu-fips --build-arg BASE_IMAGE_TAG=ubuntu-fips -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

@@ -10,9 +10,7 @@ services:
         - 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}
+        - BASE_IMAGE_TAG=${BASE_IMAGE_TAG:-local}
         - VERSION=${VERSION:-4.102.1}
         - CODE_RELEASE=${CODE_RELEASE:-4.102.1}
     environment: