Skip to content

Commit 2237055

Browse files
authored
Merge pull request #166 from linuxserver/fix-readme
Fix readme
2 parents a061038 + 111a510 commit 2237055

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

README.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ The architectures supported by this image are:
5656

5757
## Application Setup
5858

59-
If you didn't set a password during installation, (see logs for warning) use
60-
`mariadb-admin -u root -p<PASSWORD>`
61-
to set one at the docker prompt...
59+
Root via localhost (docker exec) no longer requires a password according to [upstream behavior](https://mariadb.com/docs/server/security/user-account-management/authentication-from-mariadb-10-4), if you didn't set a root password for remote access during the initial start follow the instructions in the container log.
6260

6361
NOTE changing any of the MYSQL_ variables after the container has set up the initial databases has no effect, use the mysqladmin tool or cli to make changes.
6462

@@ -103,10 +101,10 @@ This will have the same effect as setting the `REMOTE_SQL` environment variable.
103101
If user databases are not in a healthy state (sometimes caused by a failed upgrade), it may be remedied by running:
104102

105103
```shell
106-
mariadb-check -u root -p<PASSWORD> -c -A # check all databases for errors
107-
mariadb-check -u root -p<PASSWORD> -r -A # repair all databases
108-
mariadb-check -u root -p<PASSWORD> -a -A # analyze all databases
109-
mariadb-check -u root -p<PASSWORD> -o -A # optimize all databases
104+
mariadb-check -c -A # check all databases for errors
105+
mariadb-check -r -A # repair all databases
106+
mariadb-check -a -A # analyze all databases
107+
mariadb-check -o -A # optimize all databases
110108
```
111109

112110
After running the above commands, you may need to run the upgrade command again.
@@ -116,7 +114,7 @@ After running the above commands, you may need to run the upgrade command again.
116114
When this container initializes, if `MYSQL_ROOT_PASSWORD` is set an upgrade check will run. If an upgrade is required the log will indicate the need stop any services that are accessing databases in this container, and then run the command:
117115

118116
```shell
119-
mariadb-upgrade -u root -p<PASSWORD>
117+
mariadb-upgrade
120118
```
121119

122120
## Read-Only Operation

readme-vars.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ nonroot_supported: true
3838
# application setup block
3939
app_setup_block_enabled: true
4040
app_setup_block: |
41-
If you didn't set a password during installation, (see logs for warning) use
42-
`mariadb-admin -u root -p<PASSWORD>`
43-
to set one at the docker prompt...
41+
Root via localhost (docker exec) no longer requires a password according to [upstream behavior](https://mariadb.com/docs/server/security/user-account-management/authentication-from-mariadb-10-4), if you didn't set a root password for remote access during the initial start follow the instructions in the container log.
4442
4543
NOTE changing any of the MYSQL_ variables after the container has set up the initial databases has no effect, use the mysqladmin tool or cli to make changes.
4644
@@ -85,10 +83,10 @@ app_setup_block: |
8583
If user databases are not in a healthy state (sometimes caused by a failed upgrade), it may be remedied by running:
8684
8785
```shell
88-
mariadb-check -u root -p<PASSWORD> -c -A # check all databases for errors
89-
mariadb-check -u root -p<PASSWORD> -r -A # repair all databases
90-
mariadb-check -u root -p<PASSWORD> -a -A # analyze all databases
91-
mariadb-check -u root -p<PASSWORD> -o -A # optimize all databases
86+
mariadb-check -c -A # check all databases for errors
87+
mariadb-check -r -A # repair all databases
88+
mariadb-check -a -A # analyze all databases
89+
mariadb-check -o -A # optimize all databases
9290
```
9391
9492
After running the above commands, you may need to run the upgrade command again.
@@ -98,7 +96,7 @@ app_setup_block: |
9896
When this container initializes, if `MYSQL_ROOT_PASSWORD` is set an upgrade check will run. If an upgrade is required the log will indicate the need stop any services that are accessing databases in this container, and then run the command:
9997
10098
```shell
101-
mariadb-upgrade -u root -p<PASSWORD>
99+
mariadb-upgrade
102100
```
103101
# init diagram
104102
init_diagram: |

root/etc/s6-overlay/s6-rc.d/init-mariadb-initdb/run

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,10 @@ EONEWSQL
106106
#################################################################
107107
# No root password or too short a password, min of 4 characters #
108108
# No root password will be set, this is not a good thing #
109-
# You shoud set one after initialisation with the command #
110-
# mariadb-admin -u root -p<PASSWORD> #
109+
# You shoud set one after initialisation with the commands: #
110+
# mariadb #
111+
# ALTER USER 'root'@'%' IDENTIFIED BY 'MyN3wP4ssw0rd'; #
112+
# flush privileges; #
111113
#################################################################
112114

113115

0 commit comments

Comments
 (0)