Merge pull request #208 from spacetelescope/release/v0.4.45

Release/v0.4.45
spacetelescope · Oct 29, 2024 · ab3a095 · ab3a095
2 parents 7710d1f + 62ecc63
commit ab3a095
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 9 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,2 +1,3 @@
-- default base docker image set to CALDP_20240813_CAL_final
-- default crds update to hst_1169.pmap
+- update caldp version
+- set permissions to make files readable and dirs executable in AL2023
+- additional updates for STSCI-AMAZON-LINUX2023
diff --git a/lambda/JobPredict/Dockerfile b/lambda/JobPredict/Dockerfile
@@ -22,4 +22,6 @@ RUN yum update -y java-1.8.0-openjdk
 #RUN python3.7 -m pip install --upgrade pip && python3.7 -m pip install -r requirements.txt && python3.7 -m pip install https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.6.2-cp37-cp37m-manylinux2010_x86_64.whl
 RUN python3.11 -m pip install --upgrade pip && python3.11 -m pip install -r requirements.txt && python3.11 -m pip install tensorflow-cpu==2.12.1
 ADD  models ./models/
+RUN chmod -R ugo+r ./models/
+RUN find ./models/ -type d -exec chmod og+x {} +
 CMD ["predict_handler.lambda_handler"]
diff --git a/terraform/deploy.sh b/terraform/deploy.sh
@@ -15,7 +15,7 @@ echo $aws_tfstate
 # get AMI id(s)
 cd $CALCLOUD_BUILD_DIR/ami_rotation
 ami_json=$(echo $(awsudo $ADMIN_ARN aws ec2 describe-images --region us-east-1 --executable-users self))
-ci_ami=`python3 parse_image_json.py "${ami_json}" STSCI-AWS-Linux-2`
+ci_ami=`python3 parse_image_json.py "${ami_json}" STSCI-AMAZON-LINUX2023`
 ecs_ami=`python3 parse_image_json.py "${ami_json}" STSCI-ECS-AL2023`
 
 if [[ "$ci_ami" =~ ^ami-[a-z0-9]+$ ]]; then

diff --git a/terraform/deploy_ami_rotate.sh b/terraform/deploy_ami_rotate.sh
@@ -76,7 +76,7 @@ echo $aws_tfstate
 # get AMI id
 cd $CALCLOUD_BUILD_DIR/ami_rotation
 ami_json=$(echo $(awsudo $ADMIN_ARN aws ec2 describe-images --region us-east-1 --executable-users self))
-ci_ami=`python3 parse_image_json.py "${ami_json}" STSCI-AWS-Linux-2`
+ci_ami=`python3 parse_image_json.py "${ami_json}" STSCI-AMAZON-LINUX2023`
 ecs_ami=`python3 parse_image_json.py "${ami_json}" STSCI-ECS-AL2023`
 
 if [[ "$ci_ami" =~ ^ami-[a-z0-9]+$ ]]; then

diff --git a/terraform/deploy_ami_rotate_codebuild_script.sh b/terraform/deploy_ami_rotate_codebuild_script.sh
@@ -77,7 +77,7 @@ echo $aws_tfstate
 # get AMI id
 cd $CALCLOUD_BUILD_DIR/ami_rotation
 ami_json=$(echo $(aws ec2 describe-images --region us-east-1 --executable-users self))
-ci_ami=`python3 parse_image_json.py "${ami_json}" STSCI-AWS-Linux-2`
+ci_ami=`python3 parse_image_json.py "${ami_json}" STSCI-AMAZON-LINUX2023`
 ecs_ami=`python3 parse_image_json.py "${ami_json}" STSCI-ECS-AL2023`
 
 if [[ "$ci_ami" =~ ^ami-[a-z0-9]+$ ]]; then

diff --git a/terraform/deploy_ami_rotation_codebuild_image.sh b/terraform/deploy_ami_rotation_codebuild_image.sh
@@ -29,6 +29,9 @@ docker push ${AMIROTATION_DOCKER_IMAGE_UNSCANNED}
 cd ${CALCLOUD_BUILD_DIR}/terraform
 pwd
 
+echo "Sleeping for 30 seconds before scanning"
+sleep 30
+
 python3 ami-rotation-image-scan.py
 amirotation_image_scan_status=$?
 

diff --git a/terraform/deploy_checkout_repos.sh b/terraform/deploy_checkout_repos.sh
@@ -50,4 +50,7 @@ then
     fi
 fi
 
-cd $cwd
+chmod -R og+r ${TMP_INSTALL_DIR}
+find ${TMP_INSTALL_DIR} -type d -exec chmod og+x {} +
+
+cd $cwd
diff --git a/terraform/deploy_vars.sh b/terraform/deploy_vars.sh
@@ -1,7 +1,7 @@
 #! /bin/bash -xu
-export CALCLOUD_VER="v0.4.44"
-export CALDP_VER="v0.2.26"
-export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_20240813_CAL_final"
+export CALCLOUD_VER="v0.4.45"
+export CALDP_VER="v0.2.27"
+export CAL_BASE_IMAGE="stsci/hst-pipeline:2024.10.1.1-mostlycos-py311"
 export BASE_IMAGE_TAG=`cut -d ":" -f2- <<< ${CAL_BASE_IMAGE} `
 
 export COMMON_IMAGE_TAG="CALCLOUD_${CALCLOUD_VER}-CALDP_${CALDP_VER}-BASE_${BASE_IMAGE_TAG}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,4 +50,7 @@ then @@
         fi
     fi
-    cd $cwd
+    chmod -R og+r ${TMP_INSTALL_DIR}
+    find ${TMP_INSTALL_DIR} -type d -exec chmod og+x {} +
+    cd $cwd