Deployment 2

Author: dingaanmanjate

.github/workflows/docker-publish.yml

@@ -1,28 +1,29 @@
-name: Build, Test and Publish Docker image & Deploy to EKS
+name: Build, Publish and Deploy Docker Image to EC2
 
 on:
   push:
     branches: [ main ]
   workflow_dispatch:
 
 jobs:
-  smoke-and-publish:
+  # ================================================================= #
+  # 1. CI PHASE: BUILD, TEST, AND PUBLISH                             #
+  # (Renamed from 'smoke-and-publish' to clearly reflect its role)    #
+  # ================================================================= #
+  build-and-publish:
     runs-on: ubuntu-latest
     steps:
       - name: ⬇️ Checkout repository
         uses: actions/checkout@v4
-
-      # ... (Smoke Test and Setup Steps Omitted) ...
 
-      # --- DOCKER HUB PUSH STEPS (Updated to use DOCKER_USERNAME/PASSWORD) ---
+      # ... (Smoke Test and Setup Steps Omitted) ...
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
       - name: 🐳 Login to Docker Hub
         uses: docker/login-action@v2
         with:
-          # Using your existing secrets
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }} 
 
@@ -36,24 +37,69 @@ jobs:
             ${{ secrets.DOCKER_USERNAME }}/car_classifier:latest
             ${{ secrets.DOCKER_USERNAME }}/car_classifier:${{ github.sha }}
 
-      # --- DEPLOYMENT STEP (No change needed here, as it uses SSH keys) ---
-      - name: 🚀 Deploy to EKS Server via SSH
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.EC2_PUBLIC_IP }} 
-          username: ec2-user # Confirm your EC2 username
-          key: ${{ secrets.EC2_SSH_KEY }}
+  ---
+  
+  # ================================================================= #
+  # 2. CD PHASE: DEPLOY TO SINGLE EC2 HOST (Free Tier Recommended)    #
+  # ================================================================= #
+  deploy:
+    name: Deploy Container to EC2
+    runs-on: ubuntu-latest
+    needs: build-and-publish # Make sure the name matches your first CI job
+    
+    steps:
+    - name: 🚀 SSH and Deploy Container
+      uses: appleboy/ssh-action@v1.0.3
+      with:
+        host: ${{ secrets.EC2_PUBLIC_IP }}
+        # FIX 1: Changed username to 'ec2-user' for Amazon Linux
+        username: ec2-user 
+        key: ${{ secrets.EC2_SSH_KEY }}
+        script: |
+          # --- 1. Define Variables ---
+          APP_NAME="ai-car-inspector" 
+          IMAGE_NAME="${{ secrets.DOCKER_USERNAME }}/car_classifier:latest"
+          HOST_PORT="80"       
+          CONTAINER_PORT="7860"
+          
+          # --- 2. Install Docker (Idempotent - **UPDATED for Amazon Linux**) ---
+          if ! command -v docker &> /dev/null
+          then
+              echo "Docker not found, installing via yum/dnf..."
+              
+              # FIX 2: Use yum/dnf commands for Docker installation
+              # This works for both Amazon Linux 2 (yum) and Amazon Linux 2023 (dnf/yum)
+              sudo yum update -y
+              sudo yum install -y docker 
+              
+              # Start and enable the Docker service
+              sudo systemctl start docker
+              sudo systemctl enable docker
+          fi
+          
+          # --- 3. Log in to Docker Hub ---
+          echo "Logging into Docker Hub..."
+          echo "${{ secrets.DOCKER_PASSWORD }}" | sudo docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+          
+          # --- 4. Pull and Run the New Image ---
+          
+          # Stop and remove the old container with the same name (if it exists)
+          echo "Stopping and removing old container $APP_NAME..."
+          sudo docker stop $APP_NAME || true
+          sudo docker rm $APP_NAME || true
+          
+          # Pull the new image
+          echo "Pulling image $IMAGE_NAME"
+          sudo docker pull $IMAGE_NAME
+          
+          # Run the new container, mapping the host port to the container port
+          echo "Running new container $IMAGE_NAME on port $HOST_PORT:$CONTAINER_PORT"
+          sudo docker run -d \
+          -p $HOST_PORT:$CONTAINER_PORT \
+          -p 6443:6443 \
+          --name $APP_NAME \
+          --restart always \
+          $IMAGE_NAME
           
-          # The script runs on the EKS worker node to apply manifests
-          script: |
-            # 1. Download the latest deployment manifests from the GitHub repository
-            # These files contain the image tag and secret names
-            curl -o deployment.yaml https://raw.githubusercontent.com/${{ github.repository }}/main/deployment.yaml
-            curl -o service.yaml https://raw.githubusercontent.com/${{ github.repository }}/main/service.yaml
-            
-            # 2. Apply the manifests using the local kubectl
-            sudo kubectl apply -f deployment.yaml
-            sudo kubectl apply -f service.yaml
-            
-            # 3. Wait for the new Pod to become Ready
-            sudo kubectl rollout status deployment/gradio-gemini-deployment
+          echo "Deployment complete. Running containers:"
+          sudo docker ps