From e90e42c134ecc63be47a35bae1f59eab6ca4ec7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=86=90=EC=8A=B9=EC=9A=B0?= <seungwoo@vanillabrain.com>
Date: Mon, 2 Jan 2023 18:17:40 +0900
Subject: [PATCH] update: update docker-compose clear

---
 backend-api/Dockerfile.dev     |  4 +++-
 backend-api/db/conf.d/my.cnf   |  9 +++++++--
 backend-api/docker-compose.yml | 16 ++--------------
 backend-api/init.sh            |  6 ++++--
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/backend-api/Dockerfile.dev b/backend-api/Dockerfile.dev
index 816c20b..037a3a2 100644
--- a/backend-api/Dockerfile.dev
+++ b/backend-api/Dockerfile.dev
@@ -42,9 +42,11 @@ COPY tsconfig.json .
 COPY tsconfig.build.json .
 RUN npm run build
 
+
+#ENTRYPOINT ["init.sh"]
 EXPOSE 4000
 CMD ["mysqld"]
-#
+
 
 #
 #COPY init.sh .
diff --git a/backend-api/db/conf.d/my.cnf b/backend-api/db/conf.d/my.cnf
index aeebf7c..63dfadd 100644
--- a/backend-api/db/conf.d/my.cnf
+++ b/backend-api/db/conf.d/my.cnf
@@ -1,6 +1,5 @@
 [client]
 default-character-set = utf8mb4
-port = 3306
 
 [mysqldump]
 quick
@@ -8,4 +7,10 @@ max_allowed_packet = 16M
 
 [mysql]
 default-character-set = utf8mb4
-port = 3306
+
+[mysqld]
+init-connect = 'SET collation_connection = utf8mb4_unicode_ci'
+init-connect = 'SET NAMES utf8mb4'
+character-set-server = utf8mb4
+collation-server = utf8mb4_unicode_ci
+default_time_zone='+09:00'
diff --git a/backend-api/docker-compose.yml b/backend-api/docker-compose.yml
index c45375d..8c77ab4 100644
--- a/backend-api/docker-compose.yml
+++ b/backend-api/docker-compose.yml
@@ -82,18 +82,15 @@ services:
     build:
       context: ./
       dockerfile: ./Dockerfile.dev
+    image: mysql:5.7
     ports:
       - "4000:4000"
     networks:
       - vanillameta
     depends_on:
       - mysql
-      #      - pg
-#      - mssql
     links:
-      - "mysql:mysqldb"
-      #      - "pg"
-#      - mssql
+      - "mysql"
     env_file:
       - .env
     tty: true
@@ -125,15 +122,6 @@ services:
         - ./db/conf.d:/etc/mysql/conf.d
         - ./mysql-init-files/dump_data:/docker-entrypoint-initdb.d
 
-  testdb:
-    image: mysql:5.7
-    ports:
-      - "3307:3306"
-    restart: always
-
-
-
-
   #  mariadb:
   #    container_name: vanillameta_mariadb
   #    extra_hosts:
diff --git a/backend-api/init.sh b/backend-api/init.sh
index 24faa07..000b4a0 100644
--- a/backend-api/init.sh
+++ b/backend-api/init.sh
@@ -3,7 +3,9 @@
 #    mysql_config_editor set --login-path=test --host=dev-sellerking-service.cpxfjdgipx1h.ap-northeast-2.rds.amazonaws.com --user=vanillabrain --password
 #    Enter password: qkslffk123123
 
-    mysqldump --single-transaction --databases --column-statistics=0 vanillameta_auth -h localhost -u vanillabrain -pqkslffk123123 < /docker-entrypoint-initdb.d/dump_data/dump_data.sql
+    mysqldump --single-transaction --databases --column-statistics=0 vanillameta_auth -h localhost -u vanillabrain -pqkslffk123123 < /docker-entrypoint-initdb.d
     #    mysqldump -h dev-sellerking-service.cpxfjdgipx1h.ap-northeast-2.rds.amazonaws.com -u vanillabrain --password > dump_data.sql
 
-    #end of init.sh
\ No newline at end of file
+    #end of init.sh
+
+#    mysqldump --single-transaction --databases --column-statistics=0 vanillameta_auth -h localhost -u vanillabrain -pqkslffk123123 < dump_data.sql
\ No newline at end of file