Feat/cicd

.github/workflows/gradle.yml

@@ -0,0 +1,78 @@
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    name: Build & Push Docker Image
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      # JDK
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      # Gradle cache
+      - name: Setup Gradle Cache
+        uses: gradle/actions/setup-gradle@v4
+
+      # Gradle build
+      - name: Build with Gradle
+        run: ./gradlew clean build -x test
+
+      # DockerHub Login
+      - name: DockerHub Login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      # Docker build
+      - name: Build Docker Image
+        run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/spring-cicd-test .
+
+      # Docker push
+      - name: Push Docker Image
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/spring-cicd-test
+
+  deploy:
+    name: Deploy to EC2
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Deploy to EC2 via SSH
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ubuntu
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            echo "[1] Pulling latest Docker image..."
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/spring-cicd-test
+
+            echo "[2] Stopping old container..."
+            docker stop spring-app || true
+            docker rm spring-app || true
+
+            echo "[3] Running new container..."
+            docker run -d \
+              --name spring-app \
+              --env-file /home/ubuntu/app/.env \
+              -p 8080:8080 \
+              --restart unless-stopped \
+              ${{ secrets.DOCKERHUB_USERNAME }}/spring-cicd-test
+
+            echo "Deployment Completed Successfully!"
+

.gitignore

@@ -144,4 +144,6 @@ replay_pid*
 
 # End of https://www.toptal.com/developers/gitignore/api/java,intellij
 
-.env
+.env
+!gradle/wrapper/gradle-wrapper.jar
+

Dockerfile

@@ -0,0 +1,9 @@
+# Dockerfile
+
+# OpenJDK 17 공식 교체 이미지 (openjdk:17 제거됨)
+FROM eclipse-temurin:17-jdk
+
+ARG JAR_FILE=build/libs/*.jar
+COPY ${JAR_FILE} app.jar
+
+ENTRYPOINT ["java", "-jar", "/app.jar"]

build.gradle

@@ -4,7 +4,7 @@ plugins {
 	id 'io.spring.dependency-management' version '1.1.7'
 }
 
-group = 'graduation.project'
+group = 'graduation.project.DoDutch_server'
 version = '0.0.1-SNAPSHOT'
 
 java {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/graduation/project/DoDutch_server/domain/expense/converter/ExpenseConverter.java

@@ -4,7 +4,6 @@
 import graduation.project.DoDutch_server.domain.expense.entity.Expense;
 import graduation.project.DoDutch_server.domain.member.entity.Member;
 
-import java.time.LocalDate;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;

src/main/java/graduation/project/DoDutch_server/domain/expense/dto/AllExpenseByDateResponseDto.java

@@ -1,6 +1,5 @@
 package graduation.project.DoDutch_server.domain.expense.dto;
 
-import graduation.project.DoDutch_server.domain.expense.entity.ExpenseCategory;
 import lombok.Builder;
 import lombok.Getter;
 

src/main/java/graduation/project/DoDutch_server/domain/expense/dto/ExpenseRequestDto.java

@@ -1,12 +1,9 @@
 package graduation.project.DoDutch_server.domain.expense.dto;
 
 import graduation.project.DoDutch_server.domain.expense.entity.ExpenseCategory;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
 import lombok.*;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Getter

src/main/java/graduation/project/DoDutch_server/domain/trip/dto/Response/TripDetailResponseDTO.java

@@ -1,11 +1,11 @@
 package graduation.project.DoDutch_server.domain.trip.dto.Response;
 
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
 import java.time.LocalDate;
 import java.util.List;

src/main/java/graduation/project/DoDutch_server/global/common/exception/ExceptionAdvice.java

@@ -1,7 +1,6 @@
 package graduation.project.DoDutch_server.global.common.exception;
 
 import graduation.project.DoDutch_server.global.common.apiPayload.code.status.ErrorStatus;
-import graduation.project.DoDutch_server.global.common.exception.GeneralException;
 import graduation.project.DoDutch_server.global.common.apiPayload.code.dto.ErrorReasonDTO;
 import graduation.project.DoDutch_server.global.common.apiPayload.ApiResponse;
 import jakarta.servlet.http.HttpServletRequest;