From fd9c79fd5add853a66d63687b762b0f692ec8022 Mon Sep 17 00:00:00 2001
From: Yashvardhan Arora <yash22arora@gmail.com>
Date: Fri, 17 May 2024 03:06:45 +0530
Subject: [PATCH] Make SSH operations non-interactive via script

---
 .github/workflows/build-deploy.yaml | 49 ++++++++++++++++-------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build-deploy.yaml b/.github/workflows/build-deploy.yaml
index 3424c81..c3114d0 100644
--- a/.github/workflows/build-deploy.yaml
+++ b/.github/workflows/build-deploy.yaml
@@ -43,33 +43,40 @@ jobs:
       - name: Install SSH client
         run: sudo apt-get install -y openssh-client
 
-      - name: Deploy to EC2
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_IMAGE_NAME: ${{secrets.DOCKER_IMAGE_NAME}}
+      - name: Create deployment script
         run: |
-          echo "${{ secrets.EC2_SSH_KEY }}" > ec2-key.pem
-          chmod 600 ec2-key.pem
-          ssh -o StrictHostKeyChecking=no -i ec2-key.pem ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }} << 'EOF'
-            set -e
+          cat << 'EOF' > deploy.sh
+          #!/bin/bash
+          set -e
 
-            # Pull the latest Docker image
-            echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u $DOCKER_USERNAME --password-stdin
-            docker pull $DOCKER_USERNAME/$DOCKER_IMAGE_NAME:latest
+          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+          docker pull ${{ secrets.DOCKER_USERNAME }}/${{secrets.DOCKER_IMAGE_NAME}}:latest
 
-            # Navigate to your project directory
-            cd /home/ubuntu/projects/servdomain
+          # Navigate to your project directory
+          cd /home/ubuntu/projects/servdomain
 
-            # Update docker-compose.yml file with the latest image
-            sed -i 's|image: .*$|image: '"$DOCKER_USERNAME/$DOCKER_IMAGE_NAME:latest"'|' docker-compose.yml
+          sed -i 's|image: .*$|image: ${{ secrets.DOCKER_USERNAME }}/${{secrets.DOCKER_IMAGE_NAME}}|' docker-compose.yml
 
-            # Restart the Docker containers using Docker Compose
-            docker-compose down
-            docker-compose up -d
+          # Restart the Docker containers using Docker Compose
+          docker-compose down
+          docker-compose up -d
 
-            # Clean up
-            docker system prune -af
+          # Clean up
+          docker system prune -af
           EOF
 
+      - name: Make deployment script executable
+        run: chmod +x deploy.sh
+
+      - name: Deploy to EC2
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_IMAGE_NAME: ${{secrets.DOCKER_IMAGE_NAME}}
+        run: |
+          echo "${{ secrets.EC2_SSH_KEY }}" > ec2-key.pem
+          chmod 600 ec2-key.pem
+          scp -i ec2-key.pem -o StrictHostKeyChecking=no deploy.sh ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }}:/home/${{ secrets.SSH_USERNAME }}/deploy.sh
+          ssh -o StrictHostKeyChecking=no -i ec2-key.pem ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }} /home/${{ secrets.SSH_USERNAME }}/deploy.sh
+
       - name: Clean up
-        run: rm ec2-key.pem
+        run: rm -f ec2-key.pem deploy.sh