Signed-off-by: belloafeez <werkjober@gmail.com>

.github/workflows/deploy-pipeline.yml

@@ -13,7 +13,7 @@ env:
   IMAGE_NAME_VALUE_2: openems-backend
   # IMAGE_NAME_VALUE_3: openems-db
   IMAGE_NAME_VALUE_4: odoo
-  IMAGE_NAME_VALUE_5: odoo-db
+  # IMAGE_NAME_VALUE_5: odoo-db
   IMAGE_NAME_VALUE_6: openems-edge
   TERRAFORM_ACTION: apply
   ECS_TD: .github/workflows/openems-deployment-td.json
@@ -71,7 +71,7 @@ jobs:
       - name: Check if ECR repositories exist
         env:
           # List your repository names here  
-          REPO_NAMES: '${{ env.IMAGE_NAME_VALUE_1 }},${{ env.IMAGE_NAME_VALUE_2 }},${{ env.IMAGE_NAME_VALUE_4 }},${{ env.IMAGE_NAME_VALUE_5 }},${{ env.IMAGE_NAME_VALUE_6 }}' 
+          REPO_NAMES: '${{ env.IMAGE_NAME_VALUE_1 }},${{ env.IMAGE_NAME_VALUE_2 }},${{ env.IMAGE_NAME_VALUE_4 }},${{ env.IMAGE_NAME_VALUE_6 }}' 
         run: |
           IFS=',' read -ra REPOS <<< "$REPO_NAMES"
           for repo in "${REPOS[@]}"; do
@@ -89,7 +89,7 @@ jobs:
       - name: Create ECR repositories
         env:
           # List your repository names here  
-          REPO_NAMES: '${{ env.IMAGE_NAME_VALUE_1 }},${{ env.IMAGE_NAME_VALUE_2 }},${{ env.IMAGE_NAME_VALUE_4 }},${{ env.IMAGE_NAME_VALUE_5 }},${{ env.IMAGE_NAME_VALUE_6 }}' 
+          REPO_NAMES: '${{ env.IMAGE_NAME_VALUE_1 }},${{ env.IMAGE_NAME_VALUE_2 }},${{ env.IMAGE_NAME_VALUE_4 }},${{ env.IMAGE_NAME_VALUE_6 }}' 
         run: |
           IFS=',' read -ra REPOS <<< "$REPO_NAMES"
           for repo in "${REPOS[@]}"; do
@@ -123,9 +123,17 @@ jobs:
       - name: Login to Amazon ECR
         uses: aws-actions/amazon-ecr-login@v1
 
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v2 
+
+      # - name: Install Docker Compose
+      #   run: |
+      #     curl -L "https://github.com/docker/compose/releases/download/2.20.3/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+      #     chmod +x /usr/local/bin/docker-compose
+
       - name: Build an image from Docker Compose
         run: |
-          docker-compose build 
+          docker compose build 
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
@@ -155,12 +163,12 @@ jobs:
           format: 'sarif'
           output: 'trivy-results.sarif'
 
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/library/${{ env.IMAGE_NAME_VALUE_5 }}:latest'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
+      # - name: Run Trivy vulnerability scanner
+      #   uses: aquasecurity/trivy-action@master
+      #   with:
+      #     image-ref: 'docker.io/library/${{ env.IMAGE_NAME_VALUE_5 }}:latest'
+      #     format: 'sarif'
+      #     output: 'trivy-results.sarif'
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
@@ -223,19 +231,19 @@ jobs:
           container-name: openems-deployment-container-odoo
           image: ${{ secrets.ECR_REGISTRY }}/${{ env.IMAGE_NAME_VALUE_4 }}:latest
 
-      - name: Modify Amazon ECS task definition with forth container
-        id: render-odoo-db-container
-        uses: aws-actions/amazon-ecs-render-task-definition@v1
-        with:
-          task-definition: ${{ steps.render-odoo-container.outputs.task-definition }}
-          container-name: openems-deployment-container-odoo-db
-          image: ${{ secrets.ECR_REGISTRY }}/${{ env.IMAGE_NAME_VALUE_4 }}:latest
+      # - name: Modify Amazon ECS task definition with forth container
+      #   id: render-odoo-db-container
+      #   uses: aws-actions/amazon-ecs-render-task-definition@v1
+      #   with:
+      #     task-definition: ${{ steps.render-odoo-container.outputs.task-definition }}
+      #     container-name: openems-deployment-container-odoo-db
+      #     image: ${{ secrets.ECR_REGISTRY }}/${{ env.IMAGE_NAME_VALUE_4 }}:latest
 
       - name: Modify Amazon ECS task definition with fifth container
         id: render-edge-container
         uses: aws-actions/amazon-ecs-render-task-definition@v1
         with:
-          task-definition: ${{ steps.render-odoo-db-container.outputs.task-definition }}
+          task-definition: ${{ steps.render-odoo-container.outputs.task-definition }}
           container-name: openems-deployment-container-edge
           image: ${{ secrets.ECR_REGISTRY }}/${{ env.IMAGE_NAME_VALUE_6 }}:latest 
 

.github/workflows/destroy-pipeline.yml

@@ -13,7 +13,7 @@ env:
   IMAGE_NAME_VALUE_2: openems-backend
   # IMAGE_NAME_VALUE_3: openems-db
   IMAGE_NAME_VALUE_4: odoo
-  IMAGE_NAME_VALUE_5: odoo-db
+  # IMAGE_NAME_VALUE_5: odoo-db
   IMAGE_NAME_VALUE_6: openems-edge
   TERRAFORM_ACTION: destroy
   ECS_TD: .github/workflows/openems-deployment-td.json
@@ -34,8 +34,8 @@ jobs:
           aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ env.AWS_REGION }}
 
-   # Build AWS infrastructure
-  deploy_aws_infrastructure:
+   # Destroy AWS infrastructure
+  destroy_aws_infrastructure:
     name: Build AWS infrastructure
     needs: configure_aws_credentials
     runs-on: ubuntu-latest
@@ -55,193 +55,3 @@ jobs:
       - name: Run Terraform apply/destroy
         working-directory: ./iac
         run: terraform ${{ env.TERRAFORM_ACTION }} -auto-approve        
-
-  # Create ECR repository
-  create_ecr_repository:
-    name: Create ECR repository
-    needs: 
-      - deploy_aws_infrastructure     
-      - configure_aws_credentials
-    if: needs.deploy_aws_infrastructure.output.terraform_action != 'destroy'  
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Check if ECR repositories exist
-        env:
-          # List your repository names here  
-          REPO_NAMES: '${{ env.IMAGE_NAME_VALUE_1 }},${{ env.IMAGE_NAME_VALUE_2 }},${{ env.IMAGE_NAME_VALUE_4 }},${{ env.IMAGE_NAME_VALUE_5 }},${{ env.IMAGE_NAME_VALUE_6 }}' 
-        run: |
-          IFS=',' read -ra REPOS <<< "$REPO_NAMES"
-          for repo in "${REPOS[@]}"; do
-            echo "Checking repository: $repo"
-            result=$(aws ecr describe-repositories --repository-names "$repo" 2>/dev/null | jq -r '.repositories[0]?.repositoryName // empty')
-            if [[ -z "$result" ]]; then
-              echo "Repository $repo does not exist."
-            else
-              echo "Repository $repo exists."
-              echo "repo_name_$repo=$result" >> $GITHUB_ENV
-            fi
-          done
-        continue-on-error: true
-
-      - name: Create ECR repositories
-        env:
-          # List your repository names here  
-          REPO_NAMES: '${{ env.IMAGE_NAME_VALUE_1 }},${{ env.IMAGE_NAME_VALUE_2 }},${{ env.IMAGE_NAME_VALUE_4 }},${{ env.IMAGE_NAME_VALUE_5 }},${{ env.IMAGE_NAME_VALUE_6 }}' 
-        run: |
-          IFS=',' read -ra REPOS <<< "$REPO_NAMES"
-          for repo in "${REPOS[@]}"; do
-            echo "Creating repository: $repo"
-            if ! aws ecr describe-repositories --repository-names "$repo" 2>/dev/null; then
-              aws ecr create-repository --repository-name "$repo"
-              echo "Repository $repo created."
-            else
-              echo "Repository $repo already exists."
-            fi
-          done
-        #  aws ecr put-registry-scanning-configuration \
-        #     --scan-type ENHANCED \
-        #      --rules '["scanFrequency" : "SCAN_ON_PUSH"]' \
-        #      --region ${{ env.AWS_REGION }}
-
-    # Build Docker Image
-
-  build_scan_push:
-    name: Build, Scan and push Docker image to ECR
-    needs:  
-      - configure_aws_credentials
-      - deploy_aws_infrastructure
-      - create_ecr_repository
-    if: needs.deploy_aws_infrastructure.output.terraform_action != 'destroy'  
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Login to Amazon ECR
-        uses: aws-actions/amazon-ecr-login@v1
-
-      - name: Build an image from Docker Compose
-        run: |
-          docker-compose build 
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/library/${{ env.IMAGE_NAME_VALUE_1 }}:latest'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/library/${{ env.IMAGE_NAME_VALUE_2 }}:latest'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-
-      # - name: Run Trivy vulnerability scanner
-      #   uses: aquasecurity/trivy-action@master
-      #   with:
-      #     image-ref: 'docker.io/library/${{ env.IMAGE_NAME_VALUE_3 }}:latest'
-      #     format: 'sarif'
-      #     output: 'trivy-results.sarif'
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/library/${{ env.IMAGE_NAME_VALUE_4 }}:latest'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/library/${{ env.IMAGE_NAME_VALUE_5 }}:latest'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/library/${{ env.IMAGE_NAME_VALUE_6 }}:latest'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-
-      # - name: Upload Trivy scan results to GitHub Security tab
-      #   uses: github/codeql-action/upload-sarif@v2
-      #   with:
-      #     sarif_file: 'trivy-results.sarif'
-
-      - name: Grant execute permission to the script
-        run: chmod +x ./push-to-ecr.sh
-
-      - name: Retag Docker image and Push Docker Image to Amazon ECR
-        run: ./push-to-ecr.sh
-
-  create_td_revision_restart_ecs:
-    name: Create new task definition revision and Restart ECS
-    needs: 
-       - configure_aws_credentials
-       - deploy_aws_infrastructure 
-       - create_ecr_repository
-       - build_scan_push
-    if: needs.deploy_aws_infrastructure.output.terraform_action != 'destroy'  
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4   
-
-      - name: Render Amazon ECS task definition for first container
-        id: render-ui-container
-        uses: aws-actions/amazon-ecs-render-task-definition@v1
-        with:
-          task-definition: ${{ env.ECS_TD }}
-          container-name: openems-deployment-container-ui
-          image: ${{ secrets.ECR_REGISTRY }}/${{ env.IMAGE_NAME_VALUE_1 }}:latest
-
-      - name: Modify Amazon ECS task definition with first container
-        id: render-backend-container
-        uses: aws-actions/amazon-ecs-render-task-definition@v1
-        with:
-          task-definition: ${{ steps.render-ui-container.outputs.task-definition }}
-          container-name: openems-deployment-container-backend
-          image: ${{ secrets.ECR_REGISTRY }}/${{ env.IMAGE_NAME_VALUE_2 }}:latest
-
-      # - name: Modify Amazon ECS task definition with second container
-      #   id: render-backend-db-container
-      #   uses: aws-actions/amazon-ecs-render-task-definition@v1
-      #   with:
-      #     task-definition: ${{ steps.render-backend-container.outputs.task-definition }}
-
-      - name: Modify Amazon ECS task definition with third container
-        id: render-odoo-container
-        uses: aws-actions/amazon-ecs-render-task-definition@v1
-        with:
-          task-definition: ${{ steps.render-backend-container.outputs.task-definition }}
-          container-name: openems-deployment-container-odoo
-          image: ${{ secrets.ECR_REGISTRY }}/${{ env.IMAGE_NAME_VALUE_4 }}:latest
-
-      - name: Modify Amazon ECS task definition with forth container
-        id: render-odoo-db-container
-        uses: aws-actions/amazon-ecs-render-task-definition@v1
-        with:
-          task-definition: ${{ steps.render-odoo-container.outputs.task-definition }}
-          container-name: openems-deployment-container-odoo-db
-          image: ${{ secrets.ECR_REGISTRY }}/${{ env.IMAGE_NAME_VALUE_4 }}:latest
-
-      - name: Modify Amazon ECS task definition with fifth container
-        id: render-edge-container
-        uses: aws-actions/amazon-ecs-render-task-definition@v1
-        with:
-          task-definition: ${{ steps.render-odoo-db-container.outputs.task-definition }}
-          container-name: openems-deployment-container-edge
-          image: ${{ secrets.ECR_REGISTRY }}/${{ env.IMAGE_NAME_VALUE_6 }}:latest 
-
-      - name: Deploy to Amazon ECS service
-        uses: aws-actions/amazon-ecs-deploy-task-definition@v1
-        with:
-          task-definition: ${{ steps.render-backend-container.outputs.task-definition }}
-          service: ${{ env.ECS_SERVICE }}
-          cluster: ${{ env.ECS_CLUSTER }}