From e7fd5ebd4137504230035e321f17e0261f82fd93 Mon Sep 17 00:00:00 2001 From: fanxb Date: Fri, 5 Jul 2019 16:33:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=20Feat:=20[=E5=90=8E=E5=8F=B0]:do?= =?UTF-8?q?cker=E9=83=A8=E7=BD=B2mysql,redis=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookMarkDocker/docker-compose.yml | 32 +++++++++++++++++++++++++++++++ bookMarkDocker/mysql/my.cnf | 30 +++++++++++++++++++++++++++++ bookMarkDocker/timezone | 1 + 3 files changed, 63 insertions(+) create mode 100644 bookMarkDocker/docker-compose.yml create mode 100644 bookMarkDocker/mysql/my.cnf create mode 100644 bookMarkDocker/timezone diff --git a/bookMarkDocker/docker-compose.yml b/bookMarkDocker/docker-compose.yml new file mode 100644 index 0000000..51ba6cc --- /dev/null +++ b/bookMarkDocker/docker-compose.yml @@ -0,0 +1,32 @@ +version: "3" +services: + bookmark-mysql: + image: mysql:8.0.16 + container_name: bookmark-mysql + ports: + - 3307:3306 + networks: + - bookmark + volumes: + - ./mysql/data:/var/lib/mysql + - ./mysql/temp:/var/lib/mysql-files + - ./mysql/my.cnf:/etc/mysql/my.cnf + - /etc/localtime:/etc/localtime + - ./timezone:/etc/timezone + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_PASS} + bookmark-redis: + image: redis:3.2.10 + container_name: bookmark-redis + volumes: + - /etc/localtime:/etc/localtime + - ./timezone:/etc/timezone + networks: + - bookmark + ports: + - 6380:6379 + + + +networks: + bookmark: \ No newline at end of file diff --git a/bookMarkDocker/mysql/my.cnf b/bookMarkDocker/mysql/my.cnf new file mode 100644 index 0000000..7a9423a --- /dev/null +++ b/bookMarkDocker/mysql/my.cnf @@ -0,0 +1,30 @@ +[mysqld] +port=3306 +max_connections=200 +max_connect_errors=10 +character-set-server=utf8mb4 +default_authentication_plugin=mysql_native_password +# 忽略大小写 +lower_case_table_names=1 +innodb_buffer_pool_size=128M +tmp_table_size=32M +key_buffer_size=32M + +# 配置中文分词 +#ngram_token_size=2 +#ft_min_word_len=2 + +# 开启慢查询日志记录 +set global slow_query_log = on +# 记录阈值，单位s +set long_query_time = 0.3 +# 设置查询存储方式 +set globle log_output = table + + +[mysql] +default-character-set=utf8mb4 + +[client] +port=3306 +default-character-set=utf8mb4 \ No newline at end of file diff --git a/bookMarkDocker/timezone b/bookMarkDocker/timezone new file mode 100644 index 0000000..0ddd9ee --- /dev/null +++ b/bookMarkDocker/timezone @@ -0,0 +1 @@ +Asia/Shanghai \ No newline at end of file From 3501ee2e77d491401f0125d09f2f9d6065fde7b0 Mon Sep 17 00:00:00 2001 From: fanxb Date: Fri, 5 Jul 2019 17:00:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20Fix:=20[=E5=90=8E=E5=8F=B0]:?= =?UTF-8?q?=E4=BF=AE=E6=94=B9mysql=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookMarkDocker/docker-compose.yml | 3 ++- bookMarkDocker/mysql/my.cnf | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bookMarkDocker/docker-compose.yml b/bookMarkDocker/docker-compose.yml index 51ba6cc..7638f17 100644 --- a/bookMarkDocker/docker-compose.yml +++ b/bookMarkDocker/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: "2" services: bookmark-mysql: image: mysql:8.0.16 @@ -15,6 +15,7 @@ services: - ./timezone:/etc/timezone environment: - MYSQL_ROOT_PASSWORD=${MYSQL_PASS} + - MYSQL_DATABASE=bookmark bookmark-redis: image: redis:3.2.10 container_name: bookmark-redis diff --git a/bookMarkDocker/mysql/my.cnf b/bookMarkDocker/mysql/my.cnf index 7a9423a..c4fe87e 100644 --- a/bookMarkDocker/mysql/my.cnf +++ b/bookMarkDocker/mysql/my.cnf @@ -15,11 +15,11 @@ key_buffer_size=32M #ft_min_word_len=2 # 开启慢查询日志记录 -set global slow_query_log = on +slow_query_log = 1 # 记录阈值，单位s -set long_query_time = 0.3 +long_query_time = 0.3 # 设置查询存储方式 -set globle log_output = table +log_output = table [mysql]