From 12ae0d8eaefc87c2eb7011b1df3faf8c126084ae Mon Sep 17 00:00:00 2001
From: kimjaeyeol <godbasic97@gmail.com>
Date: Fri, 22 Oct 2021 15:54:23 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20=EA=B5=90=EC=9C=A1=EC=9A=A9=20my?=
 =?UTF-8?q?sql=20=EC=9D=80=20=ED=95=98=EB=82=98=EB=A7=8C=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/reserve-check-service.yml        |  2 +-
 config/reserve-request-service.yml      |  2 +-
 docker-compose/mysql/docker-compose.yml | 27 ++++---------------------
 3 files changed, 6 insertions(+), 25 deletions(-)

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