chore: tweak

mystist · Oct 15, 2024 · 88f1532 · 88f1532
1 parent f3dbe21
commit 88f1532
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -10,7 +10,7 @@ on:
 env:
   REGISTRY: ghcr.io
   CONTAINER_NAME: dapp
-  APPLICATION_NAME: application
+  CLUSTER_NAME: dapp-cluster
   TASK_DEFINITION: .github/workflows/task-definition.json
 
 jobs:
@@ -71,7 +71,7 @@ jobs:
           sed -i 's|${AWS_REGION}|'"$AWS_REGION"'|g' ${{ env.TASK_DEFINITION }}
           sed -i 's|${APP_ENV}|'"$APP_ENV"'|g' ${{ env.TASK_DEFINITION }}
           sed -i 's|${CONTAINER_NAME}|'"${{ env.CONTAINER_NAME }}"'|g' ${{ env.TASK_DEFINITION }}
-          sed -i 's|${APPLICATION_NAME}|'"${{ env.APPLICATION_NAME }}"'|g' ${{ env.TASK_DEFINITION }}
+          sed -i 's|${CLUSTER_NAME}|'"${{ env.CLUSTER_NAME }}"'|g' ${{ env.TASK_DEFINITION }}
 
       - name: Update image of ECS task definition
         id: render-task-def
@@ -86,5 +86,5 @@ jobs:
         with:
           task-definition: ${{ env.TASK_DEFINITION }}
           service: ${{ env.CONTAINER_NAME }}-ecs-service
-          cluster: ${{ env.APPLICATION_NAME }}-${{ github.ref_name }}-ecs-cluster
+          cluster: ${{ env.CLUSTER_NAME }}-${{ github.ref_name }}-ecs-cluster
           wait-for-service-stability: true
diff --git a/.github/workflows/task-definition.json b/.github/workflows/task-definition.json
@@ -1,10 +1,10 @@
 {
-  "family": "${APPLICATION_NAME}-${APP_ENV}-ecs-task",
+  "family": "${CLUSTER_NAME}-${APP_ENV}-ecs-task",
   "networkMode": "awsvpc",
   "requiresCompatibilities": ["FARGATE"],
   "cpu": "256",
   "memory": "512",
-  "executionRoleArn": "arn:aws:iam::${AWS_ACCOUNT_ID}:role/${APPLICATION_NAME}-${APP_ENV}-ecs-task-execution-role",
+  "executionRoleArn": "arn:aws:iam::${AWS_ACCOUNT_ID}:role/${CLUSTER_NAME}-${APP_ENV}-ecs-task-execution-role",
   "containerDefinitions": [
     {
       "name": "${CONTAINER_NAME}",
@@ -29,7 +29,7 @@
       "logConfiguration": {
         "logDriver": "awslogs",
         "options": {
-          "awslogs-group": "/ecs/${APPLICATION_NAME}-${APP_ENV}",
+          "awslogs-group": "/ecs/${CLUSTER_NAME}-${APP_ENV}",
           "awslogs-region": "${AWS_REGION}",
           "awslogs-stream-prefix": "${CONTAINER_NAME}"
         }