Support Apple silicon on MacBook

Author: iankouls-aws

.env

@@ -24,7 +24,7 @@ if [ -f ${HOME}/.aws/credentials ]; then
 fi
 ## If no AWS CLI credentials are configured, then the instance profile is in effect
 ## AWS_REGION - will be set to AWS_DEFAULT_REGION if not set externally.
-export AWS_DEFAULT_REGION=us-east-2
+export AWS_DEFAULT_REGION=us-west-2
 if [ "${AWS_REGION}" == "" ]; then
 	export AWS_REGION=$AWS_DEFAULT_REGION
 fi
@@ -53,7 +53,7 @@ fi
 export IMAGE=aws-do-eks
 ## VERSION: [optional] - Version tag for this Docker image. Example: v20180302
 #export VERSION=v$(date +%Y%m%d)
-export VERSION=v20260606
+export VERSION=v20260611
 export TAG=$(if [ -z "${VERSION}" ]; then echo ""; else echo ":${VERSION}"; 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}"

.gitignore

@@ -24,3 +24,4 @@ Container-Root/SBOM.txt
 Container-Root/version.txt
 Container-Root/eks/deployment/topology/topograph/topograph/
 Container-Root/eks/deployment/nvidia-dynamo/dynamo-platform-*.tgz
+*.pkg

Container-Root/eks/ops/setup/AWSCLIV2.pkg

@@ -7,14 +7,23 @@ ARCH=$(uname -m)
 OS=$(uname -s)
 OS_LOWER=$(echo $OS | tr '[:upper:]' '[:lower:]')
 PLATFORM=${OS_LOWER}-${ARCH}
-URL=https://awscli.amazonaws.com/awscli-exe-${PLATFORM}.zip
-echo "$URL"
-
 # Install aws cli
-curl "$URL" -o "awscliv2.zip"
-unzip awscliv2.zip
-./aws/install
-sudo cp -f /usr/local/bin/aws /bin/aws
+if [ "$OS" == "Darwin" ]; then
+	echo "Installing AWS CLI on Mac ..."
+	URL="https://awscli.amazonaws.com/AWSCLIV2.pkg"
+	echo "${URL}"
+	curl "${URL}" -o "AWSCLIV2.pkg"
+	sudo installer -pkg AWSCLIV2.pkg -target /
+else
+	echo "Installing AWS CLI on Linux ..."
+	URL=https://awscli.amazonaws.com/awscli-exe-${PLATFORM}.zip
+	echo "$URL"
+	curl "$URL" -o "awscliv2.zip"
+	unzip awscliv2.zip
+	./aws/install
+	sudo cp -f /usr/local/bin/aws /bin/aws
+	rm -rf ./aws
+	rm -f awscliv2.zip
+fi
 aws --version
-rm -rf ./aws
-rm -f awscliv2.zip
+

Container-Root/eks/ops/setup/install-aws-cli.sh

@@ -16,5 +16,5 @@ RUN export http_proxy=$http_proxy; export https_proxy=$https_proxy; export no_pr
 
 WORKDIR /eks
 
-CMD /startup.sh
+CMD ["/startup.sh"]