Fix MariaDB issues

Use different root password
Use correct database for setup
Change precedence for setup SQL scripts
Remove deprececated options from my.cnf
This commit is contained in:
Ari Timonen 2020-04-12 13:39:10 +03:00
parent 5e9c725ab5
commit 88a6c697cc
3 changed files with 7 additions and 8 deletions

View file

@ -1,9 +1,9 @@
-- FIXME: this should be somewhere else probably
CREATE DATABASE ensl_development;
CREATE DATABASE IF NOT EXISTS ensl_development;
GRANT ALL PRIVILEGES ON ensl_development.* TO 'ensl'@'%' WITH GRANT OPTION;
CREATE DATABASE ensl_test;
CREATE DATABASE IF NOT EXISTS ensl_test;
GRANT ALL PRIVILEGES ON ensl_test.* TO 'ensl'@'%' WITH GRANT OPTION;
CREATE DATABASE ensl_staging;
CREATE DATABASE IF NOT EXISTS ensl_staging;
GRANT ALL PRIVILEGES ON ensl_staging.* TO 'ensl'@'%' WITH GRANT OPTION;

View file

@ -136,7 +136,7 @@ services:
- MYSQL_DATABASE=$MYSQL_DATABASE
- MYSQL_USER=$MYSQL_USER
- MYSQL_PASSWORD=$MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD=$MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
- MYSQL_ROOT_HOST=$MYSQL_ROOT_HOST
smtp:

View file

@ -3,7 +3,7 @@
skip-host-cache
skip-name-resolve
key_buffer = 150M
key_buffer_size = 150M
max_allowed_packet = 20M
thread_stack = 196K
thread_cache_size = 16
@ -11,7 +11,7 @@ thread_cache_size = 16
max_connections = 96
table_cache = 2000
table_definition_cache = 800
thread_concurrency = 128
; thread_concurrency = 128
query_cache_limit = 30M
query_cache_size = 150M
@ -22,7 +22,7 @@ read_buffer_size = 128K
tmp_table_size = 500M
max_heap_table_size = 500M
innodb_buffer_pool_size = 1280M
innodb_buffer_pool_size = 1280M
innodb_flush_log_at_trx_commit = 1
innodb_thread_concurrency = 16
innodb_flush_method = O_DIRECT
@ -31,4 +31,3 @@ innodb_file_per_table = 1
transaction-isolation = READ-COMMITTED
innodb_file_per_table=1
innodb_file_format = Barracuda