diff --git a/.dockerignore b/.dockerignore index 343a4ff..c238606 100644 --- a/.dockerignore +++ b/.dockerignore @@ -24,5 +24,5 @@ **/secrets.dev.yaml **/values.dev.yaml README.md -data/ +database/ .flake8 diff --git a/.gitignore b/.gitignore index 5cd369e..c1b4a3a 100644 --- a/.gitignore +++ b/.gitignore @@ -161,4 +161,4 @@ cython_debug/ #.idea/ # Database data -data/ \ No newline at end of file +database/data/ diff --git a/compose.yaml b/compose.yaml index 771f362..65d7f6e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -20,7 +20,9 @@ services: - password_manager db: - image: stnicolay/mariadb-aria + build: + context: ./database/ + dockerfile: ./Dockerfile restart: always environment: MYSQL_ROOT_PASSWORD: example123! @@ -28,6 +30,6 @@ services: MYSQL_USER: manager MYSQL_PASSWORD: passwd123! volumes: - - ./data:/var/lib/mysql + - ./database/data:/var/lib/mysql networks: - password_manager diff --git a/database/Dockerfile b/database/Dockerfile new file mode 100644 index 0000000..eb9b61f --- /dev/null +++ b/database/Dockerfile @@ -0,0 +1,3 @@ +FROM mariadb + +COPY mariadb.cnf /etc/mysql/mariadb.cnf diff --git a/database/mariadb.cnf b/database/mariadb.cnf new file mode 100644 index 0000000..282855e --- /dev/null +++ b/database/mariadb.cnf @@ -0,0 +1,38 @@ +# The MariaDB configuration file +# +# The MariaDB/MySQL tools read configuration files in the following order: +# 0. "/etc/mysql/my.cnf" symlinks to this file, reason why all the rest is read. +# 1. "/etc/mysql/mariadb.cnf" (this file) to set global defaults, +# 2. "/etc/mysql/conf.d/*.cnf" to set global options. +# 3. "/etc/mysql/mariadb.conf.d/*.cnf" to set MariaDB-only options. +# 4. "~/.my.cnf" to set user-specific options. +# +# If the same option is defined multiple times, the last one will apply. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# If you are new to MariaDB, check out https://mariadb.com/kb/en/basic-mariadb-articles/ + +# +# This group is read both by the client and the server +# use it for options that affect everything +# +[client-server] +# Port or socket location where to connect +# port = 3306 +socket = /run/mysqld/mysqld.sock + +# Import all .cnf files from configuration directory +[mariadbd] +skip-host-cache +skip-name-resolve + +[mysqld] +skip-innodb +default-storage-engine=Aria +default-tmp-storage-engine=Aria + +!includedir /etc/mysql/mariadb.conf.d/ +!includedir /etc/mysql/conf.d/