Merge pull request #454 from hyanyul/part4-한성지-sprint9

[한성지] sprint9

Author: youngxpepp

.gitignore

@@ -17,7 +17,6 @@ build/
 out/
 !**/src/main/**/out/
 !**/src/test/**/out/
-node_modules/
 
 ### Eclipse ###
 .apt_generated
@@ -48,5 +47,18 @@ bin/
 ### data ###
 /data/
 
+### Discodeit ###
+.discodeit
+
 ### env ###
-*.env
+*.env
+
+### 숨김 파일 ###
+.*
+!.gitignore
+
+### Github Actions ###
+!.github/
+
+### log ###
+/logs/

Dockerfile

@@ -1,30 +1,39 @@
-# 베이스 이미지 지정
-FROM amazoncorretto:17
+# 빌드 스테이지
+FROM amazoncorretto:17 AS builder
 
 # 작업 디렉토리 설정
 WORKDIR /app
 
-# 현재 디렉토리의 파일(프로젝트)을 복사
-COPY . .
+# Gradle Wrapper 파일 먼저 복사
+COPY gradle ./grale
+COPY gradlew ./gradlew
 
-# wait-for-it.sh 복사
-COPY wait-for-it.sh /app/wait-for-it.sh
-RUN chmod +x /app/wait-for-it.sh
+# Gradle 캐시를 위한 의존성 파일 복사
+COPY build.gradle setting.gradle ./
 
-# Gradle Wrapper로 애플리케이션 빌드
-# 테스트 제외하고 빌드
+# 의존성 다운로드
+RUN ./gradlew dependencies
+
+# 소스 코드 복사 및 빌드
+COPY src ./src
 RUN ./gradlew build -x test
 
-# 80 포트 노출
-EXPOSE 80
+# 런타임 스테이지
+FROM amazoncorretto:17-alpine3.21
 
-# 프로젝트 정보를 환경 변수로 설정
-ENV PROJECT_NAME="discodeit" PROJECT_VERSION="1.2-M8"
+# 작업 디렉토리 설정
+WORKDIR /app
 
-# JVM 옵션을 환경 변수로 설정
-ENV JVM_OPTS=""
+# 프로젝트 정보를 ENV로 설정
+ENV PROJECT_NAME=discodeit \
+    PROJECT_VERSION=1.2-MB \
+    JVM_OPTS=""
+
+# 빌드 스테이지에서 jar 파일만 복사
+COPY --from=builder /app/build/libs/${PROJECT_NAME}-${PROJECT_VERSION}.jar ./
+
+# 80 포트 노출
+EXPOSE 80
 
-# 애플리케이션 실행 명령어 설정
-# sh, -c : 리눅스 쉘 명령어에서 문자열 전체를 하나의 명령어처럼 실행하라
-  # 환경변수를 문자열 안에서 해석해주기 위해 필요
-CMD ["sh", "-c", "./wait-for-it.sh postgres:5432 -- java $JVM_OPTS -jar build/libs/${PROJECT_NAME}-${PROJECT_VERSION}.jar"]
+# jar 파일 실행
+ENTRYPOINT ["sh", "-c", "java ${JVM_OPTS} -jar ${PROJECT_NAME}-${PROJECT_VERSION}.jar"]

build.gradle

@@ -2,14 +2,11 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.4.0'
     id 'io.spring.dependency-management' version '1.1.7'
+    id 'jacoco'
 }
 
 group = 'com.sprint.mission'
-version = '1.2-M8'
-
-bootJar {
-    archiveFileName = "discodeit-${version}.jar"
-}
+version = '0.0.1-SNAPSHOT'
 
 java {
     toolchain {
@@ -21,6 +18,9 @@ configurations {
     compileOnly {
         extendsFrom annotationProcessor
     }
+    testComplieOnly {
+        extendsFrom testAnnotationProcessor
+    }
 }
 
 repositories {
@@ -31,8 +31,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+    // security
+    implementation 'org.springframework.boot:spring-boot-starter-security'
 
     // validation
     implementation 'org.springframework.boot:spring-boot-starter-validation'
@@ -51,10 +52,25 @@ dependencies {
     // actuator
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
-    // aws s3 sdk
-    implementation 'software.amazon.awssdk:s3:2.31.7'
+    // test
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation 'com.h2database:h2:2.2.224'
+    testImplementation 'org.springframework.security:spring-security-test'
 }
 
 tasks.named('test') {
     useJUnitPlatform()
 }
+
+test {
+    finalizedBy jacocoTestReport
+}
+
+jacocoTestReport {
+    dependsOn test
+    reports {
+        xml.required = true
+        html.required = true
+    }
+}

docker-compose.yaml

@@ -1,36 +1,52 @@
+version: '3.8'
+
 services:
   app:
+    image: discodeit:local
     build:
       context: .
       dockerfile: Dockerfile
+    container_name: discodeit
     ports:
-      - "8080:80"
+      - "8081:80"
     environment:
-      - SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL}
-      - SPRING_DATASOURCE_USERNAME=${POSTGRES_USER}
-      - SPRING_DATASOURCE_PASSWORD=${POSTGRES_PASSWORD}
+      - SPRING_PROFILES_ACTIVE=prod
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/discodeit
+      - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}
+      - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}
+      - STORAGE_TYPE=s3
+      - STORAGE_LOCAL_ROOT_PATH=.discodeit/storage
       - AWS_S3_ACCESS_KEY=${AWS_S3_ACCESS_KEY}
       - AWS_S3_SECRET_KEY=${AWS_S3_SECRET_KEY}
       - AWS_S3_REGION=${AWS_S3_REGION}
       - AWS_S3_BUCKET=${AWS_S3_BUCKET}
-    volumes: # BinaryCotentStorage를 로컬 폴더와 연결
-      - ./BinaryContentStorage:/app/BinaryContentStorage
+      - AWS_S3_PRESIGNED_URL=EXPIRATION=600
     depends_on:
-      - postgres
-    command: >
-      sh -c '/app/wait-for-it.sh postgres:5432 --timeout=60 -- java $JVM_OPTS -jar build/libs/${PROJECT_NAME}-${PROJECT_VERSION}.jar'
+      - db
+    volumes:
+      - binary-content-storage:/app/.discodeit/storage
+    networks:
+      - discodeit-network
 
-  postgres:
-    image: postgres:15
-    ports:
-      - "5432:5432"
+  db:
+    image: postgres:16-alpine
+    container_name: discodeit-db
     environment:
+      - POSTGRES_DB=discodeit
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_DB=${POSTGRES_DB}
+    ports:
+      - "5432:5432"
     volumes:
       - postgres-data:/var/lib/postgresql/data
-      - ./schema.sql:/docker-entrypoint-initdb.d/schema.sql # postgreSQL 실행 시 자동 실행
+      - ./src/main/resources/schema.sql:/docker-entrypoint-initdb.d/schema.sql
+    networks:
+      - discodeit-network
 
 volumes:
-  postgres-data:
+  postgres-data:
+  binary-content-storage:
+
+networks:
+  discodeit-network:
+    driver: bridge