-
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #24 from devilbox/release-0.19
Add MariaDB 10.9 and 10.10
- Loading branch information
Showing
4 changed files
with
73 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters