Master

.github/workflows/cd.yml

@@ -10,17 +10,30 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      # 1. 소스 코드 체크아웃
       - uses: actions/checkout@v4
 
+      # 2. Gradle 캐시 설정
+      - name: Cache Gradle packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      # 3. JDK 17 설정
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: "17"
           distribution: "adopt"
 
+      # 4. Gradlew 실행 권한 설정
       - name: Run chmod to make gradlew executable
         run: chmod +x ./gradlew
 
+      # 5. application.yml 설정
       - name: Add application.properties
         run: |
           mkdir -p ./src/main/resources
@@ -31,35 +44,49 @@ jobs:
           cat ./src/main/resources/application.yml
           cat ./src/main/resources/application-prod.yml
 
+      # 6. Gradle 빌드 (테스트 제외)
       - name: Build with Gradle
         run: ./gradlew build -x test
 
+      # 7. 도커 공간 정리 (빌드 전)
+      - name: Clean Docker Space Before Build
+        run: docker system prune -a --volumes -f
+
+      # 8. 멀티 스테이지 Docker 빌드
       - name: Build docker image
         run: |
           sudo chmod 666 /var/run/docker.sock
-          docker buildx build --no-cache --platform linux/amd64 -t ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGE_NAME }}:latest -f ./Dockerfile .
+          sudo docker buildx build --platform linux/amd64 -t ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGE_NAME }}:latest -f ./Dockerfile .
 
+      # 9. Docker Hub 로그인
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      # 10. Docker 이미지 푸시
       - name: Publish to Docker Hub
-        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGE_NAME }}:latest
+        run: sudo docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGE_NAME }}:latest
 
+      # 11. 원격 서버에서 도커 정리 및 배포
       - name: Connect to WAS & Execute Application
-        uses: appleboy/[email protected].6
+        uses: appleboy/[email protected].9
         with:
           host: ${{ secrets.SERVER_HOST }}
           username: ${{ secrets.SERVER_USERNAME }}
           key: ${{ secrets.SERVER_KEY }}
           port: ${{ secrets.SERVER_PORT }}
           script: |
-            sudo chmod 666 /var/run/docker.sock
+            # 최신 이미지 배포
             sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGE_NAME }}:latest
             sudo docker stop ${{ secrets.DOCKERHUB_IMAGE_NAME }} || true
             sudo docker rm ${{ secrets.DOCKERHUB_IMAGE_NAME }} || true
             sudo docker run -d --name ${{ secrets.DOCKERHUB_IMAGE_NAME }} -p 8080:8080 ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGE_NAME }}:latest
-            docker system prune -a --volumes -f
-            echo "끝"
+
+            # 도커 정리 (이미지, 네트워크, 볼륨)
+            sudo docker system prune -a --volumes -f
+            sudo docker volume prune -f
+            sudo docker network prune -f
+
+            echo "배포 완료 🎉"

Dockerfile

@@ -1,6 +1,4 @@
-FROM openjdk:18-alpine
-
-ENV TZ=Asia/Seoul
+FROM eclipse-temurin:17-jre-alpine
 
 WORKDIR /zarinatta-oauth
 
@@ -14,4 +12,4 @@ COPY ${JAR_FILE} app.jar
 EXPOSE 8080
 
 # 실행 명령어에 JVM 옵션 추가
-ENTRYPOINT ["java", "-Dfile.encoding=UTF-8", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-Dfile.encoding=UTF-8", "-jar", "app.jar", "--spring.profiles.active=prod"]

build.gradle

@@ -24,32 +24,39 @@ repositories {
 }
 
 dependencies {
+	// Spring Boot
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
-	// QueryDsl
+	// QueryDSL (불필요한 jakarta API 제거)
 	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
 	annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
 	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
 	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
+	// Lombok 최적화
 	compileOnly 'org.projectlombok:lombok'
-	runtimeOnly 'com.h2database:h2'
-	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
-	// jwt
+	// Database (운영: MySQL, 테스트: H2)
+	runtimeOnly 'com.mysql:mysql-connector-j'
+	testImplementation 'com.h2database:h2'
+
+	// JWT
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
 	implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
 	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 
-	// flyway
+	// Flyway (core 추가)
+	implementation 'org.flywaydb:flyway-core'
 	implementation 'org.flywaydb:flyway-mysql'
+
+	// 테스트
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {