Introduce compact build, configured by MOD setting in .env

Author: iankouls-aws

.env

@@ -26,7 +26,6 @@ fi
 ## AWS_REGION - will be set to AWS_DEFAULT_REGION if not set externally.
 export AWS_DEFAULT_REGION=us-west-2
 export AWS_REGION=$(aws configure get region)
-#export AWS_REGION=$(aws ec2 describe-availability-zones --output text --query 'AvailabilityZones[0].[RegionName]')
 if [ "${AWS_REGION}" == "" ]; then
 	export AWS_REGION=$AWS_DEFAULT_REGION
 fi
@@ -35,8 +34,8 @@ fi
 ## If REGISTRY==default, then the default elastic container registry in the account for the current region will be used 
 export REGISTRY=default
 ## Set default registry if needed
+export REGION=${AWS_REGION}
 if [ "$REGISTRY" == "default" ]; then
-    export REGION=${AWS_REGION}
     export ACCOUNT=$(aws sts get-caller-identity --query Account --output text)
     if [ "$ACCOUNT" == "" ]; then
 	export REGISTRY=""
@@ -53,12 +52,17 @@ fi
 
 ## IMAGE: <required> - Docker image name for this project. Example: myapp
 export IMAGE=aws-do-hyperpod
+## MOD: [optional] - modifier of image build that controls whether certain non-essential components are installed
+##                   this is done to control image size. If MOD="" then everything is included, if MOD="compact" then only required components are included.
+#export MOD=compact
+export MOD=""
+export MOD_TAG=$(if [ "$MOD" == "" ]; then echo ""; else echo "-${MOD}"; fi)
 ## VERSION: [optional] - Version tag for this Docker image. Example: v20180302
 #export VERSION=v$(date +%Y%m%d)
 export VERSION=v20240910
-export TAG=$(if [ -z "${VERSION}" ]; then echo ""; else echo ":${VERSION}"; fi) 
+export TAG=$(if [ -z "${VERSION}" ]; then echo ":latest${MOD_TAG}"; else echo ":${VERSION}${MOD_TAG}"; fi) 
 ## BUILD_OPTS: [optional] - arguments for the docker image build command
-export BUILD_OPTS="--progress plain --build-arg http_proxy=${http_proxy} --build-arg https_proxy=${https_proxy} --build-arg no_proxy=${no_proxy}"
+export BUILD_OPTS="--progress plain --build-arg http_proxy=${http_proxy} --build-arg https_proxy=${https_proxy} --build-arg no_proxy=${no_proxy} --build-arg MOD=${MOD}"
 
 # Docker container runtime settings
 ## CONTAINER_NAME: [optional] - Name of the Docker container including the --name switch. Example --name myapp
@@ -71,7 +75,7 @@ export VOL_MAP="-v ${HOME}/.aws:/root/.aws -v ${HOME}/.kube:/root/.kube -v $(pwd
 ## Network [optional] - Network name including the --net switch. Example --net mynet
 #export NETWORK=
 ## RUN_OPTS [optional] - additional options to specify with the run comman. Example -e POSTGRES_DB=dbname
-export RUN_OPTS="-e http_proxy=$http_proxy -e https_proxy=$https_proxy -e no_proxy=$no_proxy -e REGION=$REGION -e AWS_DEFAULT_REGION=$REGION"
+export RUN_OPTS="-e http_proxy=$http_proxy -e https_proxy=$https_proxy -e no_proxy=$no_proxy -e REGION=$REGION -e AWS_REGION=$REGION -e AWS_DEFAULT_REGION=$REGION"
 if [ -f ${HOME}/.aws/credentials ]; then
 	export RUN_OPTS="${RUN_OPTS} -e AWS_PROFILE=$AWS_PROFILE"
 fi

Container-Root/hyperpod/impl/eks/hyperpod-create.sh

@@ -22,10 +22,15 @@ if [ "$CREATE_EKS_CLUSTER" == "" ]; then
 	export CREATE_EKS_CLUSTER=true
 fi
 
+export REGION_OPT=""
+if [ ! "${AWS_REGION}" == "" ]; then
+	export REGION_OPT="--region ${AWS_REGION}"
+fi
+
 pushd ${ENV_HOME}impl/eks/src
 
 # Create cfn stack if it does not exist
-CMD="aws cloudformation list-stacks --query 'StackSummaries[?StackStatus==\`CREATE_COMPLETE\`].StackName' | grep \\\"${STACK_ID}\\\" | wc -l | tr -d ' '"
+CMD="aws cloudformation list-stacks --query 'StackSummaries[?StackStatus==\`CREATE_COMPLETE\`].StackName' ${REGION_OPT} | grep \\\"${STACK_ID}\\\" | wc -l | tr -d ' '"
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 STACK_COUNT=$(eval $CMD)
 echo "STACK_COUNT=$STACK_COUNT"

Container-Root/setup.sh

@@ -41,34 +41,40 @@ popd
 # Install helm
 ./hyperpod/setup/eks/install-helm.sh
 
-# Install docker
-./hyperpod/setup/install-docker.sh
-
-# Install golang
-./hyperpod/setup/install-go.sh
-
 # Install python
 ./hyperpod/setup/install-python.sh
 python -m pip install torchx[kubernetes]
 
-# Install monitui
-./hyperpod/setup/eks/install-monitui.sh
-
 # Install kubeps1 and configure bashrc aliases 
 ./hyperpod/setup/eks/install-kubeps1.sh
 
 # Install bash customizations
 ./hyperpod/setup/install-bashrc.sh
 
-# Install k9s
-./hyperpod/setup/eks/install-k9s.sh
-
 # Install hyperpod-eks
 ./hyperpod/setup/eks/install-hyperpod-eks.sh
 
 # Install sbom utilities
 ./hyperpod/setup/install-sbom-utils.sh
 
+if [ ! "$MOD" == "compact" ]; then
+	# Install docker
+	./hyperpod/setup/install-docker.sh
+
+	# Install golang
+	./hyperpod/setup/install-go.sh
+
+	# Install monitui
+	./hyperpod/setup/eks/install-monitui.sh
+
+	# Install k9s
+	./hyperpod/setup/eks/install-k9s.sh
+
+	apt clean
+
+	pip cache purge
+fi
+
 # Generate SBOM and store it in the root of the container image
 ./sbom.sh
 

Dockerfile

@@ -3,14 +3,15 @@ FROM public.ecr.aws/ubuntu/ubuntu:22.04
 ARG http_proxy
 ARG https_proxy
 ARG no_proxy
+ARG MOD
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV AWS_PAGER=""
 ENV VERBOSE="true"
 
 ADD Container-Root /
 
-RUN export http_proxy=$http_proxy; export https_proxy=$https_proxy; export no_proxy=$no_proxy; /setup.sh; rm -f /setup.sh
+RUN export http_proxy=$http_proxy; export https_proxy=$https_proxy; export no_proxy=$no_proxy; export MOD=$MOD; /setup.sh; rm -f /setup.sh
 
 WORKDIR /hyperpod