diff --git a/config/reserve-check-service.yml b/config/reserve-check-service.yml index 1a7c628..86b3b35 100644 --- a/config/reserve-check-service.yml +++ b/config/reserve-check-service.yml @@ -1,6 +1,6 @@ spring: r2dbc: - url: r2dbc:mysql://localhost:3307/reservation?serverTimezone=Asia/Seoul + url: r2dbc:mysql://localhost:3306/reservation?serverTimezone=Asia/Seoul username: msaportal password: msaportal cloud: diff --git a/config/reserve-request-service.yml b/config/reserve-request-service.yml index 656319a..4594f84 100644 --- a/config/reserve-request-service.yml +++ b/config/reserve-request-service.yml @@ -1,6 +1,6 @@ spring: r2dbc: - url: r2dbc:mysql://localhost:3307/reservation?serverTimezone=Asia/Seoul + url: r2dbc:mysql://localhost:3306/reservation?serverTimezone=Asia/Seoul username: msaportal password: msaportal cloud: diff --git a/docker-compose/mysql/docker-compose.yml b/docker-compose/mysql/docker-compose.yml index 5b4de84..e95dd91 100644 --- a/docker-compose/mysql/docker-compose.yml +++ b/docker-compose/mysql/docker-compose.yml @@ -1,10 +1,10 @@ version: "3.8" services: - mysql_msaportal: + mysql: image: mysql:5.7 environment: # 환경변수 + MYSQL_MULTIPLE_DATABASES: msaportal,reservation MYSQL_USER: msaportal - MYSQL_DATABASE: msaportal MYSQL_PASSWORD: msaportal MYSQL_ALLOW_EMPTY_PASSWORD: "yes" MYSQL_ROOT_HOST: "%" @@ -13,26 +13,7 @@ services: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci volumes: - - "${HOME}/docker-volume/msaportal-db/:/var/lib/mysql" + - "${HOME}/docker-volume/mysql/:/var/lib/mysql" ports: - "3306:3306" - container_name: mysql_msaportal - - mysql_reservation: - image: mysql:5.7 - environment: # 환경변수 - MYSQL_USER: msaportal - MYSQL_DATABASE: reservation - MYSQL_PASSWORD: msaportal - MYSQL_ALLOW_EMPTY_PASSWORD: "yes" - MYSQL_ROOT_HOST: "%" - TZ: Asia/Seoul - command: # 명령어 실행 - characterset 지정 - - --character-set-server=utf8mb4 - - --collation-server=utf8mb4_unicode_ci - volumes: - - "${HOME}/docker-volume/reservation-db/:/var/lib/mysql" - ports: - - "3307:3306" - container_name: mysql_reservation - \ No newline at end of file + container_name: mysql