From 430f4bf71a0dbb4d5ba408d5a3395e98e06a3c8c Mon Sep 17 00:00:00 2001
From: Allison67 <xintongji0@gmail.com>
Date: Wed, 6 Dec 2023 13:33:44 -0500
Subject: [PATCH] Update deployment.yml

---
 .github/workflows/deployment.yml | 33 +++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index b4b1cf1..dc1ddbf 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -6,23 +6,26 @@ on:
       - cicd
 
 jobs:
-  deploy:
+  build-and-deploy:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Set up SSH
-        uses: webfactory/ssh-agent@v0.5.2
-        with:
-          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+      - uses: actions/checkout@v3
 
-      - name: Deploy to DigitalOcean
+      # Build and run Docker containers
+      - name: Build and run Docker containers
         run: |
-          ssh -o "StrictHostKeyChecking=no" ${{ secrets.SSH_USER }}@${{ secrets.DROPLET_IP }} << 'ENDSSH'
-          cd 4-final-project-group-bill-splitting-app
-          git pull origin main
-          docker-compose down
           docker-compose up --build -d
-          ENDSSH
+          docker-compose ps
+
+      # SSH and Deploy to DigitalOcean Droplet
+      - name: Deploy to DigitalOcean Droplet
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.DROPLET_IP }}
+          username: ${{ secrets.SSH_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            cd 4-final-project-group-bill-splitting-app
+            git pull origin master
+            docker-compose down
+            docker-compose up --build -d