[fix CI/CD pipeline]

alvo254 · Jun 10, 2024 · 6645039 · 6645039
1 parent 8c3886d
commit 6645039
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml
@@ -73,16 +73,26 @@ jobs:
         docker build -t $DOCKER_USERNAME/$DOCKER_REPOSITORY:$IMAGE_TAG -f frontend/Dockerfile .
         docker push $DOCKER_USERNAME/$DOCKER_REPOSITORY:$IMAGE_TAG
         echo "image=$DOCKER_USERNAME/$DOCKER_REPOSITORY:$IMAGE_TAG" >> $GITHUB_ENV
+    
+    - name: Set container image variable
+      run: echo "CONTAINER_IMAGE=fitnesshero" >> $GITHUB_ENV
+
 
     - name: Set up Terraform
       uses: hashicorp/setup-terraform@v1
       with:
         terraform_version: "1.0.0"  # Specify the Terraform version
 
-    - name: Terraform Init and Apply
+    # - name: Terraform Init and Apply
+    #   run: |
+    #     terraform init
+    #     terraform apply -auto-approve -var="container_image=${{ env.DOCKER_USERNAME }}/${{ env.DOCKER_REPOSITORY }}:${{ env.IMAGE_TAG }}"
+
+    - name: Apply Terraform
       run: |
         terraform init
-        terraform apply -auto-approve -var="container_image=${{ env.DOCKER_USERNAME }}/${{ env.DOCKER_REPOSITORY }}:${{ env.IMAGE_TAG }}"
+        terraform apply -auto-approve -var="container_image=${{ env.CONTAINER_IMAGE }}"
+
 
     - name: Update ECS Service
       run: |

diff --git a/modules/ecs/main.tf b/modules/ecs/main.tf
@@ -47,7 +47,7 @@ resource "aws_ecs_task_definition" "cloudific" {
   container_definitions = jsonencode([
     {
       name      = "app"
-      image     = "fitnesshero:v1.0.0"
+      image     = "fitnesshero"
       cpu       = 256
       memory    = 512
       essential = true

diff --git a/modules/ecs/variables.tf b/modules/ecs/variables.tf
@@ -3,4 +3,8 @@ variable "pub_sub1" {
 }
 variable "security_group" {
   type = string
+}
+
+variable "" {
+  type = string
 }