diff --git a/.docker/.gitignore b/.docker/.gitignore new file mode 100644 index 0000000..b6d592e --- /dev/null +++ b/.docker/.gitignore @@ -0,0 +1 @@ +/logs diff --git a/.docker/db/my.cnf b/.docker/db/my.cnf index 6944db7..6f97e72 100644 --- a/.docker/db/my.cnf +++ b/.docker/db/my.cnf @@ -1,7 +1,21 @@ [mysqld] -character-set-server=utf8mb4 -collation-server=utf8mb4_unicode_ci -default-authentication-plugin=mysql_native_password +character-set-server = utf8mb4 +collation-server = utf8mb4_bin + +default-authentication-plugin = mysql_native_password + +log-error = /var/log/mysql/mysql-error.log + +slow_query_log = 1 +slow_query_log_file = /var/log/mysql/mysql-slow.log +long_query_time = 5.0 +log_queries_not_using_indexes = 0 + +general_log = 1 +general_log_file = /var/log/mysql/mysql-query.log + +[mysql] +default-character-set = utf8mb4 [client] -default-character-set=utf8mb4 +default-character-set = utf8mb4 diff --git a/README.md b/README.md index 7480d0a..28aef62 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,9 @@

-

-Build Status -Total Downloads -Latest Stable Version -License -

- # Laravel Docker Starter Kit - Laravel v10.7.1 - PHP v8.2.5 +- MySQL v8.0 - MariaDB v10.11 # Requirements diff --git a/docker-compose.yml b/docker-compose.yml index 780f496..1ff3c97 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,15 +29,16 @@ services: - php #################################################################################################### - # DATABASE (MariaDB) + # DATABASE (MySQL) #################################################################################################### db: - container_name: laravel_db - image: mariadb:10.11 + container_name: laravel_mysql + image: mysql:8.0 ports: - 3306:3306 volumes: - .docker/db/data:/var/lib/mysql + - .docker/logs:/var/log/mysql - .docker/db/my.cnf:/etc/mysql/conf.d/my.cnf - .docker/db/sql:/docker-entrypoint-initdb.d environment: @@ -45,4 +46,22 @@ services: MYSQL_DATABASE: laravel_db_name MYSQL_USER: laravel_db_user MYSQL_PASSWORD: laravel_db_pass - # TZ: Asia/Tokyo + + # #################################################################################################### + # # DATABASE (MariaDB) + # #################################################################################################### + # db: + # container_name: laravel_mariadb + # image: mariadb:10.11 + # ports: + # - 3306:3306 + # volumes: + # - .docker/db/data:/var/lib/mysql + # - .docker/logs:/var/log/mysql + # - .docker/db/my.cnf:/etc/mysql/conf.d/my.cnf + # - .docker/db/sql:/docker-entrypoint-initdb.d + # environment: + # MYSQL_ROOT_PASSWORD: root + # MYSQL_DATABASE: laravel_db_name + # MYSQL_USER: laravel_db_user + # MYSQL_PASSWORD: laravel_db_pass