[Bug] docker-compose.yml 테스트 실행용 커맨드 제거 Cuz ENTRYPOINT 방해

Author: ARlegro

.idea/workspace.xml

@@ -13,4 +13,4 @@ ENV PROJECT_NAME=discodeit
 ENV PROJECT_VERSION=1.2-M8
 ENV JVM_OPTS=""
 
-ENTRYPOINT ["sh", "-c", "exec java ${JVM_OPTS} -jar /app/build/libs/${PROJECT_NAME}-${PROJECT_VERSION}.jar"]
+ENTRYPOINT ["sh", "-c", "java ${JVM_OPTS} -jar /app/build/libs/${PROJECT_NAME}-${PROJECT_VERSION}.jar"]

Dockerfile

@@ -94,4 +94,3 @@ clean {
 tasks.named('test') {
 	useJUnitPlatform()
 }
-

build.gradle

@@ -1,31 +1,31 @@
 services:
   discodeit-server:
-    container_name: discodeit-server
+    container_name: discodeit-app
     build: .
     ports:
       - 8081:80
-    command:
-      - ./gradlew test
+#    command:
+#      - ./gradlew test
+    volumes:
+      - app-storage:/.discodeit/storage
+    env_file:
+      - .env
 
     depends_on:
       postgres-db:
         condition: service_healthy
 
-    env_file:
-      - .env
-
   postgres-db:
     container_name: postgres-db
-    image: postgres
+    image: postgres:latest
     ports:
       - 5432:5432
     environment:
-      POSTGRES_USER: ${DB_USERNAME}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_USER: ${SPRING_DATASOURCE_USERNAME}
+      POSTGRES_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
 
     volumes:
-      - ./discodeit-data:/var/lib/postgresql/data
+      - discodeit-postgres:/var/lib/postgresql/data
       - ./src/main/resources/schema.sql:/docker-entrypoint-initdb.d/schema.sql
 
     env_file:
@@ -36,3 +36,6 @@ services:
       interval: 5s
       retries: 10
 
+volumes:
+  app-storage:
+  discodeit-postgres:

docker-compose.yml

@@ -2,23 +2,30 @@ spring:
   servlet:
     multipart:
       enabled: true
-      max-file-size: 20MB # 요청 파일 하나당 허용 사이즈
-      max-request-size: 50MB  #multipart/form-data 요청에서 전체 파일의 허용 사이즈
+      max-file-size: ${MAX_FILE_SIZE}
+      max-request-size: ${MAX_REQUEST_SIZE}
 
 ---
 spring:
   datasource:
-    url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:discodeit}
+    url: ${SPRING_DATASOURCE_URL}
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driver-class-name: org.postgresql.Driver
-  sql:
-    init:
-      mode: always
+  #  sql:
+  #    init:
+  #      mode: always
   jpa:
     hibernate:
       ddl-auto: none
+    show-sql: false
     open-in-view: false
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: ${MAX_FILE_SIZE}
+      max-request-size: ${MAX_REQUEST_SIZE}
+
 
 ---
 discodeit:
@@ -31,7 +38,7 @@ discodeit:
       secret-key: ${AWS_S3_SECRET_KEY}
       region: ${AWS_S3_REGION}
       bucket: ${AWS_S3_BUCKET}
-      presigned-url-expiration: ${AWS_S3_PRESIGNED_URL_EXPIRATION:600}
+      presigned-url-expiration: ${AWS_S3_PRESIGNED_URL_EXPIRATION}
 
 ---
 management: