diff --git a/scripts/deploy/build_image_to_gar.sh b/scripts/deploy/build_image_to_gar.sh index 0a94374..133bac5 100755 --- a/scripts/deploy/build_image_to_gar.sh +++ b/scripts/deploy/build_image_to_gar.sh @@ -9,10 +9,13 @@ JOB_NAME=${JOB_NAME} AR_REPO_NAME="cicd-repo-${ENV}" HASH_SUFFIX=${HASH_SUFFIX} + # IMAGE_URIの設定 # ローカル実行時は epoch 秒で自動採番。 IMAGE_URI="${REGION}-docker.pkg.dev/${GCP_PROJECT_ID}/${AR_REPO_NAME}/run-job-${JOB_NAME}-image:${HASH_SUFFIX}" + + echo "REGION : ${REGION}" echo "ENV : ${ENV}" echo "JOB_NAME : ${JOB_NAME}" @@ -24,11 +27,3 @@ gcloud auth configure-docker "${REGION}-docker.pkg.dev" # GARへDockerイメージをビルドしてプッシュ gcloud builds submit --tag "${IMAGE_URI}" . - - - - - - - - diff --git a/scripts/deploy/plan_terraform.sh b/scripts/deploy/plan_terraform.sh index 0fba502..3f87562 100755 --- a/scripts/deploy/plan_terraform.sh +++ b/scripts/deploy/plan_terraform.sh @@ -4,10 +4,9 @@ set -euo pipefail # 変数の設定({HOME}/hash.txt からハッシュ値を取得) -HASH_SUFFIX=${HASH_SUFFIX} - TF_DIR=${TF_DIR:-terraform} ENV=${ENV:-dev} +HASH_SUFFIX=${HASH_SUFFIX} cd "$TF_DIR"