Skip to content

Commit 55c6e96

Browse files
cytopiacytopia
committed
Add MariaDB 10.9 and 10.10
1 parent 61f41de commit 55c6e96

4 files changed

Lines changed: 73 additions & 25 deletions

File tree

‎.github/workflows/params.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929
},
3030
{
3131
"NAME": "mariadb",
32-
"VERSION": ["10.1", "10.2", "10.3", "10.4", "10.5", "10.6", "10.7", "10.8"],
32+
"VERSION": ["10.1", "10.2", "10.3", "10.4", "10.5", "10.6", "10.7", "10.8", "10.9", "10.10"],
3333
"ARCH": ["linux/amd64", "linux/arm64"]
3434
},
3535
{

‎Dockerfiles/mariadb-10.10‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# vi: ft=dockerfile
2+
FROM mariadb:10.10
3+
4+
RUN set -eux \
5+
&& mkdir -p /etc/mysql/docker-default.d/ \
6+
&& if [ -f /etc/my.cnf ]; then \
7+
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/my.cnf; \
8+
elif [ -f /etc/mysql/my.cnf ]; then \
9+
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
10+
else \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
12+
false; \
13+
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
17+
&& if [ ! -f "/docker-entrypoint.sh" ]; then \
18+
ln -s "/usr/local/bin/docker-entrypoint.sh" "/docker-entrypoint.sh"; \
19+
fi \
20+
&& chmod +x "/docker-entrypoint.sh"
21+
22+
ENTRYPOINT ["/docker-entrypoint.sh"]
23+
CMD ["mysqld"]

‎Dockerfiles/mariadb-10.9‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# vi: ft=dockerfile
2+
FROM mariadb:10.9
3+
4+
RUN set -eux \
5+
&& mkdir -p /etc/mysql/docker-default.d/ \
6+
&& if [ -f /etc/my.cnf ]; then \
7+
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/my.cnf; \
8+
elif [ -f /etc/mysql/my.cnf ]; then \
9+
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
10+
else \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
12+
false; \
13+
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
17+
&& if [ ! -f "/docker-entrypoint.sh" ]; then \
18+
ln -s "/usr/local/bin/docker-entrypoint.sh" "/docker-entrypoint.sh"; \
19+
fi \
20+
&& chmod +x "/docker-entrypoint.sh"
21+
22+
ENTRYPOINT ["/docker-entrypoint.sh"]
23+
CMD ["mysqld"]

‎README.md‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -97,42 +97,44 @@ For retagged information see below.
9797
* [DockerHub](https://hub.docker.com/_/mysql)
9898
* [GitHub](https://github.com/docker-library/mysql)
9999

100-
| Original Image and Tag | New Image and Tag | Available platforms |
101-
|------------------------|-------------------------------|---------------------|
102-
| `mysql:5.5` | `devilbox/mysql:mysql-5.5` | `amd64` |
103-
| `mysql:5.6` | `devilbox/mysql:mysql-5.6` | `amd64` |
104-
| `mysql:5.7` | `devilbox/mysql:mysql-5.7` | `amd64` |
105-
| `mysql:8.0` | `devilbox/mysql:mysql-8.0` | `amd64`, `arm64` |
100+
| Original Image and Tag | New Image and Tag | Available platforms |
101+
|------------------------|--------------------------------|---------------------|
102+
| `mysql:5.5` | `devilbox/mysql:mysql-5.5` | `amd64` |
103+
| `mysql:5.6` | `devilbox/mysql:mysql-5.6` | `amd64` |
104+
| `mysql:5.7` | `devilbox/mysql:mysql-5.7` | `amd64` |
105+
| `mysql:8.0` | `devilbox/mysql:mysql-8.0` | `amd64`, `arm64` |
106106

107107
#### MariaDB
108108

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

112-
| Original Image and Tag | New Image and Tag | Available platforms |
113-
|------------------------|-------------------------------|---------------------|
114-
| `mariadb:5.5` | `devilbox/mysql:mariadb-5.5` | `amd64` |
115-
| `mariadb:10.0` | `devilbox/mysql:mariadb-10.0` | `amd64` |
116-
| `mariadb:10.1` | `devilbox/mysql:mariadb-10.1` | `amd64`, `arm64` |
117-
| `mariadb:10.2` | `devilbox/mysql:mariadb-10.2` | `amd64`, `arm64` |
118-
| `mariadb:10.3` | `devilbox/mysql:mariadb-10.3` | `amd64`, `arm64` |
119-
| `mariadb:10.4` | `devilbox/mysql:mariadb-10.4` | `amd64`, `arm64` |
120-
| `mariadb:10.5` | `devilbox/mysql:mariadb-10.5` | `amd64`, `arm64` |
121-
| `mariadb:10.6` | `devilbox/mysql:mariadb-10.6` | `amd64`, `arm64` |
122-
| `mariadb:10.7` | `devilbox/mysql:mariadb-10.7` | `amd64`, `arm64` |
123-
| `mariadb:10.8` | `devilbox/mysql:mariadb-10.8` | `amd64`, `arm64` |
112+
| Original Image and Tag | New Image and Tag | Available platforms |
113+
|------------------------|--------------------------------|---------------------|
114+
| `mariadb:5.5` | `devilbox/mysql:mariadb-5.5` | `amd64` |
115+
| `mariadb:10.0` | `devilbox/mysql:mariadb-10.0` | `amd64` |
116+
| `mariadb:10.1` | `devilbox/mysql:mariadb-10.1` | `amd64`, `arm64` |
117+
| `mariadb:10.2` | `devilbox/mysql:mariadb-10.2` | `amd64`, `arm64` |
118+
| `mariadb:10.3` | `devilbox/mysql:mariadb-10.3` | `amd64`, `arm64` |
119+
| `mariadb:10.4` | `devilbox/mysql:mariadb-10.4` | `amd64`, `arm64` |
120+
| `mariadb:10.5` | `devilbox/mysql:mariadb-10.5` | `amd64`, `arm64` |
121+
| `mariadb:10.6` | `devilbox/mysql:mariadb-10.6` | `amd64`, `arm64` |
122+
| `mariadb:10.7` | `devilbox/mysql:mariadb-10.7` | `amd64`, `arm64` |
123+
| `mariadb:10.8` | `devilbox/mysql:mariadb-10.8` | `amd64`, `arm64` |
124+
| `mariadb:10.9` | `devilbox/mysql:mariadb-10.9` | `amd64`, `arm64` |
125+
| `mariadb:10.10` | `devilbox/mysql:mariadb-10.10` | `amd64`, `arm64` |
124126

125127
#### Percona
126128

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

130-
| Original Image and Tag | New Image and Tag | Available platforms |
131-
|------------------------|-------------------------------|---------------------|
132-
| `percona:5.5` | `devilbox/mysql:percona-5.5` | `amd64` |
133-
| `percona:5.6` | `devilbox/mysql:percona-5.6` | `amd64` |
134-
| `percona:5.7` | `devilbox/mysql:percona-5.7` | `amd64` |
135-
| `percona:8.0` | `devilbox/mysql:percona-8.0` | `amd64` |
132+
| Original Image and Tag | New Image and Tag | Available platforms |
133+
|------------------------|--------------------------------|---------------------|
134+
| `percona:5.5` | `devilbox/mysql:percona-5.5` | `amd64` |
135+
| `percona:5.6` | `devilbox/mysql:percona-5.6` | `amd64` |
136+
| `percona:5.7` | `devilbox/mysql:percona-5.7` | `amd64` |
137+
| `percona:8.0` | `devilbox/mysql:percona-8.0` | `amd64` |
136138

137139

138140
## License

0 commit comments

Comments
 (0)