Skip to content

Commit 8a6ef1d

Browse files
authored
Merge pull request #150 from federico-razzoli/fix-mariadb-case
Fix MariaDB case in README
2 parents 11743a1 + 7ed9719 commit 8a6ef1d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ Find us at:
3939
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-mariadb%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mariadb/job/master/)
4040
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fmariadb%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/mariadb/latest/index.html)
4141

42-
[Mariadb](https://mariadb.org/) is one of the most popular database servers. Made by the original developers of MySQL.
42+
[MariaDB](https://mariadb.org/) is one of the most popular database servers. Made by the original developers of MySQL.
4343

44-
[![mariadb](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mariadb-git.png)](https://mariadb.org/)
44+
[![MariaDB](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mariadb-git.png)](https://mariadb.org/)
4545

4646
## Supported Architectures
4747

@@ -63,7 +63,7 @@ If you didn't set a password during installation, (see logs for warning) use
6363
`mariadb-admin -u root -p<PASSWORD>`
6464
to set one at the docker prompt...
6565

66-
NOTE changing the MYSQL_ROOT_PASSWORD variable after the container has set up the initial databases has no effect, use the mysqladmin tool to change your mariadb password.
66+
NOTE changing the MYSQL_ROOT_PASSWORD variable after the container has set up the initial databases has no effect, use the mysqladmin tool to change your MariaDB password.
6767

6868
NOTE if you want to use (MYSQL_DATABASE MYSQL_USER MYSQL_PASSWORD) **all three** of these variables need to be set you cannot pick and choose.
6969

@@ -175,7 +175,7 @@ Containers are configured using parameters passed at runtime (such as those abov
175175

176176
| Parameter | Function |
177177
| :----: | --- |
178-
| `-p 3306` | Mariadb listens on this port. |
178+
| `-p 3306` | MariaDB listens on this port. |
179179
| `-e PUID=1000` | for UserID - see below for explanation |
180180
| `-e PGID=1000` | for GroupID - see below for explanation |
181181
| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
@@ -358,18 +358,18 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
358358
* **06.07.21:** - Rebase master to alpine.
359359
* **03.07.21:** - Rebase to 3.14.
360360
* **08.02.21:** - Fix new installs.
361-
* **08.02.21:** - Rebase to alpine. Add mariadb-backup.
361+
* **08.02.21:** - Rebase to alpine. Add MariaDB-backup.
362362
* **08.02.21:** - Release alpine tag. The alpine release will replace the latest tag in the near future.
363363
* **27.10.19:** - Bump to 10.4, ability use custom sql on initial init ,defining root passwords via file.
364364
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
365365
* **07.03.19:** - Add ability to setup a database and default user on first spinup.
366366
* **26.01.19:** - Add pipeline logic and multi arch.
367-
* **10.09.18:** - Rebase to ubuntu bionic and use 10.3 mariadb repository.
367+
* **10.09.18:** - Rebase to ubuntu bionic and use 10.3 MariaDB repository.
368368
* **09.12.17:** - Fix continuation lines.
369-
* **12.09.17:** - Gracefully shut down mariadb.
369+
* **12.09.17:** - Gracefully shut down MariaDB.
370370
* **27.10.16:** - Implement linting suggestions on database init script.
371371
* **11.10.16:** - Rebase to ubuntu xenial, add version labelling.
372-
* **09.03.16:** - Update to mariadb 10.1. Change to use custom.cnf over my.cnf in /config. Restructured init files to change config options on startup, rather than in the dockerfile.
372+
* **09.03.16:** - Update to MariaDB 10.1. Change to use custom.cnf over my.cnf in /config. Restructured init files to change config options on startup, rather than in the dockerfile.
373373
* **26.01.16:** - Change user of mysqld_safe script to abc, better unclean shutdown handling on restart.
374374
* **23.12.15:** - Remove autoupdating, between some version updates the container breaks.
375375
* **12.08.15:** - Initial Release.

readme-vars.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ param_volumes:
2626
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
2727
param_usage_include_ports: true
2828
param_ports:
29-
- { external_port: "3306", internal_port: "3306", port_desc: "Mariadb listens on this port." }
29+
- { external_port: "3306", internal_port: "3306", port_desc: "MariaDB listens on this port." }
3030

3131
# optional container parameters
3232
opt_param_usage_include_env: true
@@ -43,7 +43,7 @@ app_setup_block: |
4343
`mariadb-admin -u root -p<PASSWORD>`
4444
to set one at the docker prompt...
4545
46-
NOTE changing the MYSQL_ROOT_PASSWORD variable after the container has set up the initial databases has no effect, use the mysqladmin tool to change your mariadb password.
46+
NOTE changing the MYSQL_ROOT_PASSWORD variable after the container has set up the initial databases has no effect, use the mysqladmin tool to change your MariaDB password.
4747
4848
NOTE if you want to use (MYSQL_DATABASE MYSQL_USER MYSQL_PASSWORD) **all three** of these variables need to be set you cannot pick and choose.
4949
@@ -121,12 +121,12 @@ changelogs:
121121
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
122122
- { date: "07.03.19:", desc: "Add ability to setup a database and default user on first spinup." }
123123
- { date: "26.01.19:", desc: "Add pipeline logic and multi arch." }
124-
- { date: "10.09.18:", desc: "Rebase to ubuntu bionic and use 10.3 mariadb repository." }
124+
- { date: "10.09.18:", desc: "Rebase to ubuntu bionic and use 10.3 MariaDB repository." }
125125
- { date: "09.12.17:", desc: "Fix continuation lines." }
126-
- { date: "12.09.17:", desc: "Gracefully shut down mariadb." }
126+
- { date: "12.09.17:", desc: "Gracefully shut down MariaDB." }
127127
- { date: "27.10.16:", desc: "Implement linting suggestions on database init script." }
128128
- { date: "11.10.16:", desc: "Rebase to ubuntu xenial, add version labelling." }
129-
- { date: "09.03.16:", desc: "Update to mariadb 10.1. Change to use custom.cnf over my.cnf in /config. Restructured init files to change config options on startup, rather than in the dockerfile." }
129+
- { date: "09.03.16:", desc: "Update to MariaDB 10.1. Change to use custom.cnf over my.cnf in /config. Restructured init files to change config options on startup, rather than in the dockerfile." }
130130
- { date: "26.01.16:", desc: "Change user of mysqld_safe script to abc, better unclean shutdown handling on restart." }
131131
- { date: "23.12.15:", desc: "Remove autoupdating, between some version updates the container breaks." }
132132
- { date: "12.08.15:", desc: "Initial Release." }

0 commit comments

Comments
 (0)