diff --git a/sql/docker-mysql/Dockerfile b/sql/docker-mysql/Dockerfile index 387cfbf35..4d19b2ac3 100644 --- a/sql/docker-mysql/Dockerfile +++ b/sql/docker-mysql/Dockerfile @@ -1,15 +1,17 @@ -FROM mysql:8.0.21 +FROM mysql:8.0.27 ENV TZ=Asia/Shanghai \ MYSQL_DATABASE=maxkey \ - MYSQL_USER=admin \ - MYSQL_PASSWORD=password \ - MYSQL_ROOT_PASSWORD=password + MYSQL_USER=maxkey \ + MYSQL_PASSWORD=maxkey \ + MYSQL_ROOT_PASSWORD=maxkey -MAINTAINER guox(guox@goodrain.com) +MAINTAINER maxkey(maxkeysupport@163.com) + +VOLUME ["/var/lib/mysql", "/root/mysql/data"] +VOLUME ["/var/log/mysql", "/root/mysql/logs"] -VOLUME ["/var/lib/mysql", "/var/log/mysql"] EXPOSE 3306 diff --git a/sql/docker-mysql/mysqld.cnf b/sql/docker-mysql/mysqld.cnf index 416f95d2d..07b9f0f6a 100644 --- a/sql/docker-mysql/mysqld.cnf +++ b/sql/docker-mysql/mysqld.cnf @@ -25,10 +25,11 @@ lower_case_table_names=1 # Disabling symbolic-links is recommended to prevent assorted security risks symbolic-links=0 -log-error=/var/log/mysql/error.log -slow_query_log = on; -slow-query-log-file = /var/log/mysql/mysql-slow.log +log-error=/var/lib/mysql/error.log +slow_query_log=on; +slow-query-log-file=/var/lib/mysql/mysql-slow.log pid-file=/var/run/mysqld/mysqld.pid + sql_mode = STRICT_ALL_TABLES,NO_ENGINE_SUBSTITUTION [mysql] diff --git a/sql/docker-mysql/sql/init.sql b/sql/docker-mysql/sql/init.sql index e6798126a..363514c9e 100644 --- a/sql/docker-mysql/sql/init.sql +++ b/sql/docker-mysql/sql/init.sql @@ -1,3 +1,7 @@ - source /docker-entrypoint-initdb.d/maxkey_v3.1.0.GA.sql ; - source /docker-entrypoint-initdb.d/maxkey_v3.1.0.GA_data.sql ; +create database if not exists `maxkey` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */ ; + +use maxkey ; + +source /docker-entrypoint-initdb.d/v3.1.0.ga/maxkey_v3.1.0.GA.sql ; +source /docker-entrypoint-initdb.d/v3.1.0.ga/maxkey_v3.1.0.GA_data.sql ; \ No newline at end of file diff --git a/sql/docker-mysql/sql/init_v2.9.0.ga.sql b/sql/docker-mysql/sql/v2.9.0.ga/init_v2.9.0.ga.sql similarity index 100% rename from sql/docker-mysql/sql/init_v2.9.0.ga.sql rename to sql/docker-mysql/sql/v2.9.0.ga/init_v2.9.0.ga.sql diff --git a/sql/docker-mysql/sql/maxkey_v2.9.0.GA.sql b/sql/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA.sql similarity index 100% rename from sql/docker-mysql/sql/maxkey_v2.9.0.GA.sql rename to sql/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA.sql diff --git a/sql/docker-mysql/sql/maxkey_v2.9.0.GA_data.sql b/sql/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA_data.sql similarity index 100% rename from sql/docker-mysql/sql/maxkey_v2.9.0.GA_data.sql rename to sql/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA_data.sql diff --git a/sql/docker-mysql/sql/init_v3.0.0.ga.sql b/sql/docker-mysql/sql/v3.0.0.ga/init_v3.0.0.ga.sql similarity index 100% rename from sql/docker-mysql/sql/init_v3.0.0.ga.sql rename to sql/docker-mysql/sql/v3.0.0.ga/init_v3.0.0.ga.sql diff --git a/sql/docker-mysql/sql/maxkey_v3.0.0.GA.sql b/sql/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA.sql similarity index 100% rename from sql/docker-mysql/sql/maxkey_v3.0.0.GA.sql rename to sql/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA.sql diff --git a/sql/docker-mysql/sql/maxkey_v3.0.0.GA_data.sql b/sql/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA_data.sql similarity index 100% rename from sql/docker-mysql/sql/maxkey_v3.0.0.GA_data.sql rename to sql/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA_data.sql diff --git a/sql/docker-mysql/sql/maxkey_v3.1.0.GA.sql b/sql/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA.sql similarity index 100% rename from sql/docker-mysql/sql/maxkey_v3.1.0.GA.sql rename to sql/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA.sql diff --git a/sql/docker-mysql/sql/maxkey_v3.1.0.GA_data.sql b/sql/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA_data.sql similarity index 100% rename from sql/docker-mysql/sql/maxkey_v3.1.0.GA_data.sql rename to sql/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA_data.sql