diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index c951a2c..7fb4355 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -1,5 +1,7 @@ version: '3.8' +name: climingo-dev + services: climingo-api: image: climingo/climingo-dev:${TAG} # Spring Boot 애플리케이션 Docker 이미지 @@ -8,11 +10,12 @@ services: - JASYPT_PASSWORD=${JASYPT_PASSWORD} - VERSION=${TAG} - BUILDTIME=${BUILDTIME} + - SPRING_PROFILES_ACTIVE=dev - LOGGING_FILE_PATH=/logs/dev # 로그 파일 경로를 환경 변수로 설정 volumes: - ./logs:/logs/dev # 호스트와 컨테이너 간 로그 파일 공유 ports: - - "8080:8080" + - "8081:8080" logging: # 로그 드라이버 설정 (json-file 기본값 사용) driver: "json-file" options: @@ -25,7 +28,7 @@ services: image: grafana/promtail:2.9.0 # Promtail Docker 이미지 container_name: promtail ports: - - "9080:9080" + - "9081:9080" depends_on: - climingo-api # Spring Boot 애플리케이션이 먼저 실행되도록 설정 volumes: @@ -37,4 +40,4 @@ services: networks: climingo-network: - external: true \ No newline at end of file + external: true diff --git a/docker-compose.yml b/docker-compose.yml index 847886a..4b6e9bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,7 @@ version: '3.8' +name: climingo-prod + services: climingo-api: image: climingo/climingo:${TAG} # Spring Boot 애플리케이션 Docker 이미지 @@ -8,6 +10,7 @@ services: - JASYPT_PASSWORD=${JASYPT_PASSWORD} - VERSION=${TAG} - BUILDTIME=${BUILDTIME} + - SPRING_PROFILES_ACTIVE=prod - LOGGING_FILE_PATH=/logs/prod # 로그 파일 경로를 환경 변수로 설정 volumes: - ./logs:/logs/prod # 호스트와 컨테이너 간 로그 파일 공유 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d1863cd..5b45289 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,17 +1,17 @@ spring: - datasource: # TODO MySQL로 변경 - driver-class-name: org.h2.Driver - username: sa - password: - url: jdbc:h2:mem:test + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ENC(0SGAt9P1xWJfHb1kiYhIWMqmpummGoSoO1ni07GP/6gy8FfSWr2DgDfKpfRJsBLm96azNXwcnxY5Git6+i/XftOP6zqGgN7ZrTvoUspF0mkSCzwEJPyZ6DVBSUfCYEYy/xxrpo5QB50LKY2wOe0jfNB+k19dTwpPuGmK0rT1vHc=) + username: ENC(/hDIlwiiOpd1p7Coppl9L4xHYDjkf9cj) + password: ENC(Toy+1i51hX5nGADpusirW4loTpskgy4o) h2: console: enabled: true path: /h2-console jpa: hibernate: - ddl-auto: create # TODO 운영 환경시 변경 필요 + ddl-auto: validate properties: hibernate: show_sql: true diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index c90f12f..0861979 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -8,6 +8,8 @@ spring: console: enabled: false jpa: + hibernate: + ddl-auto: validate properties: hibernate: show_sql: false diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 458cead..6b2fd59 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ spring: local: local dev: dev prod: prod - active: prod + active: local servlet: multipart: