From b6512388d7deb7675e45644d8808203445931db8 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 4 Dec 2022 10:56:07 +0100 Subject: [PATCH] Added recent MariaDB, Redis and PGSQL versions --- .github/workflows/params-mysql.yml | 4 +++- .github/workflows/params-pgsql.yml | 2 ++ .github/workflows/params-redis.yml | 2 ++ CHANGELOG.md | 4 ++++ README.md | 14 +++++++------- docker-compose.yml | 4 ++++ docs/configuration-files/env-file.rst | 6 ++++++ docs/getting-started/change-container-versions.rst | 6 ++++++ env-example | 6 ++++++ 9 files changed, 40 insertions(+), 8 deletions(-) diff --git a/.github/workflows/params-mysql.yml b/.github/workflows/params-mysql.yml index c255618d..63cf6692 100644 --- a/.github/workflows/params-mysql.yml +++ b/.github/workflows/params-mysql.yml @@ -29,7 +29,9 @@ env: {"MYSQL_SERVER": "mariadb-10.5"}, {"MYSQL_SERVER": "mariadb-10.6"}, {"MYSQL_SERVER": "mariadb-10.7"}, - {"MYSQL_SERVER": "mariadb-10.8"} + {"MYSQL_SERVER": "mariadb-10.8"}, + {"MYSQL_SERVER": "mariadb-10.9"}, + {"MYSQL_SERVER": "mariadb-10.10"} ] diff --git a/.github/workflows/params-pgsql.yml b/.github/workflows/params-pgsql.yml index 1d9a8630..3c0be75a 100644 --- a/.github/workflows/params-pgsql.yml +++ b/.github/workflows/params-pgsql.yml @@ -34,6 +34,8 @@ env: {"PGSQL_SERVER": "PgSQL 13-alpine"}, {"PGSQL_SERVER": "PgSQL 14"}, {"PGSQL_SERVER": "PgSQL 14-alpine"}, + {"PGSQL_SERVER": "PgSQL 15"}, + {"PGSQL_SERVER": "PgSQL 15-alpine"}, {"PGSQL_SERVER": "PgSQL latest"}, {"PGSQL_SERVER": "PgSQL alpine"} ] diff --git a/.github/workflows/params-redis.yml b/.github/workflows/params-redis.yml index 212376bb..cbba1631 100644 --- a/.github/workflows/params-redis.yml +++ b/.github/workflows/params-redis.yml @@ -25,6 +25,8 @@ env: {"REDIS_SERVER": "Redis 6.0-alpine"}, {"REDIS_SERVER": "Redis 6.2"}, {"REDIS_SERVER": "Redis 6.2-alpine"}, + {"REDIS_SERVER": "Redis 7.0"}, + {"REDIS_SERVER": "Redis 7.0-alpine"}, {"REDIS_SERVER": "Redis latest"}, {"REDIS_SERVER": "Redis alpine"} ] diff --git a/CHANGELOG.md b/CHANGELOG.md index dc010c91..2e01ec54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl ### Fixed - Fixed correct permission for `/opt/nvm` in PHP container [#499](https://github.com/cytopia/devilbox/issues/499), [#PHP-FPM 0.141](https://github.com/devilbox/docker-php-fpm/releases/tag/0.141) - Fixed Debian Jessie repository trust beyond EOL [#PHP-FPM 0.140](https://github.com/devilbox/docker-php-fpm/releases/tag/0.140) +- Fixed phpPgAdmin to work with PostgreSQL 15 ### Added - Added env var to Bind to specify overall memory consumption via `MAX_CACHE_SIZE` [#BIND 0.30](https://github.com/cytopia/docker-bind/releases/tag/0.30) @@ -18,6 +19,9 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl - Added PHP extension: `lzf` [#PHP-FPM 0.144](https://github.com/devilbox/docker-php-fpm/releases/tag/0.144) - Added PHP extension: `zstd` [#PHP-FPM 0.144](https://github.com/devilbox/docker-php-fpm/releases/tag/0.144) - Added serializer to Redis extension: `lz4`, `lzf` and` zstd` [#PHP-FPM 0.144](https://github.com/devilbox/docker-php-fpm/releases/tag/0.144) +- Added MariaDB 10.9 and 10.11 [#MYSQL 0.19](https://github.com/devilbox/docker-mysql/pull/24) +- Added PGSQL 15 +- Added Redis 7.0 ### Changed - Switched to `phalcon` 5.x extension for PHP 8.0 and PHP 8.1 [#913](https://github.com/cytopia/devilbox/issues/913), [#PHP-FPM 0.143](https://github.com/devilbox/docker-php-fpm/releases/tag/0.143) diff --git a/README.md b/README.md index 406540a7..3d360d94 100644 --- a/README.md +++ b/README.md @@ -323,7 +323,7 @@ Every single attachable container comes with many different versions. In order t 10.6 10 - latest + 7.0 4.4 @@ -335,7 +335,7 @@ Every single attachable container comes with many different versions. In order t 10.7 11 - + latest 5.0 @@ -344,7 +344,7 @@ Every single attachable container comes with many different versions. In order t 7.4 - + 10.8 12 @@ -356,9 +356,9 @@ Every single attachable container comes with many different versions. In order t 8.0 + 10.9 - - 13 + ... @@ -368,9 +368,9 @@ Every single attachable container comes with many different versions. In order t 8.1 + 10.10 - - 14 + 15 diff --git a/docker-compose.yml b/docker-compose.yml index 16e531bf..4c639296 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -513,6 +513,8 @@ volumes: devilbox-mariadb-10.6: devilbox-mariadb-10.7: devilbox-mariadb-10.8: + devilbox-mariadb-10.9: + devilbox-mariadb-10.10: devilbox-percona-5.5: devilbox-percona-5.6: devilbox-percona-5.7: @@ -543,6 +545,8 @@ volumes: devilbox-pgsql-13-alpine: devilbox-pgsql-14: devilbox-pgsql-14-alpine: + devilbox-pgsql-15: + devilbox-pgsql-15-alpine: devilbox-pgsql-latest: devilbox-pgsql-alpine: diff --git a/docs/configuration-files/env-file.rst b/docs/configuration-files/env-file.rst index b35f98b5..30b2f70c 100644 --- a/docs/configuration-files/env-file.rst +++ b/docs/configuration-files/env-file.rst @@ -659,6 +659,8 @@ All values are already available in the ``.env`` file and just need to be commen MYSQL_SERVER=mariadb-10.6 #MYSQL_SERVER=mariadb-10.7 #MYSQL_SERVER=mariadb-10.8 + #MYSQL_SERVER=mariadb-10.9 + #MYSQL_SERVER=mariadb-10.10 .. _env_pgsql_server: @@ -704,6 +706,8 @@ All values are already available in the ``.env`` file and just need to be commen #PGSQL_SERVER=13-alpine #PGSQL_SERVER=14 PGSQL_SERVER=14-alpine + #PGSQL_SERVER=15 + #PGSQL_SERVER=15-alpine #PGSQL_SERVER=latest #PGSQL_SERVER=alpine @@ -747,6 +751,8 @@ All values are already available in the ``.env`` file and just need to be commen #REDIS_SERVER=6.0-alpine #REDIS_SERVER=6.2 REDIS_SERVER=6.2-alpine + #REDIS_SERVER=7.0 + #REDIS_SERVER=7.0-alpine #REDIS_SERVER=latest #REDIS_SERVER=alpine diff --git a/docs/getting-started/change-container-versions.rst b/docs/getting-started/change-container-versions.rst index 3ed27f09..3cc9e9ee 100644 --- a/docs/getting-started/change-container-versions.rst +++ b/docs/getting-started/change-container-versions.rst @@ -92,6 +92,8 @@ It will look something like this: #PHP_SERVER=7.3 #PHP_SERVER=7.4 #PHP_SERVER=8.0 + #PHP_SERVER=8.1 + #PHP_SERVER=8.2 As you can see, all available values are already there, but commented. Only one is uncommented. In this example it is ``7.1``, which is the PHP version that will be started, once the Devilbox @@ -117,6 +119,8 @@ In order to enable PHP 5.5, you would change the ``.env`` file like this: #PHP_SERVER=7.3 #PHP_SERVER=7.4 #PHP_SERVER=8.0 + #PHP_SERVER=8.1 + #PHP_SERVER=8.2 Start the Devilbox ^^^^^^^^^^^^^^^^^^ @@ -237,6 +241,8 @@ Consider this ``.env`` file: #PHP_SERVER=7.3 #PHP_SERVER=7.4 #PHP_SERVER=8.0 + #PHP_SERVER=8.1 + #PHP_SERVER=8.2 Both, PHP 5.5 and PHP 7.0 are uncommented, however, when you start the Devilbox, it will use PHP 7.0 as this value overwrites any previous ones. diff --git a/env-example b/env-example index 7a89d06f..5d4f18f6 100644 --- a/env-example +++ b/env-example @@ -308,6 +308,8 @@ HTTPD_SERVER=nginx-stable MYSQL_SERVER=mariadb-10.6 #MYSQL_SERVER=mariadb-10.7 #MYSQL_SERVER=mariadb-10.8 +#MYSQL_SERVER=mariadb-10.9 +#MYSQL_SERVER=mariadb-10.10 ### @@ -346,6 +348,8 @@ MYSQL_SERVER=mariadb-10.6 #PGSQL_SERVER=13-alpine #PGSQL_SERVER=14 PGSQL_SERVER=14-alpine +#PGSQL_SERVER=15 +#PGSQL_SERVER=15-alpine #PGSQL_SERVER=latest #PGSQL_SERVER=alpine @@ -375,6 +379,8 @@ PGSQL_SERVER=14-alpine #REDIS_SERVER=6.0-alpine #REDIS_SERVER=6.2 REDIS_SERVER=6.2-alpine +#REDIS_SERVER=7.0 +#REDIS_SERVER=7.0-alpine #REDIS_SERVER=latest #REDIS_SERVER=alpine