From eb5bcaab78cadf293ce2ec29acc36e0ccd06cf53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=B1=84=EC=9D=80?=
 <109871579+ChaeAg@users.noreply.github.com>
Date: Thu, 21 Dec 2023 02:28:39 +0900
Subject: [PATCH 1/5] Create test.yml

---
 .github/workflows/test.yml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..caeb898
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [ "deploy-test" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04 
+    env:
+      working-directory: ThirdSeminar
+
+    steps: 
+    - name: 체크아웃
+      uses: actions/checkout@v3
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+	      with:
+        distribution: 'corretto'
+        java-version: '17'
+
+    - name: application.yaml 생성
+      run: | 
+          cd src/main/resources
+          echo "${{ secrets.APPLICATION }}" > ./application.yaml
+      working-directory: ${{ env.working-directory }}
+
+    - name: 빌드
+      run: |
+          chmod +x gradlew
+          ./gradlew build -x test
+      working-directory: ${{ env.working-directory }}
+      shell: bash

From b35b5ed04750af5246a9bf55b9f6b74559ff9698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=B1=84=EC=9D=80?=
 <109871579+ChaeAg@users.noreply.github.com>
Date: Thu, 21 Dec 2023 02:45:40 +0900
Subject: [PATCH 2/5] Create testCD.yml

---
 .github/workflows/testCD.yml | 64 ++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 .github/workflows/testCD.yml

diff --git a/.github/workflows/testCD.yml b/.github/workflows/testCD.yml
new file mode 100644
index 0000000..87bd7ff
--- /dev/null
+++ b/.github/workflows/testCD.yml
@@ -0,0 +1,64 @@
+name: CD
+
+on:
+  push:
+    branches: [ "develop" ]
+
+jobs:
+  deploy-ci:
+    runs-on: ubuntu-22.04
+    env:
+      working-directory: ThirdSeminar
+
+    steps: 
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'corretto'
+        java-version: '17'
+
+    - name: application.yaml 생성
+      run: | 
+          cd src/main/resources
+          echo "${{ secrets.APPLICATION }}" > ./application-deploy.yaml
+      working-directory: ${{ env.working-directory }}
+
+    - name: 빌드
+      run: |
+          chmod +x gradlew
+          ./gradlew build -x test
+      working-directory: ${{ env.working-directory }}
+      shell: bash
+
+    - name: docker build 가능하도록 환경 설정
+      uses: docker/setup-buildx-action@v2.9.1
+      
+    - name: docker hub에로그인
+      uses: docker/login-action@v2.2.0
+      with:
+        username: ${{ secrets.DOCKERHUB_LOGIN_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_LOGIN_ACCESSTOKEN }}
+
+    - name: docker image 빌드 및 푸시
+      run: |
+        docker build --platform linux/amd64 -t chaeag/do-sopt-seminar .
+        docker push {dockerhub계정id}/do-sopt-seminar
+      working-directory: ${{ env.working-directory }}
+
+  deploy-cd:      
+    needs: deploy-ci
+    runs-on: ubuntu-22.04
+
+    steps:    
+    - name: 도커 컨테이너 실행
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.RELEASE_SERVER_IP }}
+        username: ${{ secrets.RELEASE_SERVER_USER }}
+        key: ${{ secrets.RELEASE_SERVER_KEY }}
+        script: |
+					docker rm -f do-sopt-seminar
+					docker image pull chaeag/do-sopt-seminar
+					docker run -d --name do-sopt-seminar-8080 -p 8080:8080 chaeag/do-sopt-seminar

From e2ad4a6b4d9c6435d5d8ac823ee0d0a62b560e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=B1=84=EC=9D=80?=
 <109871579+ChaeAg@users.noreply.github.com>
Date: Thu, 21 Dec 2023 03:18:49 +0900
Subject: [PATCH 3/5] Update testCD.yml

---
 .github/workflows/testCD.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/testCD.yml b/.github/workflows/testCD.yml
index 87bd7ff..bd7cdc0 100644
--- a/.github/workflows/testCD.yml
+++ b/.github/workflows/testCD.yml
@@ -59,6 +59,5 @@ jobs:
         username: ${{ secrets.RELEASE_SERVER_USER }}
         key: ${{ secrets.RELEASE_SERVER_KEY }}
         script: |
-					docker rm -f do-sopt-seminar
-					docker image pull chaeag/do-sopt-seminar
-					docker run -d --name do-sopt-seminar-8080 -p 8080:8080 chaeag/do-sopt-seminar
+	  cd ~
+ 	  ./deploy.sh

From 05a857a0def6f40a5323f70eef88723dea800390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=B1=84=EC=9D=80?=
 <109871579+ChaeAg@users.noreply.github.com>
Date: Thu, 21 Dec 2023 03:21:08 +0900
Subject: [PATCH 4/5] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index caeb898..b06edb1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 name: CI
 
 on:
-  pull_request:
+  push:
     branches: [ "deploy-test" ]
 
 jobs:

From 08d27a17365587c1c659a596bc279df7912692ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=B1=84=EC=9D=80?=
 <109871579+ChaeAg@users.noreply.github.com>
Date: Thu, 21 Dec 2023 03:21:37 +0900
Subject: [PATCH 5/5] Update testCD.yml

---
 .github/workflows/testCD.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testCD.yml b/.github/workflows/testCD.yml
index bd7cdc0..3f633f2 100644
--- a/.github/workflows/testCD.yml
+++ b/.github/workflows/testCD.yml
@@ -2,7 +2,7 @@ name: CD
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: [ "deploy-test" ]
 
 jobs:
   deploy-ci: