diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index 252bffb..54f29a2 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -121,18 +121,19 @@ jobs: - run: make build-image-migrate - run: make build-image-promote - # - run: | - # BUILD_TAG=staging + - run: | + BUILD_TAG=staging - # if [[ "${GITHUB_REF}" == "refs/head/prod" ]]; then - # BUILD_TAG=prod - # fi + if [[ "${GITHUB_REF}" == "refs/head/prod" ]]; then + BUILD_TAG=prod + fi - # ECS_CLUSTER_NAME=${BUILD_TAG} - # ECS_SERVICE_NAME=${ECS_CLUSTER_NAME} + ECS_CLUSTER_NAME=${BUILD_TAG} + ECS_SERVICE_NAME=${ECS_CLUSTER_NAME} - # echo "BUILD_TAG: ${BUILD_TAG}" - # echo "ECS_CLUSTER_NAME: ${ECS_CLUSTER_NAME}" + echo "BUILD_TAG: ${BUILD_TAG}" + echo "ECS_CLUSTER_NAME: ${ECS_CLUSTER_NAME}" + echo "ECS_SERVICE_NAME: ${ECS_SERVICE_NAME}" - # make BUILD_TAG=$BUILD_TAG build-image-promote - # make ECS_CLUSTER_NAME=$ECS_CLUSTER_NAME ECS_SERVICE_NAME=$ECS_SERVICE_NAME deploy + make BUILD_TAG=$BUILD_TAG build-image-promote + make ECS_CLUSTER_NAME=$ECS_CLUSTER_NAME ECS_SERVICE_NAME=$ECS_SERVICE_NAME deploy diff --git a/Makefile b/Makefile index 6a3b869..20c2189 100644 --- a/Makefile +++ b/Makefile @@ -87,11 +87,11 @@ down: up: docker compose up --detach -# deploy: -# AWS_ACCOUNT_ID=$(AWS_ACCOUNT_ID) \ -# AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) \ -# AWS_ECR_DOMAIN=$(AWS_ECR_DOMAIN) \ -# ./deploy.sh +deploy: + AWS_ACCOUNT_ID=$(AWS_ACCOUNT_ID) \ + AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) \ + AWS_ECR_DOMAIN=$(AWS_ECR_DOMAIN) \ + ./deploy.sh migrate: goose -dir "$(MIGRATION_DIR)" up diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..853c139 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,53 @@ +#!/bin/bash +set -euo pipefail + +cat > overrides.txt <