Update mysql

v5tech · Jan 20, 2023 · 6ffffc0 · 6ffffc0
1 parent 055ce6c
commit 6ffffc0
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 44 deletions.
diff --git a/doris/docker-compose.yml b/doris/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - ./data/fe:/opt/doris/fe/doris-meta
       - ./logs/fe:/opt/doris/fe/log
       - ./conf/fe.conf:/opt/doris/fe/conf/fe.conf
-      - ./bin:/docker-entrypoint-initdb.d/
+      - ./bin:/docker-entrypoint-initdb.d
     networks:
       - doris-network
     ports:

diff --git a/kettle/.gitignore b/kettle/.gitignore
diff --git a/kettle/conf/.kettle/repositories.xml b/kettle/conf/.kettle/repositories.xml
diff --git a/kettle/data/kettle/.gitkeep b/kettle/data/kettle/.gitkeep
diff --git a/kettle/docker-compose.yml b/kettle/docker-compose.yml
diff --git a/mysql/conf/my.cnf b/mysql/conf/my.cnf
@@ -2,7 +2,7 @@
 datadir=/var/lib/mysql
 
 default-storage-engine=INNODB
-character-set-server=utf8mb4
+character_set_server=utf8mb4
 collation-server=utf8mb4_unicode_ci
 lower_case_table_names=1
 table_open_cache=128
@@ -18,13 +18,15 @@ innodb_flush_log_at_trx_commit=0
 sync_binlog=0
 group_concat_max_len=1024000
 
-sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
+sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
 
 skip-name-resolve
 
 [client]
 default-character-set=utf8mb4
+
 [mysql]
 default-character-set=utf8mb4
+
 [mysql.server]
 default-character-set=utf8mb4
diff --git a/mysql/conf/mysql.env b/mysql/conf/mysql.env
@@ -1,3 +1,4 @@
-MYSQL_USER=root
+MYSQL_USER=dataease
+MYSQL_PASSWORD=dataease
 MYSQL_ROOT_PASSWORD=Password123@mysql
 TZ=Asia/Shanghai
diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml
@@ -8,23 +8,22 @@ services:
   mysql:
     image: registry.cn-qingdao.aliyuncs.com/dataease/mysql:5.7.39
     container_name: mysql
+    restart: unless-stopped
     privileged: true
     ports:
       - 3306:3306
-    environment:
-      MYSQL_USER: root
-      MYSQL_ROOT_PASSWORD: Password123@mysql
-      TZ: Asia/Shanghai
     env_file:
       - ./conf/mysql.env
     command:
+      --character-set-server=utf8mb4
+      --collation-server=utf8mb4_unicode_ci
+      --max_connections=3000
       --wait_timeout=31536000
       --interactive_timeout=31536000
-      --max_connections=3000
       --default-authentication-plugin=mysql_native_password
     volumes:
       - ./conf/my.cnf:/etc/mysql/conf.d/my.cnf
-      - ./bin:/docker-entrypoint-initdb.d/
+      - ./bin:/docker-entrypoint-initdb.d
       - ./data:/var/lib/mysql
     healthcheck:
       test: ["CMD", "mysqladmin", "ping", "-uroot", "-pPassword123@mysql"]