Skip to content

Commit

Permalink
�refactor: 스프링 프로필 분리 (#494)
Browse files Browse the repository at this point in the history
* chore: 테스트를 위한 트리거 변경

* chore: defer 옵션 추가

* chore: private yml dev 유저 옵션 변경

* chore: private yml root 비밀번호 추가

* chore: dev ddl-auto update로 변경

* chore: defer 옵션 제거

* chore: defer 옵션 제거

* chore: sql init 모드 변경

* chore: 프로필 분리

* chore: 사용되지 않은 환경변수 제거

* chore: 중복 설정 제거 및 프로필 별 적합한 옵션으로 수정

* chore: dev EC2에서 사용하는 컴포즈 파일 내용으로 수정

* chore: 실제 배포를 위한 develop으로 트리거 변경

* chore: dev 프로필 ddl-auto validate로 변경

* chore: local 환경의 로그 파일 경로 수정

* chore: 서브 모듈 update

* chore: 테스트를 위한 트리거 변경

* chore: defer 옵션 추가

* chore: dev ddl-auto update로 변경

* chore: defer 옵션 제거

* chore: defer 옵션 제거

* chore: sql init 모드 변경

* chore: 프로필 분리

* chore: 사용되지 않은 환경변수 제거

* chore: 중복 설정 제거 및 프로필 별 적합한 옵션으로 수정

* chore: 프로필 별 서브모듈 import 제거

* chore: 머지 충돌로 수정된 CD yml 다시 수정

* chore: dev의 ddl-auto validate로 변경

---------

Co-authored-by: mzeong <[email protected]>
  • Loading branch information
hyeon0208 and mzeong committed Sep 9, 2024
1 parent a432162 commit c18c32e
Show file tree
Hide file tree
Showing 7 changed files with 88 additions and 71 deletions.
26 changes: 14 additions & 12 deletions backend/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,27 @@ services:
MYSQL_ROOT_HOST: '%'
MYSQL_ROOT_PASSWORD: ${DEV_MYSQL_PASSWORD}
MYSQL_DATABASE: ody
TZ: Asia/Seoul
volumes:
- /mysql-data:/var/lib/mysql
networks:
- ody-develop-network
- ody-dev-db-vol:/var/lib/mysql
platform: linux/arm64
healthcheck:
test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
interval: 10s
timeout: 30s
retries: 5

web:
image: ${DOCKERHUB_USERNAME}/${DOCKERHUB_REPOSITORY}:${GIT_SHA}-dev
container_name: ody-dev-app
ports:
- "8080:8080"
links:
- db
volumes:
- /var/logs/ody-dev-logs:/ody-dev-logs
- ody-dev-logs-vol:/ody-dev-logs
platform: linux/arm64
networks:
- ody-develop-network
depends_on:
db:
condition: service_healthy

networks:
ody-develop-network:
driver: bridge
volumes:
ody-dev-db-vol:
ody-dev-logs-vol:
15 changes: 15 additions & 0 deletions backend/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
spring:
jpa:
hibernate:
ddl-auto: validate
properties:
hibernate:
dialect: org.hibernate.dialect.MySQLDialect
sql:
init:
mode: never
schema-locations: classpath:schema.sql

log:
file:
path: /ody-dev-logs
19 changes: 19 additions & 0 deletions backend/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
spring:
h2:
console:
enabled: true
path: /h2-console
settings:
web-allow-others: true
datasource:
driver-class-name: org.h2.Driver
url: jdbc:h2:mem:database?serverTimezone=Asia/Seoul
username: sa
password:
jpa:
hibernate:
ddl-auto: validate

log:
file:
path: ./ody-local-logs
15 changes: 15 additions & 0 deletions backend/src/main/resources/application-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
spring:
jpa:
hibernate:
ddl-auto: validate
properties:
hibernate:
dialect: org.hibernate.dialect.MySQLDialect
sql:
init:
mode: always
schema-locations: classpath:schema.sql

log:
file:
path: /ody-prod-logs
69 changes: 11 additions & 58 deletions backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,62 +1,15 @@
spring:
config:
import: classpath:private/private.yml
jpa:
hibernate:
ddl-auto: validate
properties:
hibernate:
dialect: org.hibernate.dialect.MySQLDialect
sql:
init:
mode: always
schema-locations: classpath:schema.sql
profiles:
active: dev

springdoc:
default-consumes-media-type: application/json;charset=UTF-8
default-produces-media-type: application/json;charset=UTF-8
api-docs:
path: /api-docs
swagger-ui:
disable-swagger-default-url: true
display-request-duration: true
operations-sorter: alpha
enabled: true

odsay:
url: https://api.odsay.com/v1/api/searchPubTransPathT

---

spring:
config:
activate:
on-profile: local

log:
file:
path: ./ody-dev-logs

---

spring:
config:
activate:
on-profile: dev

log:
file:
path: /ody-dev-logs

---

spring:
config:
activate:
on-profile: prod

log:
file:
path: /ody-prod-logs
default: "local"
groups:
local:
- local
- common
dev:
- dev
- common
prod:
- prod
- common
13 changes: 13 additions & 0 deletions backend/src/main/resources/common.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
springdoc:
default-consumes-media-type: application/json;charset=UTF-8
default-produces-media-type: application/json;charset=UTF-8
api-docs:
path: /api-docs
swagger-ui:
disable-swagger-default-url: true
display-request-duration: true
operations-sorter: alpha
enabled: true

odsay:
url: https://api.odsay.com/v1/api/searchPubTransPathT
2 changes: 1 addition & 1 deletion backend/src/main/resources/private

0 comments on commit c18c32e

Please sign in to comment.