diff --git a/mariadb/README-short.txt b/mariadb/README-short.txt index 12378062037a..fba6b84a2a13 100644 --- a/mariadb/README-short.txt +++ b/mariadb/README-short.txt @@ -1 +1 @@ -MariaDB Server is a high performing open source relational databases, forked from MySQL. +MariaDB Server is a high performing open source relational database, forked from MySQL. diff --git a/mariadb/content.md b/mariadb/content.md index 96a1c3d56c3e..2cc4985b994c 100644 --- a/mariadb/content.md +++ b/mariadb/content.md @@ -1,6 +1,6 @@ # What is MariaDB? -MariaDB Server is one of the most popular database servers in the world. It’s made by the original developers of MySQL and guaranteed to stay open source. Notable users include Wikipedia, DBS Bank and ServiceNow. +MariaDB Server is one of the most popular database servers in the world. It’s made by the original developers of MySQL and guaranteed to stay open source. Notable users include Wikipedia, DBS Bank, and ServiceNow. The intent is also to maintain high compatibility with MySQL, ensuring a library binary equivalency and exact matching with MySQL APIs and commands. MariaDB developers continue to develop new features and improve performance to better serve its users. @@ -41,7 +41,7 @@ This image can also be used as a client for non-Docker or remote instances: $ docker run -it --rm %%IMAGE%% mysql -hsome.mysql.host -usome-mysql-user -p ``` -More information about the MariaDB command line client can be found in the [MariaDB Knowledge Base](https://mariadb.com/kb/en/mysql-command-line-client/) +More information about the MariaDB command-line client can be found in the [MariaDB Knowledge Base](https://mariadb.com/kb/en/mysql-command-line-client/) ## %%STACK%% @@ -63,7 +63,7 @@ $ docker logs some-%%REPO%% ## Using a custom MariaDB configuration file -The startup configuration is specified in the file `/etc/mysql/my.cnf`, and that file in turn includes any files found in the `/etc/mysql/conf.d` directory that end with `.cnf`. Settings in files in this directory will augment and/or override settings in `/etc/mysql/my.cnf`. If you want to use a customized MySQL configuration, you can create your alternative configuration file in a directory on the host machine and then mount that directory location as `/etc/mysql/conf.d` inside the `%%IMAGE%%` container. +The startup configuration is specified in the file `/etc/mysql/my.cnf`, and that file in turn includes any files found in the `/etc/mysql/conf.d` directory that end with `.cnf`. Settings in files in this directory will augment and/or override settings in `/etc/mysql/my.cnf`. If you want to use a customized MariaDB configuration, you can create your alternative configuration file in a directory on the host machine and then mount that directory location as `/etc/mysql/conf.d` inside the `%%IMAGE%%` container. If `/my/custom/config-file.cnf` is the path and name of your custom configuration file, you can start your `%%IMAGE%%` container like this (note that only the directory path of the custom config file is used in this command): @@ -157,7 +157,7 @@ The Docker documentation is a good starting point for understanding the differen $ docker run --name some-%%REPO%% -v /my/own/datadir:/var/lib/mysql -e MARIADB_ROOT_PASSWORD=my-secret-pw -d %%IMAGE%%:tag ``` -The `-v /my/own/datadir:/var/lib/mysql` part of the command mounts the `/my/own/datadir` directory from the underlying host system as `/var/lib/mysql` inside the container, where MySQL by default will write its data files. +The `-v /my/own/datadir:/var/lib/mysql` part of the command mounts the `/my/own/datadir` directory from the underlying host system as `/var/lib/mysql` inside the container, where MariaDB by default will write its data files. ## No connections until MariaDB init completes @@ -177,7 +177,7 @@ $ docker exec some-%%REPO%% sh -c 'exec mysqldump --all-databases -uroot -p"$MAR ## Restoring data from dump files -For restoring data. You can use `docker exec` command with `-i` flag, similar to the following: +For restoring data. You can use the `docker exec` command with the `-i` flag, similar to the following: ```console $ docker exec -i some-%%REPO%% sh -c 'exec mysql -uroot -p"$MARIADB_ROOT_PASSWORD"' < /some/path/on/your/host/all-databases.sql diff --git a/mariadb/issues.md b/mariadb/issues.md index 935e50da46d7..47700639f962 100644 --- a/mariadb/issues.md +++ b/mariadb/issues.md @@ -1 +1 @@ -[https://jira.mariadb.org/](https://jira.mariadb.org/) under "MDEV" Project, and component "Docker" or [GitHub](%%GITHUB-REPO%%/issues) +Issues can be filed on [https://jira.mariadb.org/](https://jira.mariadb.org/) under the "MDEV" Project and "Docker" Component, or on [GitHub](%%GITHUB-REPO%%/issues)