Skip to content

Commit 9a235e6

Browse files
authored
Merge pull request #1 from dbart/mariadb_update
MariaDB update
2 parents da23a69 + 85e07d4 commit 9a235e6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

mariadb/README-short.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
MariaDB Server is a high performing open source relational databases, forked from MySQL.
1+
MariaDB Server is a high performing open source relational database, forked from MySQL.

mariadb/content.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# What is MariaDB?
22

3-
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.
3+
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.
44

55
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.
66

@@ -41,7 +41,7 @@ This image can also be used as a client for non-Docker or remote instances:
4141
$ docker run -it --rm %%IMAGE%% mysql -hsome.mysql.host -usome-mysql-user -p
4242
```
4343

44-
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/)
44+
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/)
4545

4646
## %%STACK%%
4747

@@ -63,7 +63,7 @@ $ docker logs some-%%REPO%%
6363

6464
## Using a custom MariaDB configuration file
6565

66-
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.
66+
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.
6767

6868
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):
6969

@@ -157,7 +157,7 @@ The Docker documentation is a good starting point for understanding the differen
157157
$ docker run --name some-%%REPO%% -v /my/own/datadir:/var/lib/mysql -e MARIADB_ROOT_PASSWORD=my-secret-pw -d %%IMAGE%%:tag
158158
```
159159

160-
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.
160+
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.
161161

162162
## No connections until MariaDB init completes
163163

@@ -177,7 +177,7 @@ $ docker exec some-%%REPO%% sh -c 'exec mysqldump --all-databases -uroot -p"$MAR
177177

178178
## Restoring data from dump files
179179

180-
For restoring data. You can use `docker exec` command with `-i` flag, similar to the following:
180+
For restoring data. You can use the `docker exec` command with the `-i` flag, similar to the following:
181181

182182
```console
183183
$ docker exec -i some-%%REPO%% sh -c 'exec mysql -uroot -p"$MARIADB_ROOT_PASSWORD"' < /some/path/on/your/host/all-databases.sql

mariadb/issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[https://jira.mariadb.org/](https://jira.mariadb.org/) under "MDEV" Project, and component "Docker" or [GitHub](%%GITHUB-REPO%%/issues)
1+
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)

0 commit comments

Comments
 (0)