Skip to content

Commit

Permalink
Base image and CRDS context updates
Browse files Browse the repository at this point in the history
  • Loading branch information
raswaters committed Jul 26, 2023
1 parent 81b4cdc commit 442d172
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- default base docker image set to CALDP_20230613_CAL_final
- default crds update to hst_1077.pmap
- default base docker image set to CALDP_cosandpin_CAL_rc1
- default crds update to hst_1089.pmap
9 changes: 4 additions & 5 deletions terraform/deploy_vars.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
#! /bin/bash -xu
export CALCLOUD_VER="ami-rotate-codebuild-v3"
export CALDP_VER="v0.2.22-rc3"
export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_onlywfpc2drizzle_CAL_rc3"

export CALCLOUD_VER="v0.4.41-rc1"
export CALDP_VER="v0.2.23-rc1"
export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_cosandpin_CAL_rc1"
export BASE_IMAGE_TAG=`cut -d ":" -f2- <<< ${CAL_BASE_IMAGE} `

export COMMON_IMAGE_TAG="CALCLOUD_${CALCLOUD_VER}-CALDP_${CALDP_VER}-BASE_${BASE_IMAGE_TAG}"
# these variables are overrides for developers that allow the deploy script to build from local calcloud/caldp source
# i.e. CALCLOUD_BUILD_DIR="$HOME/deployer/calcloud"
# these can be set as environment variables before running to avoid changing the script directly
# (and avoid accidentally committing a custom path to the repo...)
export CALCLOUD_BUILD_DIR=${CALCLOUD_BUILD_DIR:-""}
export CALCLOUD_BUILD_DIR=${CALCLOUD_BUILD_DIR:-""}
export CALDP_BUILD_DIR=${CALDP_BUILD_DIR:-""}

export TMP_INSTALL_DIR="/tmp/calcloud_install"
Expand Down
4 changes: 2 additions & 2 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ variable crds_context {
default = {
"-sb" = "hst_1074.pmap"
"-dev" = "hst_1074.pmap"
"-test" = "hst_1077.pmap"
"-ops" = "hst_1077.pmap"
"-test" = "hst_1089.pmap"
"-ops" = "hst_1089.pmap"
}
}

Expand Down

0 comments on commit 442d172

Please sign in to comment.