diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..5e3d9ca
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+---
+github: [cytopia]
+patreon: devilbox
diff --git a/README.md b/README.md
index 8a1c3c4..1ef420e 100644
--- a/README.md
+++ b/README.md
@@ -1,86 +1,115 @@
# MySQL Docker images
-
+[![Tag](https://img.shields.io/github/tag/devilbox/docker-mysql.svg)](https://github.com/devilbox/docker-mysql/releases)
+[![](https://img.shields.io/badge/github-devilbox%2Fdocker--mysql-red.svg)](https://github.com/devilbox/docker-mysql "github.com/devilbox/docker-mysql")
[![lint](https://github.com/devilbox/docker-mysql/workflows/lint/badge.svg)](https://github.com/devilbox/docker-mysql/actions?query=workflow%3Alint)
[![build](https://github.com/devilbox/docker-mysql/workflows/build/badge.svg)](https://github.com/devilbox/docker-mysql/actions?query=workflow%3Abuild)
[![nightly](https://github.com/devilbox/docker-mysql/workflows/nightly/badge.svg)](https://github.com/devilbox/docker-mysql/actions?query=workflow%3Anightly)
+[![License](https://img.shields.io/badge/license-MIT-%233DA639.svg)](https://opensource.org/licenses/MIT)
-[![Tag](https://img.shields.io/github/tag/devilbox/docker-mysql.svg)](https://github.com/devilbox/docker-mysql/releases)
[![Gitter](https://badges.gitter.im/devilbox/Lobby.svg)](https://gitter.im/devilbox/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Discourse](https://img.shields.io/discourse/https/devilbox.discourse.group/status.svg?colorB=%234CB697)](https://devilbox.discourse.group)
-[![type](https://img.shields.io/badge/type-Docker-blue.svg)](https://hub.docker.com/r/devilbox/mysql)
-[![License](https://img.shields.io/badge/license-MIT-%233DA639.svg)](https://opensource.org/licenses/MIT)
**Available Architectures:** `amd64`, `arm64`
-The purpose of this project is to simply re-tag the official Docker images for
+[![](https://img.shields.io/docker/pulls/devilbox/mysql.svg)](https://hub.docker.com/r/devilbox/mysql)
+
+The purpose of this project is to streamline and re-tag the official Docker images for
[MySQL](https://hub.docker.com/_/mysql), [MariaDB](https://hub.docker.com/_/mariadb) and
[Percona](https://hub.docker.com/_/percona) in order to use them for the
**[Devilbox](https://github.com/cytopia/devilbox)** project.
-| Docker Hub | Upstream Project |
-|------------|------------------|
-| | |
+> ##### ๐ฑ GitHub: [devilbox/docker-mysql](https://github.com/devilbox/docker-mysql)
+| Current Project | Reference Implementation |
+|:----------------:|:------------------------:|
+| | |
+| Streamlined [MySQL](https://github.com/devilbox/docker-mysql) images | The [Devilbox](https://github.com/cytopia/devilbox) |
-## Documentation
-In case you seek help, go and visit the community pages.
-
+## ๐ Available Docker tags
+
+[![](https://img.shields.io/docker/pulls/devilbox/mysql.svg)](https://hub.docker.com/r/devilbox/mysql)
+[`mysql-5.5`][tag_mysql-5.5]
+[`mysql-5.6`][tag_mysql-5.6]
+[`mysql-5.7`][tag_mysql-5.7]
+[`mysql-8.0`][tag_mysql-8.0]
-## Additional features
+[`mariadb-5.5`][tag_mariadb-5.5]
+[`mariadb-10.0`][tag_mariadb-10.0]
+[`mariadb-10.1`][tag_mariadb-10.1]
+[`mariadb-10.2`][tag_mariadb-10.2]
+[`mariadb-10.3`][tag_mariadb-10.3]
+[`mariadb-10.4`][tag_mariadb-10.4]
+[`mariadb-10.5`][tag_mariadb-10.5]
+[`mariadb-10.6`][tag_mariadb-10.6]
+[`mariadb-10.7`][tag_mariadb-10.7]
+[`mariadb-10.8`][tag_mariadb-10.8]
+[`mariadb-10.9`][tag_mariadb-10.9]
+[`mariadb-10.10`][tag_mariadb-10.10]
+
+[`percona-5.5`][tag_percona-5.5]
+[`percona-5.6`][tag_percona-5.6]
+[`percona-5.7`][tag_percona-5.7]
+[`percona-8.0`][tag_percona-8.0]
+
+
+[tag_mysql-5.5]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mysql-5.5
+[tag_mysql-5.6]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mysql-5.6
+[tag_mysql-5.7]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mysql-5.7
+[tag_mysql-8.0]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mysql-8.0
+
+[tag_percona-5.5]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/percona-5.5
+[tag_percona-5.6]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/percona-5.6
+[tag_percona-5.7]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/percona-5.7
+[tag_percona-8.0]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/percona-8.0
+
+[tag_mariadb-5.5]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-5.5
+[tag_mariadb-10.0]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.0
+[tag_mariadb-10.1]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.1
+[tag_mariadb-10.2]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.2
+[tag_mariadb-10.3]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.3
+[tag_mariadb-10.4]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.4
+[tag_mariadb-10.5]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.5
+[tag_mariadb-10.6]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.6
+[tag_mariadb-10.7]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.7
+[tag_mariadb-10.8]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.8
+[tag_mariadb-10.9]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.9
+[tag_mariadb-10.10]: https://github.com/devilbox/docker-mysql/blob/master/Dockerfiles/mariadb-10.10
+
+```bash
+docker pull devilbox/mysql:
+```
+
+
+## โฐ Additional features
The provided images are purely based on their official counterparts, however they have also been
slightly customized/enhanced additions added:
* An additional \*.cnf config directory is provided: `/etc/mysql/docker-default.d/`. This is necessary as the default config directory already contains \*.cnf files and you might want to keep them and still be able to additionally provide custom files
-* MySQL 8.0 and Percona 8.0 by default use a new authentication mechanism which is not (yet) understood by PHP's mysqli module. For those two images, the old authentication type has been re-enabled, so you can still use it with your current PHP code.
+* MySQL 8.0 and Percona 8.0 by default use a new authentication mechanism which is not (yet) understood by PHP's `mysqli` extension. For those two images, the old authentication mechanism **[`mysql_native_password`](https://dev.mysql.com/doc/refman/8.0/en/native-pluggable-authentication.html)** has been re-enabled, so you can still use it with your current PHP code.
+
+
+## โ Environment Variables
+
+Same as official Docker images:
+
+* [MySQL](https://hub.docker.com/_/mysql)
+* [MariaDB](https://hub.docker.com/_/mariadb)
+* [Percona](https://hub.docker.com/_/percona)
-## Defaults
+## ๐ง Exposed Ports
-### Docker Image
+MySQL listening port `3306`
-| What | Value |
-|------------|-----------------------------|
-| ENTRYPOINT | `["/docker-entrypoint.sh"]` |
-| CMD | `["mysqld"]` |
-### Mountpoints
+## ๐ Volumes
+
+The mountpoints for configuration files have been streamlined for all images in this repository.
| Path | Description |
|--------------------------------|----------------------------------------|
@@ -88,9 +117,21 @@ slightly customized/enhanced additions added:
| `/etc/mysql/docker-default.d/` | Additional secondary config mountpoint |
-## Docker Tags
+## โข Build
+
+Build MySQL 5.5 Docker image locally
+```bash
+make build NAME=mysql VERSION=5.5
+```
+Build MariaDB 10.10 Docker image for `arm64` locally
+```bash
+make build NAME=mariadb VERSION=10.10 ARCH=linux/arm64
+```
+
+
+## ๐ Retagging of official images
-For retagged information see below.
+The below listed tables show how the official images have been retagged.
#### MySQL
@@ -137,7 +178,116 @@ For retagged information see below.
| `percona:8.0` | `devilbox/mysql:percona-8.0` | `amd64` |
-## License
+## ๐ค Sister Projects
+
+Show some love for the following sister projects.
+
+
+
+
+## ๐ซ Community
+
+In case you seek help, go and visit the community pages.
+
+
+
+
+## ๐ง Maintainer
+
+**[@cytopia](https://github.com/cytopia)**
+
+I try to keep with literally **over 100 projects** besides a full-time job.
+If my work is making your life easier, consider contributing. ๐ค
+
+* [GitHub Sponsorship](https://github.com/sponsors/cytopia)
+* [Patreon](https://www.patreon.com/devilbox)
+* [Open Collective](https://opencollective.com/devilbox)
+
+**Findme:**
+**๐ฑ** [cytopia](https://github.com/cytopia) / [devilbox](https://github.com/devilbox) |
+**๐** [cytopia](https://hub.docker.com/r/cytopia/) / [devilbox](https://hub.docker.com/r/devilbox/) |
+**๐ฆ** [everythingcli](https://twitter.com/everythingcli) / [devilbox](https://twitter.com/devilbox) |
+**๐** [everythingcli.org](http://www.everythingcli.org/)
+
+**Contrib:** PyPI: [cytopia](https://pypi.org/user/cytopia/) **ยท**
+Terraform: [cytopia](https://registry.terraform.io/namespaces/cytopia) **ยท**
+Ansible: [cytopia](https://galaxy.ansible.com/cytopia)
+
+
+## ๐ License
**[MIT License](LICENSE)**