cache cleaning and commented out public image stuff

Author: hobu

Dockerfile

@@ -20,6 +20,7 @@ ENV CONDAENV "/opt/conda/envs/${CONDA_ENV_NAME}"
 # Create the environment:
 COPY build-environment.yml .
 RUN conda env create -f build-environment.yml
+RUN mamba update --all -y
 
 COPY run-environment.yml .
 RUN conda env create -f run-environment.yml

build-environment.yml

@@ -3,3 +3,4 @@ channels:
   - conda-forge
 dependencies:
   - conda-pack
+  - mamba

build.sh

@@ -7,6 +7,15 @@ then
     echo "container name not set! please execute './build.sh containername'"
     exit 1;
 fi
+WIPE_CACHE="$2"
+if [ -z "$WIPE_CACHE" ]; then
+    echo "Not wiping cache";
+else
+    WIPE_CACHE="--no-cache"
+    echo "Wiping cache '$WIPE_CACHE'";
+
+fi
+
 region=$AWS_DEFAULT_REGION
 if [ -z "$region" ]
 then
@@ -21,6 +30,8 @@ then
 fi
 
 CONTAINER_NAME=$identity.dkr.ecr.$region.amazonaws.com/$container
+#CONTAINER_NAME=public.ecr.aws/d4n0a3t5/$container
+
 
 LAMBDA_IMAGE="amazon/aws-lambda-provided:al2"
 docker buildx build -t $CONTAINER_NAME:amd64 . \
@@ -33,4 +44,5 @@ LAMBDA_IMAGE="amazon/aws-lambda-provided:al2.2023.12.14.13"
 docker buildx build -t $CONTAINER_NAME:arm64 . \
     -f Dockerfile --platform linux/arm64 \
     --build-arg LAMBDA_IMAGE=$LAMBDA_IMAGE \
+    $WIPE_CACHE \
     --build-arg RIE_ARCH=arm64 --load

push.sh

@@ -11,9 +11,14 @@ region="$AWS_DEFAULT_REGION"
 echo "region: ${region}"
 
 # login to docker
-eval $(aws ecr get-login --no-include-email --region ${region})
 identity=$(aws sts get-caller-identity --query 'Account' --output text)
 
+COMMAND="aws ecr get-login-password --region $AWS_DEFAULT_REGION | docker login --username AWS --password-stdin $identity.dkr.ecr.$region.amazonaws.com"
+#COMMAND="aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/d4n0a3t5"
+
+echo "$COMMAND"
+eval $COMMAND
+
 repository=$(aws ecr describe-repositories --repository-names $container)
 echo "repository: ${repository}"
 
@@ -22,17 +27,24 @@ for tag in amd64 arm64;
 do
     echo $Item
     CONTAINER_NAME=${identity}.dkr.ecr.${region}.amazonaws.com/${container}:$tag
+#    CONTAINER_NAME=public.ecr.aws/d4n0a3t5/$container:$tag
     echo $CONTAINER_NAME
     docker push "$CONTAINER_NAME"
 done
 
 
 
+#CONTAINER_NAME=public.ecr.aws/d4n0a3t5/$container:latest
+#docker manifest create "$CONTAINER_NAME" \
+#    --amend "public.ecr.aws/d4n0a3t5/${container}:arm64" \
+#    --amend "public.ecr.aws/d4n0a3t5/${container}:amd64"
 CONTAINER_NAME=${identity}.dkr.ecr.${region}.amazonaws.com/${container}:latest
+docker manifest rm "$CONTAINER_NAME"
 docker manifest create "$CONTAINER_NAME" \
---amend "${identity}.dkr.ecr.${region}.amazonaws.com/${container}:arm64" \
---amend "${identity}.dkr.ecr.${region}.amazonaws.com/${container}:x86_64"
+    --amend "${identity}.dkr.ecr.${region}.amazonaws.com/${container}:arm64" \
+    --amend "${identity}.dkr.ecr.${region}.amazonaws.com/${container}:amd64"
+
 
 docker manifest inspect $CONTAINER_NAME
 
-docker manifest push "$CONTAINER_NAME"
+docker manifest push "$CONTAINER_NAME"

run-environment.yml

@@ -10,3 +10,4 @@ dependencies:
   - Shapely
   - gdal
   - pyproj
+  - mamba