From 158cb98c79ba468c1cb6de88afa329b9e76743f1 Mon Sep 17 00:00:00 2001
From: Lee Hyemin <114126424+2ming00@users.noreply.github.com>
Date: Sat, 31 Aug 2024 22:25:26 +0900
Subject: [PATCH] Update django_CI.yml

---
 .github/workflows/django_CI.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/django_CI.yml b/.github/workflows/django_CI.yml
index 1084f4c..352bd4d 100644
--- a/.github/workflows/django_CI.yml
+++ b/.github/workflows/django_CI.yml
@@ -31,7 +31,8 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: Upload Code to EC2
+
+    - name: Upload and Deploy Code to EC2
       env:
         EC2_HOST: ${{ secrets.EC2_HOST }}
         EC2_USER: ubuntu
@@ -39,17 +40,20 @@ jobs:
       run: |
         echo "${{ secrets.EC2_KEY }}" > key.pem
         chmod 400 key.pem
-        scp -o StrictHostKeyChecking=no -i key.pem -r ./aiServer ubuntu@$EC2_HOST:/home/ubuntu/
-    
-    - name: Deploy to EC2
-      run: |
-        ssh -o StrictHostKeyChecking=no -i key.pem -t ubuntu@$EC2_HOST << 'EOF'
-        cd /home/ubuntu/aiServer
-        python3 -m venv venv
-        source venv/bin/activate
-        python -m pip install --upgrade pip
-        pip install django djangorestframework drf-yasg
-        nohup gunicorn --bind 0.0.0.0:8000 aiServer.wsgi:application &
-        sudo service nginx restart
+        
+        # 코드 업로드
+        scp -o StrictHostKeyChecking=no -i key.pem -r ./aiServer $EC2_USER@$EC2_HOST:/home/ubuntu/
+        
+        # 서버에 접속하여 작업 수행
+        ssh -o StrictHostKeyChecking=no -i key.pem $EC2_USER@$EC2_HOST << 'EOF'
+          cd /home/ubuntu/aiServer || exit 1
+          python3 -m venv venv
+          source venv/bin/activate
+          python -m pip install --upgrade pip
+          pip install django djangorestframework drf-yasg
+          nohup gunicorn --bind 0.0.0.0:8000 aiServer.wsgi:application &
+          sudo service nginx restart
         EOF
+        
+        # 사용된 키 삭제
         rm key.pem