Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v0.4.45 #208

Merged
merged 14 commits into from
Oct 29, 2024
Merged

Release/v0.4.45 #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
239654d
Update caldp version
raswaters Sep 20, 2024
5c5ba75
fix permission issues
jshihstsci Aug 16, 2024
3dcacb0
fix typo
jshihstsci Aug 16, 2024
87ef927
Merge pull request #206 from spacetelescope/fix-permissions
raswaters Sep 21, 2024
41df536
Fix permissions
raswaters Sep 21, 2024
f83e52c
Fix permissions on directories
raswaters Sep 24, 2024
9aa9e2c
Fix permissions on directories
raswaters Sep 24, 2024
07dec24
Update deploy_vars.sh
raswaters Sep 25, 2024
e6be971
Update deploy_vars.sh
raswaters Sep 25, 2024
a7fdf0c
replace old ci ami filter (#207)
jshihstsci Oct 7, 2024
e3771d9
Update deploy_vars.sh
raswaters Oct 8, 2024
e742f84
Update caldp version
raswaters Oct 14, 2024
a4694d2
Update caldp release
raswaters Oct 14, 2024
62ecc63
Update deploy_vars.sh
raswaters Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions lambda/JobPredict/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion terraform/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion terraform/deploy_ami_rotate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion terraform/deploy_ami_rotate_codebuild_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions terraform/deploy_ami_rotation_codebuild_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=$?

Expand Down
5 changes: 4 additions & 1 deletion terraform/deploy_checkout_repos.sh
View file
Open in desktop
Original file line number Diff 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
6 changes: 3 additions & 3 deletions terraform/deploy_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down
Loading