NBC-finalProject
diff --git a/‎.DS_Store‎
8 KB b/‎.DS_Store‎
8 KB
diff --git a/‎.github/workflows/batch-deploy.yml‎
Lines changed: 40 additions & 0 deletions b/‎.github/workflows/batch-deploy.yml‎
Lines changed: 40 additions & 0 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 25 additions & 0 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 25 additions & 0 deletions
diff --git a/‎.github/workflows/deploy-service.yml‎
Lines changed: 80 additions & 0 deletions b/‎.github/workflows/deploy-service.yml‎
Lines changed: 80 additions & 0 deletions
diff --git a/‎.github/workflows/run-test.yaml‎
Lines changed: 0 additions & 40 deletions b/‎.github/workflows/run-test.yaml‎
Lines changed: 0 additions & 40 deletions
diff --git a/‎.gitignore‎
Lines changed: 9 additions & 0 deletions b/‎.gitignore‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎build.gradle‎
Lines changed: 22 additions & 65 deletions b/‎build.gradle‎
Lines changed: 22 additions & 65 deletions
diff --git a/‎cs25-batch/.gitattributes‎
Lines changed: 3 additions & 0 deletions b/‎cs25-batch/.gitattributes‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎cs25-batch/.gitignore‎
Lines changed: 37 additions & 0 deletions b/‎cs25-batch/.gitignore‎
Lines changed: 37 additions & 0 deletions
diff --git a/‎cs25-batch/Dockerfile‎
Lines changed: 28 additions & 0 deletions b/‎cs25-batch/Dockerfile‎
Lines changed: 28 additions & 0 deletions
@@ -0,0 +1,40 @@
+name: Deploy CS25 Batch to Docker Hub
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - 'cs25-batch/**'
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_BATCH_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_BATCH_TOKEN }}
+
+      - name: Build and push cs25-batch Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./cs25-batch/Dockerfile
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_BATCH_USERNAME }}/cs25-batch:latest
+            ${{ secrets.DOCKERHUB_BATCH_USERNAME }}/cs25-batch:${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Image digest
+        run: echo "Image pushed successfully with tags latest and ${{ github.sha }}"
@@ -0,0 +1,25 @@
+name: CI - Build & Test
+
+on:
+  pull_request:
+    branches:
+      - main
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v3
+
+      - name: Set up jdk
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
+
+      - name: Run test
+        run: ./gradlew clean test -x integration
@@ -0,0 +1,80 @@
+name: CD - Docker Build & Deploy to EC2
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Build Docker image (cs25-service)
+        run: docker build -t baekjonghyun/cs25-service:latest -f cs25-service/Dockerfile .
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: baekjonghyun
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Push Docker image to DockerHub
+        run: docker push baekjonghyun/cs25-service:latest
+
+      - name: Create .env from secrets
+        run: |
+          echo "MYSQL_USERNAME=${{ secrets.MYSQL_USERNAME }}" >> .env
+          echo "MYSQL_PASSWORD=${{ secrets.MYSQL_PASSWORD }}" >> .env
+          echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}" >> .env
+          echo "JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}" >> .env
+          echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> .env
+          echo "KAKAO_ID=${{ secrets.KAKAO_ID }}" >> .env
+          echo "KAKAO_SECRET=${{ secrets.KAKAO_SECRET }}" >> .env
+          echo "GH_ID=${{ secrets.GH_ID }}" >> .env
+          echo "GH_SECRET=${{ secrets.GH_SECRET }}" >> .env
+          echo "NAVER_ID=${{ secrets.NAVER_ID }}" >> .env
+          echo "NAVER_SECRET=${{ secrets.NAVER_SECRET }}" >> .env
+          echo "GMAIL_PASSWORD=${{ secrets.GMAIL_PASSWORD }}" >> .env
+          echo "MYSQL_HOST=${{ secrets.MYSQL_HOST }}" >> .env
+          echo "REDIS_HOST=${{ secrets.REDIS_HOST }}" >> .env
+          echo "CHROMA_HOST=${{ secrets.CHROMA_HOST }}" >> .env
+          echo "FRONT_END_URI=${{ secrets.FRONT_END_URI }}" >> .env
+          echo "CLAUDE_API_KEY=${{ secrets.CLAUDE_API_KEY }}" >> .env
+
+
+      - name: Upload .env to EC2
+        uses: appleboy/scp-action@v0.1.4
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ec2-user
+          key: ${{ secrets.SSH_KEY }}
+          source: ".env"
+          target: "/home/ec2-user/app"
+
+      - name: Deploy on EC2 (docker run)
+        uses: appleboy/ssh-action@v1.2.0
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ec2-user
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            cd /home/ec2-user/app
+
+            echo "[1] Pull latest Docker image"
+            docker pull baekjonghyun/cs25-service:latest
+      
+            echo "[2] Stop and remove old container"
+            docker stop cs25 || echo "No running container to stop"
+            docker rm cs25 || echo "No container to remove"
+      
+            echo "[3] Run new container"
+            docker run -d \
+            --name cs25 \
+            --env-file .env \
+            -p 8080:8080 \
+            baekjonghyun/cs25-service:latest
+      
+            echo "[✔] Deployment completed successfully"
@@ -38,4 +38,13 @@ out/
 
 .env
 
+### Mac ###
+.DS_Store
+
+# Chroma 벡터 DB 데이터 (Docker 볼륨과 연동됨)
+cs25-service/chroma-data/
+
+# 벡터 DB 검색 조회 성능 테스트 결과
+cs25-service/spring_benchmark_results.csv
+
 
@@ -1,75 +1,32 @@
 plugins {
-    id 'java'
-    id 'org.springframework.boot' version '3.5.0'
-    id 'io.spring.dependency-management' version '1.1.7'
+    id 'org.springframework.boot' version '3.5.0' apply false
+    id 'io.spring.dependency-management' version '1.1.7' apply false
 }
 
-group = 'com.example'
-version = '0.0.1-SNAPSHOT'
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+allprojects {
+    group = 'com.example'
+    version = '0.0.1-SNAPSHOT'
+    repositories {
+        mavenCentral()
     }
 }
 
-configurations {
-    compileOnly {
-        extendsFrom annotationProcessor
-    }
-}
-
-repositories {
-    mavenCentral()
-}
-
-ext {
-    set('queryDslVersion', "5.0.0")
-}
-
-dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
-    implementation 'org.springframework.boot:spring-boot-starter-validation'
+subprojects {
+    apply plugin: 'java'
 
-    // mail
-    implementation 'org.springframework.boot:spring-boot-starter-batch'
-    implementation 'org.springframework.boot:spring-boot-starter-mail'
-
-    // Jwt
-    implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
-    implementation 'io.jsonwebtoken:jjwt-impl:0.12.6'
-    runtimeOnly 'io.jsonwebtoken:jjwt-gson:0.12.6'
-
-    compileOnly 'org.projectlombok:lombok'
-    implementation 'com.mysql:mysql-connector-j:8.2.0'
-    annotationProcessor 'org.projectlombok:lombok'
-
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.springframework.security:spring-security-test'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-
-    // ai
-    implementation 'org.springframework.ai:spring-ai-starter-model-openai:1.0.0'
-    implementation 'org.springframework.ai:spring-ai-starter-vector-store-chroma:1.0.0'
-
-    //queryDSL
-    implementation "com.querydsl:querydsl-jpa:${queryDslVersion}:jakarta"
-    annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jakarta"
-    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
-    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+    // 공통 의존성 관리
+    dependencies {
+        implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+        implementation 'org.springframework.boot:spring-boot-starter-web'
+        implementation 'org.springframework.boot:spring-boot-starter-validation'
+        testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    }
 
-    //Prometheus
-    implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    implementation 'io.micrometer:micrometer-registry-prometheus'
-}
+    tasks.named('test') {
+        useJUnitPlatform()
+    }
 
-tasks.named('test') {
-    useJUnitPlatform()
+    tasks.withType(JavaCompile) {
+        options.encoding = 'UTF-8'
+    }
 }
@@ -0,0 +1,3 @@
+/gradlew text eol=lf
+*.bat text eol=crlf
+*.jar binary
@@ -0,0 +1,37 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
@@ -0,0 +1,28 @@
+FROM gradle:8.10.2-jdk17 AS builder
+
+# 작업 디렉토리 설정
+WORKDIR /apps
+
+# 전체 프로젝트 복사 (멀티모듈 의존성 포함)
+COPY .. .
+
+# cs25-batch 모듈만 빌드하여 bootJar 생성
+RUN gradle :cs25-batch:clean :cs25-batch:bootJar -x test
+
+# jdk 대신 용량이 작은 jre 사용
+FROM eclipse-temurin:17-jre
+
+# 메타 정보
+LABEL type="application" module="cs25-batch"
+
+# 작업 디렉토리
+WORKDIR /apps
+
+# bootJar 복사 (Spring Boot executable jar)
+COPY --from=builder /apps/cs25-batch/build/libs/cs25-batch-0.0.1-SNAPSHOT.jar app.jar
+
+# 포트 오픈 (service는 8080)
+EXPOSE 8081
+
+# 실행 (Spring Boot의 표준 방식)
+ENTRYPOINT ["java", "-jar", "/apps/app.jar"]
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/gradlew text eol=lf`
	`2`	`+*.bat text eol=crlf`
	`3`	`+*.jar binary`