Refactor CI/CD workflow to update AWS actions to v2, improve container management, and enhance code organization with clear section headers

Author: pankaj2k9

.github/workflows/cicd.yaml

@@ -12,6 +12,9 @@ permissions:
   contents: read
 
 jobs:
+  # -----------------------------
+  # Continuous Integration
+  # -----------------------------
   integration:
     name: Continuous Integration
     runs-on: ubuntu-latest
@@ -25,6 +28,9 @@ jobs:
       - name: Run unit tests
         run: echo "Running unit tests"
 
+  # -----------------------------
+  # Build & Push Docker Image
+  # -----------------------------
   build-and-push-ecr-image:
     name: Continuous Delivery
     needs: integration
@@ -37,65 +43,65 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y jq unzip
+
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ secrets.AWS_REGION }}
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build, tag, and push image to Amazon ECR
-        id: build-image
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY_NAME }}
           IMAGE_TAG: latest
         run: |
-          # Build a docker container and
-          # push it to ECR so that it can
-          # be deployed to ECS.
           docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
 
-  Continuous-Deployment:
+  # -----------------------------
+  # Continuous Deployment (EC2)
+  # -----------------------------
+  continuous-deployment:
+    name: Continuous Deployment
     needs: build-and-push-ecr-image
     runs-on: self-hosted
     steps:
-      - name: Checkout
+      - name: Checkout Code
         uses: actions/checkout@v3
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ secrets.AWS_REGION }}
 
       - name: Login to Amazon ECR
-        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
-      - name: Pull latest images
+      - name: Pull latest image
         run: |
-         docker pull ${{secrets.AWS_ECR_LOGIN_URI}}/${{ secrets.ECR_REPOSITORY_NAME }}:latest
+          docker pull ${{ secrets.AWS_ECR_LOGIN_URI }}/${{ secrets.ECR_REPOSITORY_NAME }}:latest
 
-      - name: Stop and remove container if exists
+      - name: Stop and remove existing container (safe)
         run: |
-         if [ "$(docker ps -aq -f name=cnnclassifier)" ]; then
-          docker stop cnnclassifier
-          docker rm -fv cnnclassifier
-         else
-          echo "No existing container found"
-         fi
-
-      - name: Run Docker Image to serve users
+          docker stop cnnclassifier || true
+          docker rm cnnclassifier || true
+
+      - name: Run Docker container
         run: |
-         docker run -d -p 8080:8080 --name=cnnclassifier -e 'AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}' -e 'AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}' -e 'AWS_REGION=${{ secrets.AWS_REGION }}'  ${{secrets.AWS_ECR_LOGIN_URI}}/${{ secrets.ECR_REPOSITORY_NAME }}:latest
-      - name: Clean previous images and containers
+          docker run -d \
+            --restart unless-stopped \
+            -p 80:8080 \
+            --name cnnclassifier \
+            ${{ secrets.AWS_ECR_LOGIN_URI }}/${{ secrets.ECR_REPOSITORY_NAME }}:latest
+
+      - name: Cleanup unused images (safe)
         run: |
-         docker system prune -f
+          docker image prune -f