Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MariaDB 10.9 and 10.10 #24

Merged
merged 1 commit into from
Dec 4, 2022
Merged

Add MariaDB 10.9 and 10.10 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/params.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
},
{
"NAME": "mariadb",
"VERSION": ["10.1", "10.2", "10.3", "10.4", "10.5", "10.6", "10.7", "10.8"],
"VERSION": ["10.1", "10.2", "10.3", "10.4", "10.5", "10.6", "10.7", "10.8", "10.9", "10.10"],
"ARCH": ["linux/amd64", "linux/arm64"]
},
{
Expand Down
23 changes: 23 additions & 0 deletions Dockerfiles/mariadb-10.10
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# vi: ft=dockerfile
FROM mariadb:10.10

RUN set -eux \
&& mkdir -p /etc/mysql/docker-default.d/ \
&& if [ -f /etc/my.cnf ]; then \
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/my.cnf; \
elif [ -f /etc/mysql/my.cnf ]; then \
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
else \
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
false; \
fi \
&& if [ -f "/entrypoint.sh" ]; then \
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
fi \
&& if [ ! -f "/docker-entrypoint.sh" ]; then \
ln -s "/usr/local/bin/docker-entrypoint.sh" "/docker-entrypoint.sh"; \
fi \
&& chmod +x "/docker-entrypoint.sh"

ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["mysqld"]
23 changes: 23 additions & 0 deletions Dockerfiles/mariadb-10.9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# vi: ft=dockerfile
FROM mariadb:10.9

RUN set -eux \
&& mkdir -p /etc/mysql/docker-default.d/ \
&& if [ -f /etc/my.cnf ]; then \
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/my.cnf; \
elif [ -f /etc/mysql/my.cnf ]; then \
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
else \
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
false; \
fi \
&& if [ -f "/entrypoint.sh" ]; then \
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
fi \
&& if [ ! -f "/docker-entrypoint.sh" ]; then \
ln -s "/usr/local/bin/docker-entrypoint.sh" "/docker-entrypoint.sh"; \
fi \
&& chmod +x "/docker-entrypoint.sh"

ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["mysqld"]
50 changes: 26 additions & 24 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,42 +97,44 @@ For retagged information see below.
* [DockerHub](https://hub.docker.com/_/mysql)
* [GitHub](https://github.com/docker-library/mysql)

| Original Image and Tag | New Image and Tag | Available platforms |
|------------------------|-------------------------------|---------------------|
| `mysql:5.5` | `devilbox/mysql:mysql-5.5` | `amd64` |
| `mysql:5.6` | `devilbox/mysql:mysql-5.6` | `amd64` |
| `mysql:5.7` | `devilbox/mysql:mysql-5.7` | `amd64` |
| `mysql:8.0` | `devilbox/mysql:mysql-8.0` | `amd64`, `arm64` |
| Original Image and Tag | New Image and Tag | Available platforms |
|------------------------|--------------------------------|---------------------|
| `mysql:5.5` | `devilbox/mysql:mysql-5.5` | `amd64` |
| `mysql:5.6` | `devilbox/mysql:mysql-5.6` | `amd64` |
| `mysql:5.7` | `devilbox/mysql:mysql-5.7` | `amd64` |
| `mysql:8.0` | `devilbox/mysql:mysql-8.0` | `amd64`, `arm64` |

#### MariaDB

* [DockerHub](https://hub.docker.com/_/mariadb)
* [GitHub](https://github.com/docker-library/mariadb)

| Original Image and Tag | New Image and Tag | Available platforms |
|------------------------|-------------------------------|---------------------|
| `mariadb:5.5` | `devilbox/mysql:mariadb-5.5` | `amd64` |
| `mariadb:10.0` | `devilbox/mysql:mariadb-10.0` | `amd64` |
| `mariadb:10.1` | `devilbox/mysql:mariadb-10.1` | `amd64`, `arm64` |
| `mariadb:10.2` | `devilbox/mysql:mariadb-10.2` | `amd64`, `arm64` |
| `mariadb:10.3` | `devilbox/mysql:mariadb-10.3` | `amd64`, `arm64` |
| `mariadb:10.4` | `devilbox/mysql:mariadb-10.4` | `amd64`, `arm64` |
| `mariadb:10.5` | `devilbox/mysql:mariadb-10.5` | `amd64`, `arm64` |
| `mariadb:10.6` | `devilbox/mysql:mariadb-10.6` | `amd64`, `arm64` |
| `mariadb:10.7` | `devilbox/mysql:mariadb-10.7` | `amd64`, `arm64` |
| `mariadb:10.8` | `devilbox/mysql:mariadb-10.8` | `amd64`, `arm64` |
| Original Image and Tag | New Image and Tag | Available platforms |
|------------------------|--------------------------------|---------------------|
| `mariadb:5.5` | `devilbox/mysql:mariadb-5.5` | `amd64` |
| `mariadb:10.0` | `devilbox/mysql:mariadb-10.0` | `amd64` |
| `mariadb:10.1` | `devilbox/mysql:mariadb-10.1` | `amd64`, `arm64` |
| `mariadb:10.2` | `devilbox/mysql:mariadb-10.2` | `amd64`, `arm64` |
| `mariadb:10.3` | `devilbox/mysql:mariadb-10.3` | `amd64`, `arm64` |
| `mariadb:10.4` | `devilbox/mysql:mariadb-10.4` | `amd64`, `arm64` |
| `mariadb:10.5` | `devilbox/mysql:mariadb-10.5` | `amd64`, `arm64` |
| `mariadb:10.6` | `devilbox/mysql:mariadb-10.6` | `amd64`, `arm64` |
| `mariadb:10.7` | `devilbox/mysql:mariadb-10.7` | `amd64`, `arm64` |
| `mariadb:10.8` | `devilbox/mysql:mariadb-10.8` | `amd64`, `arm64` |
| `mariadb:10.9` | `devilbox/mysql:mariadb-10.9` | `amd64`, `arm64` |
| `mariadb:10.10` | `devilbox/mysql:mariadb-10.10` | `amd64`, `arm64` |

#### Percona

* [DockerHub](https://hub.docker.com/_/percona)
* [GitHub](https://github.com/docker-library/percona)

| Original Image and Tag | New Image and Tag | Available platforms |
|------------------------|-------------------------------|---------------------|
| `percona:5.5` | `devilbox/mysql:percona-5.5` | `amd64` |
| `percona:5.6` | `devilbox/mysql:percona-5.6` | `amd64` |
| `percona:5.7` | `devilbox/mysql:percona-5.7` | `amd64` |
| `percona:8.0` | `devilbox/mysql:percona-8.0` | `amd64` |
| Original Image and Tag | New Image and Tag | Available platforms |
|------------------------|--------------------------------|---------------------|
| `percona:5.5` | `devilbox/mysql:percona-5.5` | `amd64` |
| `percona:5.6` | `devilbox/mysql:percona-5.6` | `amd64` |
| `percona:5.7` | `devilbox/mysql:percona-5.7` | `amd64` |
| `percona:8.0` | `devilbox/mysql:percona-8.0` | `amd64` |


## License
Expand Down