mirror of
https://github.com/cytopia/devilbox.git
synced 2024-12-20 21:33:07 +00:00
Add MariaDB 10.5
This commit is contained in:
parent
e5f93062ca
commit
3e9bcec90b
@ -20,6 +20,7 @@ major versions.
|
|||||||
- Added Redis images: 6.0
|
- Added Redis images: 6.0
|
||||||
- Added Memcache images: 1.6
|
- Added Memcache images: 1.6
|
||||||
- Added MongoDB images: 4.4
|
- Added MongoDB images: 4.4
|
||||||
|
- Added MySQL images: MariaDB 10.5
|
||||||
|
|
||||||
#### Changed
|
#### Changed
|
||||||
- [#736](https://github.com/cytopia/devilbox/issues/736) Composer is updated to v2 (`/usr/local/bin/composer`)
|
- [#736](https://github.com/cytopia/devilbox/issues/736) Composer is updated to v2 (`/usr/local/bin/composer`)
|
||||||
@ -29,7 +30,7 @@ major versions.
|
|||||||
- Updated Adminer from 4.7.5 to 4.7.7
|
- Updated Adminer from 4.7.5 to 4.7.7
|
||||||
- Composer is available as v1 and v2 (`/usr/local/bin/composer-1` and `/usr/local/bin/composer-2`)
|
- Composer is available as v1 and v2 (`/usr/local/bin/composer-1` and `/usr/local/bin/composer-2`)
|
||||||
- New default PHP version: 7.4
|
- New default PHP version: 7.4
|
||||||
- New default MySQL version: MariaDB 10.4
|
- New default MySQL version: MariaDB 10.5
|
||||||
- New default Postgres version: 12.4
|
- New default Postgres version: 12.4
|
||||||
- New default Redis version: 6.0
|
- New default Redis version: 6.0
|
||||||
- New default Memcached version 1.6
|
- New default Memcached version 1.6
|
||||||
|
@ -302,7 +302,7 @@ Every single attachable container comes with many different versions. In order t
|
|||||||
<td></td>
|
<td></td>
|
||||||
<td><a target="_blank" title="PHP 7.1" href="https://github.com/devilbox/docker-php-fpm">7.1</a></td>
|
<td><a target="_blank" title="PHP 7.1" href="https://github.com/devilbox/docker-php-fpm">7.1</a></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td><a target="_blank" title="MariaDB 10.5" href="https://github.com/devilbox/docker-mysql">10.5</a></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td><a target="_blank" title="PgSQL 9.6" href="https://github.com/docker-library/postgres">9.6</a></td>
|
<td><a target="_blank" title="PgSQL 9.6" href="https://github.com/docker-library/postgres">9.6</a></td>
|
||||||
<td><a target="_blank" title="Redis latest" href="https://github.com/docker-library/redis">latest</a></td>
|
<td><a target="_blank" title="Redis latest" href="https://github.com/docker-library/redis">latest</a></td>
|
||||||
|
0
cfg/mariadb-10.5/.keepme
Normal file
0
cfg/mariadb-10.5/.keepme
Normal file
5
cfg/mariadb-10.5/devilbox-custom.cnf-example
Normal file
5
cfg/mariadb-10.5/devilbox-custom.cnf-example
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
[mysqld]
|
||||||
|
;key_buffer_size=16M
|
||||||
|
|
||||||
|
[mysqldump]
|
||||||
|
;quick
|
@ -317,7 +317,7 @@ services:
|
|||||||
# MySQL Database
|
# MySQL Database
|
||||||
# ------------------------------------------------------------
|
# ------------------------------------------------------------
|
||||||
mysql:
|
mysql:
|
||||||
image: devilbox/mysql:${MYSQL_SERVER}-0.5
|
image: devilbox/mysql:${MYSQL_SERVER}-0.6
|
||||||
hostname: mysql
|
hostname: mysql
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
@ -506,6 +506,7 @@ volumes:
|
|||||||
devilbox-mariadb-10.2:
|
devilbox-mariadb-10.2:
|
||||||
devilbox-mariadb-10.3:
|
devilbox-mariadb-10.3:
|
||||||
devilbox-mariadb-10.4:
|
devilbox-mariadb-10.4:
|
||||||
|
devilbox-mariadb-10.5:
|
||||||
devilbox-percona-5.5:
|
devilbox-percona-5.5:
|
||||||
devilbox-percona-5.6:
|
devilbox-percona-5.6:
|
||||||
devilbox-percona-5.7:
|
devilbox-percona-5.7:
|
||||||
|
@ -629,7 +629,7 @@ This variable choses your desired MySQL server version to be started.
|
|||||||
+-------------------------+------------------------------------------------------------------------------------------------+------------------+
|
+-------------------------+------------------------------------------------------------------------------------------------+------------------+
|
||||||
| Name | Allowed values | Default value |
|
| Name | Allowed values | Default value |
|
||||||
+=========================+================================================================================================+==================+
|
+=========================+================================================================================================+==================+
|
||||||
| ``MYSQL_SERVER`` | ``mysql-5.5`` |br| ``mysql-5.6`` |br| ``mariadb-10.2`` |br| ``percona-5.7`` |br| and many more | ``mariadb-10.4`` |
|
| ``MYSQL_SERVER`` | ``mysql-5.5`` |br| ``mysql-5.6`` |br| ``mariadb-10.2`` |br| ``percona-5.7`` |br| and many more | ``mariadb-10.5`` |
|
||||||
+-------------------------+------------------------------------------------------------------------------------------------+------------------+
|
+-------------------------+------------------------------------------------------------------------------------------------+------------------+
|
||||||
|
|
||||||
All values are already available in the ``.env`` file and just need to be commented or uncommented. If multiple values are uncommented, the last uncommented variable one takes precedences:
|
All values are already available in the ``.env`` file and just need to be commented or uncommented. If multiple values are uncommented, the last uncommented variable one takes precedences:
|
||||||
@ -649,7 +649,8 @@ All values are already available in the ``.env`` file and just need to be commen
|
|||||||
#MYSQL_SERVER=mariadb-10.1
|
#MYSQL_SERVER=mariadb-10.1
|
||||||
#MYSQL_SERVER=mariadb-10.2
|
#MYSQL_SERVER=mariadb-10.2
|
||||||
#MYSQL_SERVER=mariadb-10.3
|
#MYSQL_SERVER=mariadb-10.3
|
||||||
MYSQL_SERVER=mariadb-10.4
|
#MYSQL_SERVER=mariadb-10.4
|
||||||
|
MYSQL_SERVER=mariadb-10.5
|
||||||
#MYSQL_SERVER=percona-5.5
|
#MYSQL_SERVER=percona-5.5
|
||||||
#MYSQL_SERVER=percona-5.6
|
#MYSQL_SERVER=percona-5.6
|
||||||
#MYSQL_SERVER=percona-5.7
|
#MYSQL_SERVER=percona-5.7
|
||||||
|
@ -290,7 +290,8 @@ HTTPD_SERVER=nginx-stable
|
|||||||
#MYSQL_SERVER=mariadb-10.1
|
#MYSQL_SERVER=mariadb-10.1
|
||||||
#MYSQL_SERVER=mariadb-10.2
|
#MYSQL_SERVER=mariadb-10.2
|
||||||
#MYSQL_SERVER=mariadb-10.3
|
#MYSQL_SERVER=mariadb-10.3
|
||||||
MYSQL_SERVER=mariadb-10.4
|
#MYSQL_SERVER=mariadb-10.4
|
||||||
|
MYSQL_SERVER=mariadb-10.5
|
||||||
#MYSQL_SERVER=percona-5.5
|
#MYSQL_SERVER=percona-5.5
|
||||||
#MYSQL_SERVER=percona-5.6
|
#MYSQL_SERVER=percona-5.6
|
||||||
#MYSQL_SERVER=percona-5.7
|
#MYSQL_SERVER=percona-5.7
|
||||||
|
Loading…
Reference in New Issue
Block a user