From daf75a752a5b7d6c1c1e94dfa841d78e89e75893 Mon Sep 17 00:00:00 2001 From: Bellroute Date: Tue, 24 Feb 2026 00:41:30 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EA=B0=9C=EB=B0=9C=EC=9A=A9=20db=20?= =?UTF-8?q?=EC=97=B0=EB=8F=99=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose-dev.yml | 5 +++-- docker-compose.yml | 1 + src/main/resources/application-dev.yml | 12 ++++++------ src/main/resources/application-prod.yml | 2 ++ src/main/resources/application.yml | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index c951a2c..01ee70f 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -8,6 +8,7 @@ services: - JASYPT_PASSWORD=${JASYPT_PASSWORD} - VERSION=${TAG} - BUILDTIME=${BUILDTIME} + - SPRING_PROFILES_ACTIVE=dev - LOGGING_FILE_PATH=/logs/dev # 로그 파일 경로를 환경 변수로 설정 volumes: - ./logs:/logs/dev # 호스트와 컨테이너 간 로그 파일 공유 @@ -25,7 +26,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 +38,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..9b73b37 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,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..63e8a9a 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(oaiDEmUA1aUAa4nie4c2Umj0SkIo86tdPY5GN3lbv6Dle+/hHdXr9GnWnYCEEaeElWz0mxkafh/mFtNyLf84I2cXRiv18eZ/zrgEfbjA7K2WnW9YuDYP4zCLdq2kk62JfFjqwoCRwnu/BKNNxF7896K6vVdxBzfL) + 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: From d71cd959f3bd99e9c72506d95cbad6bec7f79644 Mon Sep 17 00:00:00 2001 From: Bellroute Date: Tue, 3 Mar 2026 22:28:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20db=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 63e8a9a..5b45289 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,7 +2,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ENC(oaiDEmUA1aUAa4nie4c2Umj0SkIo86tdPY5GN3lbv6Dle+/hHdXr9GnWnYCEEaeElWz0mxkafh/mFtNyLf84I2cXRiv18eZ/zrgEfbjA7K2WnW9YuDYP4zCLdq2kk62JfFjqwoCRwnu/BKNNxF7896K6vVdxBzfL) + url: ENC(0SGAt9P1xWJfHb1kiYhIWMqmpummGoSoO1ni07GP/6gy8FfSWr2DgDfKpfRJsBLm96azNXwcnxY5Git6+i/XftOP6zqGgN7ZrTvoUspF0mkSCzwEJPyZ6DVBSUfCYEYy/xxrpo5QB50LKY2wOe0jfNB+k19dTwpPuGmK0rT1vHc=) username: ENC(/hDIlwiiOpd1p7Coppl9L4xHYDjkf9cj) password: ENC(Toy+1i51hX5nGADpusirW4loTpskgy4o) h2: From cb73ec8d211c3779bf268e9c2194aa88f3c51002 Mon Sep 17 00:00:00 2001 From: Bellroute Date: Tue, 3 Mar 2026 22:30:39 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20docker-compose=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose-dev.yml | 4 +++- docker-compose.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 01ee70f..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 이미지 @@ -13,7 +15,7 @@ services: volumes: - ./logs:/logs/dev # 호스트와 컨테이너 간 로그 파일 공유 ports: - - "8080:8080" + - "8081:8080" logging: # 로그 드라이버 설정 (json-file 기본값 사용) driver: "json-file" options: diff --git a/docker-compose.yml b/docker-compose.yml index 9b73b37..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 이미지