From 7b1bd9ed7e8682a9d20826610b4beee034b72834 Mon Sep 17 00:00:00 2001
From: seojin Yoon <90759319+7zrv@users.noreply.github.com>
Date: Wed, 27 Nov 2024 02:08:32 +0900
Subject: [PATCH 1/2] =?UTF-8?q?cicd:=20=EC=9E=90=EB=8F=99=ED=99=94=20?=
 =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20workflow=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존 도커 이미지 업로드 로직 이후에 deploy 로직을 추가하여 CD workflow 동작시 EC2에 docker-compose 파일을 실행하도록 수정
---
 .github/workflows/CD.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index af168dfdc..04732cc0d 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -1,3 +1,5 @@
+name: CD Pipeline
+
 on:
   push:
     branches: [ main ]
@@ -6,6 +8,12 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest
 
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+
     env:
       DB_URL: ${{ secrets.DB_URL }}
       DB_USERNAME: ${{ secrets.DB_USERNAME }}
@@ -54,3 +62,23 @@ jobs:
           docker build -t 7zrv/somemore:${GITHUB_SHA::7} -t 7zrv/somemore:latest .
           docker push 7zrv/somemore:${GITHUB_SHA::7}
           docker push 7zrv/somemore:latest
+  
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build-and-push
+
+    steps:
+      - name: SSH 연결을 통한 EC2 배포
+        uses: appleboy/ssh-action@v0.1.3
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          port: 22
+          script: |                     
+            cd somemore
+            sudo docker-compose stop
+            sudo docker-compose rm -f
+            sudo docker rmi 7zrv/somemore:latest
+            sudo docker-compose up -d
\ No newline at end of file

From 26e730579bec6b712dc20c0970d1d245051fa714 Mon Sep 17 00:00:00 2001
From: seojin Yoon <90759319+7zrv@users.noreply.github.com>
Date: Wed, 27 Nov 2024 10:46:50 +0900
Subject: [PATCH 2/2] =?UTF-8?q?style(CD.yml):=20=EB=A7=88=EC=A7=80?=
 =?UTF-8?q?=EB=A7=89=20=EB=9D=BC=EC=9D=B8=20=EA=B0=9C=ED=96=89=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 잠재적 에러 예방을 위한 개행 추가
---
 .github/workflows/CD.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 04732cc0d..36191dc35 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -81,4 +81,4 @@ jobs:
             sudo docker-compose stop
             sudo docker-compose rm -f
             sudo docker rmi 7zrv/somemore:latest
-            sudo docker-compose up -d
\ No newline at end of file
+            sudo docker-compose up -d