diff --git a/.github/workflows/params-mysql.yml b/.github/workflows/params-mysql.yml index c2e9454e2..9a2dd94f2 100644 --- a/.github/workflows/params-mysql.yml +++ b/.github/workflows/params-mysql.yml @@ -10,16 +10,20 @@ name: params # Custom Variables # ------------------------------------------------------------------------------------------------- env: + # mysql-9.7 and percona-9.7 are left out until docker-compose.yml uses php-fpm 0.161 or newer: + # older images ship the mysql CLI without the caching_sha2_password plugin that 9.x requires. MATRIX: >- [ {"MYSQL_SERVER": "mysql-5.5"}, {"MYSQL_SERVER": "mysql-5.6"}, {"MYSQL_SERVER": "mysql-5.7"}, {"MYSQL_SERVER": "mysql-8.0"}, + {"MYSQL_SERVER": "mysql-8.4"}, {"MYSQL_SERVER": "percona-5.5"}, {"MYSQL_SERVER": "percona-5.6"}, {"MYSQL_SERVER": "percona-5.7"}, {"MYSQL_SERVER": "percona-8.0"}, + {"MYSQL_SERVER": "percona-8.4"}, {"MYSQL_SERVER": "mariadb-5.5"}, {"MYSQL_SERVER": "mariadb-10.0"}, {"MYSQL_SERVER": "mariadb-10.1"}, @@ -32,7 +36,10 @@ env: {"MYSQL_SERVER": "mariadb-10.8"}, {"MYSQL_SERVER": "mariadb-10.9"}, {"MYSQL_SERVER": "mariadb-10.10"}, - {"MYSQL_SERVER": "mariadb-11.4"} + {"MYSQL_SERVER": "mariadb-10.11"}, + {"MYSQL_SERVER": "mariadb-11.4"}, + {"MYSQL_SERVER": "mariadb-11.8"}, + {"MYSQL_SERVER": "mariadb-12.3"} ] diff --git a/.gitignore b/.gitignore index e461d8237..c7c64e4c7 100644 --- a/.gitignore +++ b/.gitignore @@ -69,6 +69,8 @@ /cfg/mysql-5.6/*.cnf /cfg/mysql-5.7/*.cnf /cfg/mysql-8.0/*.cnf +/cfg/mysql-8.4/*.cnf +/cfg/mysql-9.7/*.cnf /cfg/mariadb-5.5/*.cnf /cfg/mariadb-10.0/*.cnf /cfg/mariadb-10.1/*.cnf @@ -78,11 +80,19 @@ /cfg/mariadb-10.5/*.cnf /cfg/mariadb-10.6/*.cnf /cfg/mariadb-10.7/*.cnf +/cfg/mariadb-10.8/*.cnf +/cfg/mariadb-10.9/*.cnf +/cfg/mariadb-10.10/*.cnf +/cfg/mariadb-10.11/*.cnf /cfg/mariadb-11.4/*.cnf +/cfg/mariadb-11.8/*.cnf +/cfg/mariadb-12.3/*.cnf /cfg/percona-5.5/*.cnf /cfg/percona-5.6/*.cnf /cfg/percona-5.7/*.cnf /cfg/percona-8.0/*.cnf +/cfg/percona-8.4/*.cnf +/cfg/percona-9.7/*.cnf # Ignore custom PHP.ini configs /cfg/php-ini-5.6/*.ini diff --git a/CHANGELOG.md b/CHANGELOG.md index 09e6a82cf..4dd2778db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,15 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl ## Unreleased +### Added +- MySQL 8.4 and 9.7, MariaDB 10.11, 11.8 and 12.3, Percona 8.4 and 9.7 (`MYSQL_SERVER`). The 9.7 versions need PHP 7.4.4+ and, for the `mysql`/`mysqldump` CLI in the PHP container, php-fpm `0.161`+ + +### Changed +- Updated MySQL image version to `0.23` (rebuilt on the latest patch releases, e.g. MySQL 8.0.46) + +### Fixed +- `cfg/mysql-8.0/` and `cfg/percona-8.0/` performance examples used options removed in MySQL 8.0 (`query_cache_*`, `show_compatibility_56`), so the server did not start with them + ## Release v3.0.1 (2025-07-17) diff --git a/README.md b/README.md index 2d2d52934..c90afa5d1 100644 --- a/README.md +++ b/README.md @@ -610,9 +610,9 @@ Every single attachable container comes with many different versions. In order t 5.6 - + 8.4 10.3 - + 8.4 9.4 5.0 @@ -622,9 +622,9 @@ Every single attachable container comes with many different versions. In order t 7.0 - + 9.7 10.4 - + 9.7 9.5 6.0 @@ -707,7 +707,7 @@ Every single attachable container comes with many different versions. In order t 8.2 - + 10.11 latest @@ -719,7 +719,31 @@ Every single attachable container comes with many different versions. In order t 8.3 + 11.4 + + + + + + + + + + + + 11.8 + + + + + + + + + + + 12.3 diff --git a/cfg/mariadb-10.11/.keepme b/cfg/mariadb-10.11/.keepme new file mode 100644 index 000000000..e69de29bb diff --git a/cfg/mariadb-10.11/devilbox-custom.cnf-example b/cfg/mariadb-10.11/devilbox-custom.cnf-example new file mode 100644 index 000000000..6d2549fa4 --- /dev/null +++ b/cfg/mariadb-10.11/devilbox-custom.cnf-example @@ -0,0 +1,5 @@ +[mysqld] +;key_buffer_size=16M + +[mysqldump] +;quick diff --git a/cfg/mariadb-10.11/devilbox-performance.cnf-example b/cfg/mariadb-10.11/devilbox-performance.cnf-example new file mode 100644 index 000000000..419620433 --- /dev/null +++ b/cfg/mariadb-10.11/devilbox-performance.cnf-example @@ -0,0 +1,26 @@ +[mysqld] +sql_mode="NO_ENGINE_SUBSTITUTION" +innodb_file_per_table=OFF +open_files_limit=262144 +local_infile=ON +secure_file_priv="" +max_allowed_packet=1073741824 +max_connections=100000 +key_buffer_size=1024M +innodb_buffer_pool_size=1024M +query_cache_size=67108864 +query_cache_type=1 +query_cache_limit=4194304 +table_open_cache=4096 +innodb_buffer_pool_instances=24 +myisam_sort_buffer_size=1024M +innodb_sort_buffer_size=64M +sort_buffer_size=1024M +innodb_flush_log_at_trx_commit=0 +innodb_log_file_size=25M +interactive_timeout=3600 +max_connect_errors=1000000 +thread_cache_size=1024 + +[mysqld_safe] +open_files_limit=262144 diff --git a/cfg/mariadb-11.8/.keepme b/cfg/mariadb-11.8/.keepme new file mode 100644 index 000000000..e69de29bb diff --git a/cfg/mariadb-11.8/devilbox-custom.cnf-example b/cfg/mariadb-11.8/devilbox-custom.cnf-example new file mode 100644 index 000000000..6d2549fa4 --- /dev/null +++ b/cfg/mariadb-11.8/devilbox-custom.cnf-example @@ -0,0 +1,5 @@ +[mysqld] +;key_buffer_size=16M + +[mysqldump] +;quick diff --git a/cfg/mariadb-11.8/devilbox-performance.cnf-example b/cfg/mariadb-11.8/devilbox-performance.cnf-example new file mode 100644 index 000000000..419620433 --- /dev/null +++ b/cfg/mariadb-11.8/devilbox-performance.cnf-example @@ -0,0 +1,26 @@ +[mysqld] +sql_mode="NO_ENGINE_SUBSTITUTION" +innodb_file_per_table=OFF +open_files_limit=262144 +local_infile=ON +secure_file_priv="" +max_allowed_packet=1073741824 +max_connections=100000 +key_buffer_size=1024M +innodb_buffer_pool_size=1024M +query_cache_size=67108864 +query_cache_type=1 +query_cache_limit=4194304 +table_open_cache=4096 +innodb_buffer_pool_instances=24 +myisam_sort_buffer_size=1024M +innodb_sort_buffer_size=64M +sort_buffer_size=1024M +innodb_flush_log_at_trx_commit=0 +innodb_log_file_size=25M +interactive_timeout=3600 +max_connect_errors=1000000 +thread_cache_size=1024 + +[mysqld_safe] +open_files_limit=262144 diff --git a/cfg/mariadb-12.3/.keepme b/cfg/mariadb-12.3/.keepme new file mode 100644 index 000000000..e69de29bb diff --git a/cfg/mariadb-12.3/devilbox-custom.cnf-example b/cfg/mariadb-12.3/devilbox-custom.cnf-example new file mode 100644 index 000000000..6d2549fa4 --- /dev/null +++ b/cfg/mariadb-12.3/devilbox-custom.cnf-example @@ -0,0 +1,5 @@ +[mysqld] +;key_buffer_size=16M + +[mysqldump] +;quick diff --git a/cfg/mariadb-12.3/devilbox-performance.cnf-example b/cfg/mariadb-12.3/devilbox-performance.cnf-example new file mode 100644 index 000000000..419620433 --- /dev/null +++ b/cfg/mariadb-12.3/devilbox-performance.cnf-example @@ -0,0 +1,26 @@ +[mysqld] +sql_mode="NO_ENGINE_SUBSTITUTION" +innodb_file_per_table=OFF +open_files_limit=262144 +local_infile=ON +secure_file_priv="" +max_allowed_packet=1073741824 +max_connections=100000 +key_buffer_size=1024M +innodb_buffer_pool_size=1024M +query_cache_size=67108864 +query_cache_type=1 +query_cache_limit=4194304 +table_open_cache=4096 +innodb_buffer_pool_instances=24 +myisam_sort_buffer_size=1024M +innodb_sort_buffer_size=64M +sort_buffer_size=1024M +innodb_flush_log_at_trx_commit=0 +innodb_log_file_size=25M +interactive_timeout=3600 +max_connect_errors=1000000 +thread_cache_size=1024 + +[mysqld_safe] +open_files_limit=262144 diff --git a/cfg/mysql-8.0/devilbox-performance.cnf-example b/cfg/mysql-8.0/devilbox-performance.cnf-example index 9ebca34e2..945598c6c 100644 --- a/cfg/mysql-8.0/devilbox-performance.cnf-example +++ b/cfg/mysql-8.0/devilbox-performance.cnf-example @@ -1,7 +1,6 @@ [mysqld] sql_mode="NO_ENGINE_SUBSTITUTION" innodb_file_per_table=OFF -show_compatibility_56=ON open_files_limit=262144 local_infile=ON secure_file_priv="" @@ -9,16 +8,13 @@ max_allowed_packet=1073741824 max_connections=100000 key_buffer_size=1024M innodb_buffer_pool_size=1024M -query_cache_size=67108864 -query_cache_type=1 -query_cache_limit=4194304 table_open_cache=4096 innodb_buffer_pool_instances=24 myisam_sort_buffer_size=1024M -innodb_sort_buffer_size=1024M +innodb_sort_buffer_size=64M sort_buffer_size=1024M innodb_flush_log_at_trx_commit=0 -innodb_log_file_size=25M +innodb_redo_log_capacity=52428800 interactive_timeout=3600 max_connect_errors=1000000 thread_cache_size=1024 diff --git a/cfg/mysql-8.4/.keepme b/cfg/mysql-8.4/.keepme new file mode 100644 index 000000000..e69de29bb diff --git a/cfg/mysql-8.4/devilbox-custom.cnf-example b/cfg/mysql-8.4/devilbox-custom.cnf-example new file mode 100644 index 000000000..6d2549fa4 --- /dev/null +++ b/cfg/mysql-8.4/devilbox-custom.cnf-example @@ -0,0 +1,5 @@ +[mysqld] +;key_buffer_size=16M + +[mysqldump] +;quick diff --git a/cfg/mysql-8.4/devilbox-performance.cnf-example b/cfg/mysql-8.4/devilbox-performance.cnf-example new file mode 100644 index 000000000..945598c6c --- /dev/null +++ b/cfg/mysql-8.4/devilbox-performance.cnf-example @@ -0,0 +1,23 @@ +[mysqld] +sql_mode="NO_ENGINE_SUBSTITUTION" +innodb_file_per_table=OFF +open_files_limit=262144 +local_infile=ON +secure_file_priv="" +max_allowed_packet=1073741824 +max_connections=100000 +key_buffer_size=1024M +innodb_buffer_pool_size=1024M +table_open_cache=4096 +innodb_buffer_pool_instances=24 +myisam_sort_buffer_size=1024M +innodb_sort_buffer_size=64M +sort_buffer_size=1024M +innodb_flush_log_at_trx_commit=0 +innodb_redo_log_capacity=52428800 +interactive_timeout=3600 +max_connect_errors=1000000 +thread_cache_size=1024 + +[mysqld_safe] +open_files_limit=262144 diff --git a/cfg/mysql-9.7/.keepme b/cfg/mysql-9.7/.keepme new file mode 100644 index 000000000..e69de29bb diff --git a/cfg/mysql-9.7/devilbox-custom.cnf-example b/cfg/mysql-9.7/devilbox-custom.cnf-example new file mode 100644 index 000000000..6d2549fa4 --- /dev/null +++ b/cfg/mysql-9.7/devilbox-custom.cnf-example @@ -0,0 +1,5 @@ +[mysqld] +;key_buffer_size=16M + +[mysqldump] +;quick diff --git a/cfg/mysql-9.7/devilbox-performance.cnf-example b/cfg/mysql-9.7/devilbox-performance.cnf-example new file mode 100644 index 000000000..945598c6c --- /dev/null +++ b/cfg/mysql-9.7/devilbox-performance.cnf-example @@ -0,0 +1,23 @@ +[mysqld] +sql_mode="NO_ENGINE_SUBSTITUTION" +innodb_file_per_table=OFF +open_files_limit=262144 +local_infile=ON +secure_file_priv="" +max_allowed_packet=1073741824 +max_connections=100000 +key_buffer_size=1024M +innodb_buffer_pool_size=1024M +table_open_cache=4096 +innodb_buffer_pool_instances=24 +myisam_sort_buffer_size=1024M +innodb_sort_buffer_size=64M +sort_buffer_size=1024M +innodb_flush_log_at_trx_commit=0 +innodb_redo_log_capacity=52428800 +interactive_timeout=3600 +max_connect_errors=1000000 +thread_cache_size=1024 + +[mysqld_safe] +open_files_limit=262144 diff --git a/cfg/percona-8.0/devilbox-performance.cnf-example b/cfg/percona-8.0/devilbox-performance.cnf-example index 9ebca34e2..945598c6c 100644 --- a/cfg/percona-8.0/devilbox-performance.cnf-example +++ b/cfg/percona-8.0/devilbox-performance.cnf-example @@ -1,7 +1,6 @@ [mysqld] sql_mode="NO_ENGINE_SUBSTITUTION" innodb_file_per_table=OFF -show_compatibility_56=ON open_files_limit=262144 local_infile=ON secure_file_priv="" @@ -9,16 +8,13 @@ max_allowed_packet=1073741824 max_connections=100000 key_buffer_size=1024M innodb_buffer_pool_size=1024M -query_cache_size=67108864 -query_cache_type=1 -query_cache_limit=4194304 table_open_cache=4096 innodb_buffer_pool_instances=24 myisam_sort_buffer_size=1024M -innodb_sort_buffer_size=1024M +innodb_sort_buffer_size=64M sort_buffer_size=1024M innodb_flush_log_at_trx_commit=0 -innodb_log_file_size=25M +innodb_redo_log_capacity=52428800 interactive_timeout=3600 max_connect_errors=1000000 thread_cache_size=1024 diff --git a/cfg/percona-8.4/.keepme b/cfg/percona-8.4/.keepme new file mode 100644 index 000000000..e69de29bb diff --git a/cfg/percona-8.4/devilbox-custom.cnf-example b/cfg/percona-8.4/devilbox-custom.cnf-example new file mode 100644 index 000000000..6d2549fa4 --- /dev/null +++ b/cfg/percona-8.4/devilbox-custom.cnf-example @@ -0,0 +1,5 @@ +[mysqld] +;key_buffer_size=16M + +[mysqldump] +;quick diff --git a/cfg/percona-8.4/devilbox-performance.cnf-example b/cfg/percona-8.4/devilbox-performance.cnf-example new file mode 100644 index 000000000..945598c6c --- /dev/null +++ b/cfg/percona-8.4/devilbox-performance.cnf-example @@ -0,0 +1,23 @@ +[mysqld] +sql_mode="NO_ENGINE_SUBSTITUTION" +innodb_file_per_table=OFF +open_files_limit=262144 +local_infile=ON +secure_file_priv="" +max_allowed_packet=1073741824 +max_connections=100000 +key_buffer_size=1024M +innodb_buffer_pool_size=1024M +table_open_cache=4096 +innodb_buffer_pool_instances=24 +myisam_sort_buffer_size=1024M +innodb_sort_buffer_size=64M +sort_buffer_size=1024M +innodb_flush_log_at_trx_commit=0 +innodb_redo_log_capacity=52428800 +interactive_timeout=3600 +max_connect_errors=1000000 +thread_cache_size=1024 + +[mysqld_safe] +open_files_limit=262144 diff --git a/cfg/percona-9.7/.keepme b/cfg/percona-9.7/.keepme new file mode 100644 index 000000000..e69de29bb diff --git a/cfg/percona-9.7/devilbox-custom.cnf-example b/cfg/percona-9.7/devilbox-custom.cnf-example new file mode 100644 index 000000000..6d2549fa4 --- /dev/null +++ b/cfg/percona-9.7/devilbox-custom.cnf-example @@ -0,0 +1,5 @@ +[mysqld] +;key_buffer_size=16M + +[mysqldump] +;quick diff --git a/cfg/percona-9.7/devilbox-performance.cnf-example b/cfg/percona-9.7/devilbox-performance.cnf-example new file mode 100644 index 000000000..945598c6c --- /dev/null +++ b/cfg/percona-9.7/devilbox-performance.cnf-example @@ -0,0 +1,23 @@ +[mysqld] +sql_mode="NO_ENGINE_SUBSTITUTION" +innodb_file_per_table=OFF +open_files_limit=262144 +local_infile=ON +secure_file_priv="" +max_allowed_packet=1073741824 +max_connections=100000 +key_buffer_size=1024M +innodb_buffer_pool_size=1024M +table_open_cache=4096 +innodb_buffer_pool_instances=24 +myisam_sort_buffer_size=1024M +innodb_sort_buffer_size=64M +sort_buffer_size=1024M +innodb_flush_log_at_trx_commit=0 +innodb_redo_log_capacity=52428800 +interactive_timeout=3600 +max_connect_errors=1000000 +thread_cache_size=1024 + +[mysqld_safe] +open_files_limit=262144 diff --git a/docker-compose.yml b/docker-compose.yml index 73be1445e..cbad26d93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -356,7 +356,7 @@ services: # MySQL Database # ------------------------------------------------------------ mysql: - image: devilboxcommunity/mysql:${MYSQL_SERVER}-0.22 + image: devilboxcommunity/mysql:${MYSQL_SERVER}-0.23 hostname: mysql environment: @@ -530,6 +530,8 @@ volumes: devilbox-mysql-5.6: devilbox-mysql-5.7: devilbox-mysql-8.0: + devilbox-mysql-8.4: + devilbox-mysql-9.7: devilbox-mariadb-5.5: devilbox-mariadb-10.0: devilbox-mariadb-10.1: @@ -542,11 +544,16 @@ volumes: devilbox-mariadb-10.8: devilbox-mariadb-10.9: devilbox-mariadb-10.10: + devilbox-mariadb-10.11: devilbox-mariadb-11.4: + devilbox-mariadb-11.8: + devilbox-mariadb-12.3: devilbox-percona-5.5: devilbox-percona-5.6: devilbox-percona-5.7: devilbox-percona-8.0: + devilbox-percona-8.4: + devilbox-percona-9.7: # ------------------------------------------------------------ # Postgres diff --git a/docs/src/content/docs/configuration-files/my-cnf.md b/docs/src/content/docs/configuration-files/my-cnf.md index e9aa12787..3267c1d42 100644 --- a/docs/src/content/docs/configuration-files/my-cnf.md +++ b/docs/src/content/docs/configuration-files/my-cnf.md @@ -31,15 +31,20 @@ targets in this repository include: - `cfg/mysql-5.7/` - `cfg/mysql-8.0/` -- `cfg/mysql-8.4/` when present in your checkout +- `cfg/mysql-8.4/` +- `cfg/mysql-9.7/` - `cfg/percona-5.7/` - `cfg/percona-8.0/` +- `cfg/percona-8.4/` +- `cfg/percona-9.7/` - `cfg/mariadb-10.4/` through newer MariaDB 10.x directories present in `cfg/` - `cfg/mariadb-11.4/` +- `cfg/mariadb-11.8/` +- `cfg/mariadb-12.3/` Older directories may still exist for compatibility in some checkouts, but this -page focuses on the MySQL 5.7, MySQL 8.x, Percona 5.7/8.0 and MariaDB 10.4+ -or 11.x generation used by current `.env` examples. +page focuses on the MySQL 5.7/8.x/9.x, Percona 5.7/8.x/9.x and MariaDB 10.4+, +11.x or 12.x generation used by current `.env` examples. ## Override mechanism diff --git a/docs/src/content/docs/getting-started/change-container-versions.md b/docs/src/content/docs/getting-started/change-container-versions.md index 389e0acac..3dcbcb343 100644 --- a/docs/src/content/docs/getting-started/change-container-versions.md +++ b/docs/src/content/docs/getting-started/change-container-versions.md @@ -143,9 +143,12 @@ The MySQL-compatible service uses `MYSQL_SERVER`. Current values from `env-examp | Family | Values | | --- | --- | -| MySQL | `mysql-5.5`, `mysql-5.6`, `mysql-5.7`, `mysql-8.0` | -| Percona | `percona-5.5`, `percona-5.6`, `percona-5.7`, `percona-8.0` | -| MariaDB | `mariadb-5.5`, `mariadb-10.0`, `mariadb-10.1`, `mariadb-10.2`, `mariadb-10.3`, `mariadb-10.4`, `mariadb-10.5`, `mariadb-10.6`, `mariadb-10.7`, `mariadb-10.8`, `mariadb-10.9`, `mariadb-10.10`, `mariadb-11.4` | +| MySQL | `mysql-5.5`, `mysql-5.6`, `mysql-5.7`, `mysql-8.0`, `mysql-8.4`, `mysql-9.7` | +| Percona | `percona-5.5`, `percona-5.6`, `percona-5.7`, `percona-8.0`, `percona-8.4`, `percona-9.7` | +| MariaDB | `mariadb-5.5`, `mariadb-10.0`, `mariadb-10.1`, `mariadb-10.2`, `mariadb-10.3`, `mariadb-10.4`, `mariadb-10.5`, `mariadb-10.6`, `mariadb-10.7`, `mariadb-10.8`, `mariadb-10.9`, `mariadb-10.10`, `mariadb-10.11`, `mariadb-11.4`, `mariadb-11.8`, `mariadb-12.3` | + +`mysql-9.7` and `percona-9.7` only support the `caching_sha2_password` login method. PHP needs 7.4.4 or newer, +and the `mysql`/`mysqldump` tools in the PHP container (also used by `dvl.sh`) need the php-fpm image `0.161` or newer. Default: diff --git a/env-example b/env-example index 52fc191c0..5fb87414f 100644 --- a/env-example +++ b/env-example @@ -333,10 +333,14 @@ HTTPD_SERVER=nginx-stable #MYSQL_SERVER=mysql-5.6 #MYSQL_SERVER=mysql-5.7 #MYSQL_SERVER=mysql-8.0 +#MYSQL_SERVER=mysql-8.4 +#MYSQL_SERVER=mysql-9.7 #MYSQL_SERVER=percona-5.5 #MYSQL_SERVER=percona-5.6 #MYSQL_SERVER=percona-5.7 #MYSQL_SERVER=percona-8.0 +#MYSQL_SERVER=percona-8.4 +#MYSQL_SERVER=percona-9.7 #MYSQL_SERVER=mariadb-5.5 #MYSQL_SERVER=mariadb-10.0 #MYSQL_SERVER=mariadb-10.1 @@ -349,7 +353,10 @@ MYSQL_SERVER=mariadb-10.4 #MYSQL_SERVER=mariadb-10.8 #MYSQL_SERVER=mariadb-10.9 #MYSQL_SERVER=mariadb-10.10 +#MYSQL_SERVER=mariadb-10.11 #MYSQL_SERVER=mariadb-11.4 +#MYSQL_SERVER=mariadb-11.8 +#MYSQL_SERVER=mariadb-12.3 ###