From 67d8234ca1246b84bf738db7eda406f92650cc46 Mon Sep 17 00:00:00 2001
From: Ji Seungmin <cswcsm02@gmail.com>
Date: Wed, 25 Oct 2023 19:09:21 +0900
Subject: [PATCH] =?UTF-8?q?[feat]:=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C?=
 =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20?=
 =?UTF-8?q?=EB=B8=94=EB=A3=A8=20=EA=B7=B8=EB=A6=B0=20=EB=AC=B4=EC=A4=91?=
 =?UTF-8?q?=EB=8B=A8=20=EB=B0=B0=ED=8F=AC=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml                       |  8 +-------
 docker-compose.yml                             | 18 ------------------
 nginx/conf.d/nginx.conf                        | 15 ---------------
 .../com/umc/refit/domain/entity/Member.java    |  2 ++
 4 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 docker-compose.yml
 delete mode 100644 nginx/conf.d/nginx.conf

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 8168230..1f7359d 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -57,9 +57,7 @@ jobs:
       run: |
         docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
         docker build -t ${{ secrets.DOCKER_REPO }}/refit-spring .
-        docker build -f dockerfile-nginx -t ${{ secrets.DOCKER_REPO }}/refit-nginx .
         docker push ${{ secrets.DOCKER_REPO }}/refit-spring
-        docker push ${{ secrets.DOCKER_REPO }}/refit-nginx
 
     - name: Deploy
       uses: appleboy/ssh-action@v0.1.10
@@ -68,8 +66,4 @@ jobs:
         username: ubuntu
         key: ${{ secrets.KEY }}
         script: |
-          sudo docker rm -f $(docker ps -qa)
-          sudo docker pull ${{ secrets.DOCKER_REPO }}/refit-spring
-          sudo docker pull ${{ secrets.DOCKER_REPO }}/refit-nginx
-          docker-compose up -d
-          docker image prune -f
\ No newline at end of file
+          ./deploy.sh
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 786692b..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: '3.8'
-
-services:
-  spring:
-    container_name: spring
-    image: cswcsm02/refit-spring
-    expose:
-      - 8080
-    ports:
-      - 8080:8080
-
-  nginx:
-    container_name: nginx
-    image: cswcsm02/refit-nginx
-    ports:
-      - 80:80
-    depends_on:
-      - spring
\ No newline at end of file
diff --git a/nginx/conf.d/nginx.conf b/nginx/conf.d/nginx.conf
deleted file mode 100644
index c2bf438..0000000
--- a/nginx/conf.d/nginx.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-server {
-    listen 80;
-    server_name www.umc-refit.com
-    access_log off;
-
-    client_max_body_size 100M;
-
-    location / {
-        proxy_pass http://spring:8080;
-        proxy_set_header Host $host:$server_port;
-        proxy_set_header X-Forwarded-Host $server_name;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/umc/refit/domain/entity/Member.java b/src/main/java/com/umc/refit/domain/entity/Member.java
index 71621c0..980ac83 100644
--- a/src/main/java/com/umc/refit/domain/entity/Member.java
+++ b/src/main/java/com/umc/refit/domain/entity/Member.java
@@ -3,6 +3,7 @@
 import com.umc.refit.domain.dto.member.JoinDto;
 import com.umc.refit.domain.dto.mypage.UpdateMyInfoRequestDto;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -18,6 +19,7 @@
 @Entity
 @Getter
 @Setter
+@NoArgsConstructor()
 public class Member implements UserDetails {
 
     @Id