From f90c70162c4ebf331b0bbbc2659f275a142916e3 Mon Sep 17 00:00:00 2001
From: SebbieMzingKe <sebbievilar2@gmail.com>
Date: Fri, 12 Sep 2025 14:23:10 +0300
Subject: [PATCH 1/2] feat(deployment): blue/green deployment by adding a bash
 script for command simplification.

---
 .github/workflows/build-and-deploy.yaml | 23 ++++++-----
 Makefile                                | 10 ++---
 deploy.sh                               | 53 +++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 deploy.sh

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 100644
index 0000000..853c139
--- /dev/null
+++ b/deploy.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+set -euo pipefail
+
+cat > overrides.txt <<EOF
+{
+  "containerOverrides": [
+    {
+      "name": "service",
+      "command": ["goose", "-dir", "migrations", "up"]
+    }
+  ]
+}
+EOF
+
+TASK_ARN=$(aws ecs run-task \
+	--cluster "${ECS_CLUSTER_NAME}" \
+	--launch-type EC2 \
+	--overrides file://overrides.txt \
+	--task-definition "${ECS_SERVICE_NAME}" | jq -r '.tasks[0].taskArn')
+
+echo "Running task: ${TASK_ARN}"
+
+aws ecs wait tasks-stopped \
+    --cluster "${ECS_CLUSTER_NAME}" \
+    --tasks "${TASK_ARN}"
+
+EXIT_CODE=$(aws ecs describe-tasks \
+    --cluster "${ECS_CLUSTER_NAME}" \
+    --tasks "${TASK_ARN}" | jq -r '.tasks[0].containers[0].exitCode')
+
+if [ "$EXIT_CODE" -ne 0 ]; then
+    echo "Task failed with exit code: $EXIT_CODE"
+    exit 1
+fi
+
+echo "Task completed successfully with exit code: $EXIT_CODE"
+
+rm -f overrides.txt exit_code.txt
+
+echo "Updating ECS service to use the latest task definition..."
+
+aws ecs update-service \
+  --force-new-deployment \
+  --cluster "${ECS_CLUSTER_NAME}" \
+  --service "${ECS_SERVICE_NAME}" | jq
+
+echo "Waiting for ECS service to stabilize..."
+
+aws ecs wait services-stable \
+  --cluster "${ECS_CLUSTER_NAME}" \
+  --services "${ECS_SERVICE_NAME}"
+
+echo "ECS service is stable."
\ No newline at end of file

From a7f9381afe8ed0e61c50052945b7896843ede38d Mon Sep 17 00:00:00 2001
From: SebbieMzingKe <sebbievilar2@gmail.com>
Date: Fri, 12 Sep 2025 14:52:39 +0300
Subject: [PATCH 2/2] chore: modify bash script.

---
 deploy.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 deploy.sh

diff --git a/deploy.sh b/deploy.sh
old mode 100644
new mode 100755