From 3af178a57b686dee9612d8acc165205f0a1b0d0b Mon Sep 17 00:00:00 2001
From: Abel Ratanaphan <abelrat@yahoo.com>
Date: Thu, 22 Aug 2024 09:34:12 -0400
Subject: [PATCH] fix: revert to working workflow, fix icon path

---
 .github/workflows/aws.yml | 28 ++++++----------------------
 client/public/index.html  |  2 +-
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml
index fb480e8..b305e17 100644
--- a/.github/workflows/aws.yml
+++ b/.github/workflows/aws.yml
@@ -9,7 +9,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  AWS_REGION: ${{ secrets.AWS_REGION }} # Use GitHub secrets for AWS region
+  AWS_REGION: ${{ secrets.AWS_REGION }} # Use GitHub secret for AWS region
   ECR_REPOSITORY: app # Set this to your Amazon ECR repository name
   ECS_SERVICE: SkyDevOps # Set this to your Amazon ECS service name
   ECS_CLUSTER: Sky # Set this to your Amazon ECS cluster name
@@ -37,36 +37,20 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - name: Login to AWS ECR
+      - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2
 
-      - name: Build and push new Docker image to AWS ECR
+      - name: Build and push image to AWS ECR
         id: build-image
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           IMAGE_TAG: latest
         run: |
-          # Enable error handling
-          set -e
-          set -o pipefail
-
-          # Use Docker Buildx to build the image for x86_64
-          docker buildx build --platform linux/amd64 --push -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+          # Use Docker Buildx to build the image for ARM64
+          docker buildx build --platform linux/arm64 --push -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
 
       - name: Deploy to AWS ECS
         run: |
-          # Enable error handling
-          set -e
-          set -o pipefail
-
-          # Update the ECS service and capture output
-          UPDATE_OUTPUT=$(aws ecs update-service \
-            --cluster ${{ env.ECS_CLUSTER }} \
-            --service ${{ env.ECS_SERVICE }})
-
-          # Wait until the service has stabilized
-          aws ecs wait services-stable \
-            --cluster ${{ env.ECS_CLUSTER }} \
-            --services ${{ env.ECS_SERVICE }}
+          aws ecs update-service --cluster ${{ env.ECS_CLUSTER }} --service ${{ env.ECS_SERVICE }} --force-new-deployment
diff --git a/client/public/index.html b/client/public/index.html
index 3ceebff..dd45262 100644
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -11,7 +11,7 @@
   <script nomodule src="https://unpkg.com/ionicons@7.1.0/dist/ionicons/ionicons.js"></script>
 
   <!-- Favicon -->
-  <link rel="icon" href="/favicon.ico" />
+  <link rel="icon" href="favicon.ico" />
 
   <!-- Preconnect for Google Fonts -->
   <link rel="preconnect" href="https://fonts.googleapis.com">