From 8aa32358d7a40ad5639c5bc0b343f4843f289d08 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 27 Mar 2022 04:10:32 +0200 Subject: [PATCH] Changed default server versions to have arm64 support --- .github/workflows/test-versions.yml | 41 ++------- CHANGELOG.md | 9 ++ README.md | 20 ++--- docker-compose.yml | 41 +-------- docs/configuration-files/env-file.rst | 117 ++++++++++---------------- env-example | 115 +++++++++++-------------- 6 files changed, 121 insertions(+), 222 deletions(-) diff --git a/.github/workflows/test-versions.yml b/.github/workflows/test-versions.yml index 9bf7923c..0b18e42f 100644 --- a/.github/workflows/test-versions.yml +++ b/.github/workflows/test-versions.yml @@ -66,48 +66,14 @@ jobs: - "PGSQL_SERVER=9.6-alpine" - "PGSQL_SERVER=10.0" - "PGSQL_SERVER=10.0-alpine" - - "PGSQL_SERVER=10.1" - - "PGSQL_SERVER=10.1-alpine" - - "PGSQL_SERVER=10.2" - - "PGSQL_SERVER=10.2-alpine" - - "PGSQL_SERVER=10.3" - - "PGSQL_SERVER=10.3-alpine" - - "PGSQL_SERVER=10.4" - - "PGSQL_SERVER=10.4-alpine" - - "PGSQL_SERVER=10.5" - - "PGSQL_SERVER=10.5-alpine" - - "PGSQL_SERVER=10.6" - - "PGSQL_SERVER=10.6-alpine" - "PGSQL_SERVER=11.0" - "PGSQL_SERVER=11.0-alpine" - - "PGSQL_SERVER=11.1" - - "PGSQL_SERVER=11.1-alpine" - - "PGSQL_SERVER=11.2" - - "PGSQL_SERVER=11.2-alpine" - - "PGSQL_SERVER=11.3" - - "PGSQL_SERVER=11.3-alpine" - - "PGSQL_SERVER=11.4" - - "PGSQL_SERVER=11.4-alpine" - - "PGSQL_SERVER=11.5" - - "PGSQL_SERVER=11.5-alpine" - - "PGSQL_SERVER=11.6" - - "PGSQL_SERVER=11.6-alpine" - - "PGSQL_SERVER=11.7" - - "PGSQL_SERVER=11.7-alpine" - - "PGSQL_SERVER=11.8" - - "PGSQL_SERVER=11.8-alpine" - - "PGSQL_SERVER=11.9" - - "PGSQL_SERVER=11.9-alpine" - "PGSQL_SERVER=12.0" - "PGSQL_SERVER=12.0-alpine" - - "PGSQL_SERVER=12.1" - - "PGSQL_SERVER=12.1-alpine" - - "PGSQL_SERVER=12.2" - - "PGSQL_SERVER=12.2-alpine" - - "PGSQL_SERVER=12.3" - - "PGSQL_SERVER=12.3-alpine" - "PGSQL_SERVER=13.0" - "PGSQL_SERVER=13.0-alpine" + - "PGSQL_SERVER=14.0" + - "PGSQL_SERVER=14.0-alpine" - "PGSQL_SERVER=latest" - "PGSQL_SERVER=alpine" @@ -122,6 +88,8 @@ jobs: - "REDIS_SERVER=5.0-alpine" - "REDIS_SERVER=6.0" - "REDIS_SERVER=6.0-alpine" + - "REDIS_SERVER=6.2" + - "REDIS_SERVER=6.2-alpine" - "REDIS_SERVER=latest" - "REDIS_SERVER=alpine" @@ -142,6 +110,7 @@ jobs: - "MONGO_SERVER=4.0" - "MONGO_SERVER=4.2" - "MONGO_SERVER=4.4" + - "MONGO_SERVER=5.0" - "MONGO_SERVER=latest" name: "[${{ matrix.version }}]" steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d1268d9..679aca85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl ## Unreleased +## Release v1.11.0 (2022-04-01) + +#### Changed +- Changed default PostgreSQL server from `12.4` to `14-alpine` +- Changed default Redis server from `6.0` to `6.2-alpine` +- Changed default Memcached server from `1.6` to `1.6-alpine` +- Changed default MongoDB server from `4.4` to `5.0` + + ## Release v1.11.0 (2022-03-22) #### Fixed diff --git a/README.md b/README.md index 5f4dee74..eccbe52b 100644 --- a/README.md +++ b/README.md @@ -304,7 +304,7 @@ Every single attachable container comes with many different versions. In order t 10.5 9.6 - latest + 6.2 4.2 @@ -315,8 +315,8 @@ Every single attachable container comes with many different versions. In order t 10.6 - ... - + 10 + latest 4.4 @@ -327,10 +327,10 @@ Every single attachable container comes with many different versions. In order t 10.7 - 12.3 + 11 - latest + 5.0 @@ -339,10 +339,10 @@ Every single attachable container comes with many different versions. In order t - 12.4 - + 12 + latest @@ -351,7 +351,7 @@ Every single attachable container comes with many different versions. In order t - 13.0 + 13 @@ -363,7 +363,7 @@ Every single attachable container comes with many different versions. In order t - latest + 14 @@ -375,7 +375,7 @@ Every single attachable container comes with many different versions. In order t - + latest diff --git a/docker-compose.yml b/docker-compose.yml index 34fc1de8..2fdc305f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -530,50 +530,14 @@ volumes: devilbox-pgsql-9.6-alpine: devilbox-pgsql-10.0: devilbox-pgsql-10.0-alpine: - devilbox-pgsql-10.1: - devilbox-pgsql-10.1-alpine: - devilbox-pgsql-10.2: - devilbox-pgsql-10.2-alpine: - devilbox-pgsql-10.3: - devilbox-pgsql-10.3-alpine: - devilbox-pgsql-10.4: - devilbox-pgsql-10.4-alpine: - devilbox-pgsql-10.5: - devilbox-pgsql-10.5-alpine: - devilbox-pgsql-10.6: - devilbox-pgsql-10.6-alpine: devilbox-pgsql-11.0: devilbox-pgsql-11.0-alpine: - devilbox-pgsql-11.1: - devilbox-pgsql-11.1-alpine: - devilbox-pgsql-11.2: - devilbox-pgsql-11.2-alpine: - devilbox-pgsql-11.3: - devilbox-pgsql-11.3-alpine: - devilbox-pgsql-11.4: - devilbox-pgsql-11.4-alpine: - devilbox-pgsql-11.5: - devilbox-pgsql-11.5-alpine: - devilbox-pgsql-11.6: - devilbox-pgsql-11.6-alpine: - devilbox-pgsql-11.7: - devilbox-pgsql-11.7-alpine: - devilbox-pgsql-11.8: - devilbox-pgsql-11.8-alpine: - devilbox-pgsql-11.9: - devilbox-pgsql-11.9-alpine: devilbox-pgsql-12.0: devilbox-pgsql-12.0-alpine: - devilbox-pgsql-12.1: - devilbox-pgsql-12.1-alpine: - devilbox-pgsql-12.2: - devilbox-pgsql-12.2-alpine: - devilbox-pgsql-12.3: - devilbox-pgsql-12.3-alpine: - devilbox-pgsql-12.4: - devilbox-pgsql-12.4-alpine: devilbox-pgsql-13.0: devilbox-pgsql-13.0-alpine: + devilbox-pgsql-14.0: + devilbox-pgsql-14.0-alpine: devilbox-pgsql-latest: devilbox-pgsql-alpine: @@ -588,4 +552,5 @@ volumes: devilbox-mongo-4.0: devilbox-mongo-4.2: devilbox-mongo-4.4: + devilbox-mongo-5.0: devilbox-mongo-latest: diff --git a/docs/configuration-files/env-file.rst b/docs/configuration-files/env-file.rst index 0ff26d39..b35f98b5 100644 --- a/docs/configuration-files/env-file.rst +++ b/docs/configuration-files/env-file.rst @@ -557,11 +557,11 @@ PHP_SERVER This variable choses your desired PHP-FPM version to be started. -+-------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------+ -| Name | Allowed values | Default value | -+=========================+========================================================================================================================================================================================================================================================+=================+ -| ``PHP_SERVER`` | ``php-fpm-5.2`` |br| ``php-fpm-5.3`` |br| ``php-fpm-5.4`` |br| ``php-fpm-5.5`` |br| ``php-fpm-5.6`` |br| ``php-fpm-7.0`` |br| ``php-fpm-7.1`` |br| ``php-fpm-7.2`` |br| ``php-fpm-7.3`` |br| ``php-fpm-7.4`` |br| ``php-fpm-8.0`` |br| ``php-fpm-8.1`` | ``php-fpm-7.4`` | -+-------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------+ ++-------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------+ +| Name | Allowed values | Default value | ++=========================+=============================================================================================================================================================================================================================================================================+=================+ +| ``PHP_SERVER`` | ``php-fpm-5.2`` |br| ``php-fpm-5.3`` |br| ``php-fpm-5.4`` |br| ``php-fpm-5.5`` |br| ``php-fpm-5.6`` |br| ``php-fpm-7.0`` |br| ``php-fpm-7.1`` |br| ``php-fpm-7.2`` |br| ``php-fpm-7.3`` |br| ``php-fpm-7.4`` |br| ``php-fpm-8.0`` |br| ``php-fpm-8.1`` |br| ``php-fpm-8.2`` | ``php-fpm-8.1`` | ++-------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------+ .. important:: **PHP 5.2** is available to use, but it is not officially supported. The Devilbox intranet does @@ -574,7 +574,7 @@ All values are already available in the ``.env`` file and just need to be commen .. code-block:: bash :caption: .env - :emphasize-lines: 9 + :emphasize-lines: 14 host> grep PHP_SERVER .env @@ -587,9 +587,10 @@ All values are already available in the ``.env`` file and just need to be commen #PHP_SERVER=php-fpm-7.1 #PHP_SERVER=php-fpm-7.2 #PHP_SERVER=php-fpm-7.3 - PHP_SERVER=php-fpm-7.4 + #PHP_SERVER=php-fpm-7.4 #PHP_SERVER=php-fpm-8.0 - #PHP_SERVER=php-fpm-8.1 + PHP_SERVER=php-fpm-8.1 + #PHP_SERVER=php-fpm-8.2 .. _env_httpd_server: @@ -629,14 +630,14 @@ This variable choses your desired MySQL server version to be started. +-------------------------+------------------------------------------------------------------------------------------------+------------------+ | 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.5`` | +| ``MYSQL_SERVER`` | ``mysql-5.5`` |br| ``mysql-5.6`` |br| ``mariadb-10.2`` |br| ``percona-5.7`` |br| and many more | ``mariadb-10.6`` | +-------------------------+------------------------------------------------------------------------------------------------+------------------+ 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: .. code-block:: bash :caption: .env - :emphasize-lines: 9 + :emphasize-lines: 18 host> grep MYSQL_SERVER .env @@ -644,17 +645,20 @@ All values are already available in the ``.env`` file and just need to be commen #MYSQL_SERVER=mysql-5.6 #MYSQL_SERVER=mysql-5.7 #MYSQL_SERVER=mysql-8.0 + #MYSQL_SERVER=percona-5.5 + #MYSQL_SERVER=percona-5.6 + #MYSQL_SERVER=percona-5.7 + #MYSQL_SERVER=percona-8.0 #MYSQL_SERVER=mariadb-5.5 #MYSQL_SERVER=mariadb-10.0 #MYSQL_SERVER=mariadb-10.1 #MYSQL_SERVER=mariadb-10.2 #MYSQL_SERVER=mariadb-10.3 #MYSQL_SERVER=mariadb-10.4 - MYSQL_SERVER=mariadb-10.5 - #MYSQL_SERVER=percona-5.5 - #MYSQL_SERVER=percona-5.6 - #MYSQL_SERVER=percona-5.7 - #MYSQL_SERVER=percona-8.0 + #MYSQL_SERVER=mariadb-10.5 + MYSQL_SERVER=mariadb-10.6 + #MYSQL_SERVER=mariadb-10.7 + #MYSQL_SERVER=mariadb-10.8 .. _env_pgsql_server: @@ -667,14 +671,14 @@ This variable choses your desired PostgreSQL server version to be started. +-------------------------+-------------------------------------------------------------------+------------------+ | Name | Allowed values | Default value | +=========================+===================================================================+==================+ -| ``PGSQL_SERVER`` | ``9.1`` |br| ``9.2`` |br| ``9.3`` |br| ``9.4`` |br| and many more | ``12.4`` | +| ``PGSQL_SERVER`` | ``9.1`` |br| ``9.2`` |br| ``9.3`` |br| ``9.4`` |br| and many more | ``14-alpine`` | +-------------------------+-------------------------------------------------------------------+------------------+ 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: .. code-block:: bash :caption: .env - :emphasize-lines: 8 + :emphasize-lines: 24 host> grep PGSQL_SERVER .env @@ -690,52 +694,16 @@ All values are already available in the ``.env`` file and just need to be commen #PGSQL_SERVER=9.5-alpine #PGSQL_SERVER=9.6 #PGSQL_SERVER=9.6-alpine - #PGSQL_SERVER=10.0 - #PGSQL_SERVER=10.0-alpine - #PGSQL_SERVER=10.1 - #PGSQL_SERVER=10.1-alpine - #PGSQL_SERVER=10.2 - #PGSQL_SERVER=10.2-alpine - #PGSQL_SERVER=10.3 - #PGSQL_SERVER=10.3-alpine - #PGSQL_SERVER=10.4 - #PGSQL_SERVER=10.4-alpine - #PGSQL_SERVER=10.5 - #PGSQL_SERVER=10.5-alpine - #PGSQL_SERVER=10.6 - #PGSQL_SERVER=10.6-alpine - #PGSQL_SERVER=11.0 - #PGSQL_SERVER=11.0-alpine - #PGSQL_SERVER=11.1 - #PGSQL_SERVER=11.1-alpine - #PGSQL_SERVER=11.2 - #PGSQL_SERVER=11.2-alpine - #PGSQL_SERVER=11.3 - #PGSQL_SERVER=11.3-alpine - #PGSQL_SERVER=11.4 - #PGSQL_SERVER=11.4-alpine - #PGSQL_SERVER=11.5 - #PGSQL_SERVER=11.5-alpine - #PGSQL_SERVER=11.6 - #PGSQL_SERVER=11.6-alpine - #PGSQL_SERVER=11.7 - #PGSQL_SERVER=11.7-alpine - #PGSQL_SERVER=11.8 - #PGSQL_SERVER=11.8-alpine - #PGSQL_SERVER=11.9 - #PGSQL_SERVER=11.9-alpine - #PGSQL_SERVER=12.0 - #PGSQL_SERVER=12.0-alpine - #PGSQL_SERVER=12.1 - #PGSQL_SERVER=12.1-alpine - #PGSQL_SERVER=12.2 - #PGSQL_SERVER=12.2-alpine - #PGSQL_SERVER=12.3 - #PGSQL_SERVER=12.3-alpine - PGSQL_SERVER=12.4 - #PGSQL_SERVER=12.4-alpine - #PGSQL_SERVER=13.0 - #PGSQL_SERVER=13.0-alpine + #PGSQL_SERVER=10 + #PGSQL_SERVER=10-alpine + #PGSQL_SERVER=11 + #PGSQL_SERVER=11-alpine + #PGSQL_SERVER=12 + #PGSQL_SERVER=12-alpine + #PGSQL_SERVER=13 + #PGSQL_SERVER=13-alpine + #PGSQL_SERVER=14 + PGSQL_SERVER=14-alpine #PGSQL_SERVER=latest #PGSQL_SERVER=alpine @@ -755,14 +723,14 @@ This variable choses your desired Redis server version to be started. +-------------------------+-------------------------------------------------------------------+------------------+ | Name | Allowed values | Default value | +=========================+===================================================================+==================+ -| ``REDIS_SERVER`` | ``2.8`` |br| ``3.0`` |br| ``3.2`` |br| ``4.0`` |br| and many more | ``6.0`` | +| ``REDIS_SERVER`` | ``2.8`` |br| ``3.0`` |br| ``3.2`` |br| ``4.0`` |br| and many more | ``6.2-alpine`` | +-------------------------+-------------------------------------------------------------------+------------------+ 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: .. code-block:: bash :caption: .env - :emphasize-lines: 6 + :emphasize-lines: 15 host> grep REDIS_SERVER .env @@ -775,8 +743,10 @@ All values are already available in the ``.env`` file and just need to be commen #REDIS_SERVER=4.0-alpine #REDIS_SERVER=5.0 #REDIS_SERVER=5.0-alpine - REDIS_SERVER=6.0 + #REDIS_SERVER=6.0 #REDIS_SERVER=6.0-alpine + #REDIS_SERVER=6.2 + REDIS_SERVER=6.2-alpine #REDIS_SERVER=latest #REDIS_SERVER=alpine @@ -796,14 +766,14 @@ This variable choses your desired Memcached server version to be started. +-------------------------+---------------------------------------------------------------------------------+------------------+ | Name | Allowed values | Default value | +=========================+=================================================================================+==================+ -| ``MEMCD_SERVER`` | ``1.4`` |br| ``1.4-alpine`` |br| ``1.5`` |br| ``1.5-alpine`` |br| and many more | ``1.6`` | +| ``MEMCD_SERVER`` | ``1.4`` |br| ``1.4-alpine`` |br| ``1.5`` |br| ``1.5-alpine`` |br| and many more | ``1.6-alpine`` | +-------------------------+---------------------------------------------------------------------------------+------------------+ 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: .. code-block:: bash :caption: .env - :emphasize-lines: 5 + :emphasize-lines: 8 host> grep MEMCD_SERVER .env @@ -811,8 +781,8 @@ All values are already available in the ``.env`` file and just need to be commen #MEMCD_SERVER=1.4-alpine #MEMCD_SERVER=1.5 #MEMCD_SERVER=1.5-alpine - MEMCD_SERVER=1.6 - #MEMCD_SERVER=1.6-alpine + #MEMCD_SERVER=1.6 + MEMCD_SERVER=1.6-alpine #MEMCD_SERVER=latest #MEMCD_SERVER=alpine @@ -832,14 +802,14 @@ This variable choses your desired MongoDB server version to be started. +-------------------------+-------------------------------------------------------------------+------------------+ | Name | Allowed values | Default value | +=========================+===================================================================+==================+ -| ``MONGO_SERVER`` | ``2.8`` |br| ``3.0`` |br| ``3.2`` |br| ``3.4`` |br| and many more | ``4.4`` | +| ``MONGO_SERVER`` | ``2.8`` |br| ``3.0`` |br| ``3.2`` |br| ``3.4`` |br| and many more | ``5.0`` | +-------------------------+-------------------------------------------------------------------+------------------+ 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: .. code-block:: bash :caption: .env - :emphasize-lines: 6 + :emphasize-lines: 11 host> grep MONGO_SERVER .env @@ -850,7 +820,8 @@ All values are already available in the ``.env`` file and just need to be commen #MONGO_SERVER=3.6 #MONGO_SERVER=4.0 #MONGO_SERVER=4.2 - MONGO_SERVER=4.4 + #MONGO_SERVER=4.4 + MONGO_SERVER=5.0 #MONGO_SERVER=latest .. note:: diff --git a/env-example b/env-example index f2b472f5..86cd2128 100644 --- a/env-example +++ b/env-example @@ -286,6 +286,10 @@ HTTPD_SERVER=nginx-stable #MYSQL_SERVER=mysql-5.6 #MYSQL_SERVER=mysql-5.7 #MYSQL_SERVER=mysql-8.0 +#MYSQL_SERVER=percona-5.5 +#MYSQL_SERVER=percona-5.6 +#MYSQL_SERVER=percona-5.7 +#MYSQL_SERVER=percona-8.0 #MYSQL_SERVER=mariadb-5.5 #MYSQL_SERVER=mariadb-10.0 #MYSQL_SERVER=mariadb-10.1 @@ -296,22 +300,26 @@ HTTPD_SERVER=nginx-stable MYSQL_SERVER=mariadb-10.6 #MYSQL_SERVER=mariadb-10.7 #MYSQL_SERVER=mariadb-10.8 -#MYSQL_SERVER=percona-5.5 -#MYSQL_SERVER=percona-5.6 -#MYSQL_SERVER=percona-5.7 -#MYSQL_SERVER=percona-8.0 ### ### 1.4 Choose PostgreSQL Server Image ### +### https://www.postgresql.org/support/versioning/ +### ### IMPORTANT: Alpine based images might cause issues on Docker Toolbox or OSX ### https://github.com/docker/toolbox/issues/510 ### +# +# PostgreSQL without arm64 support +# #PGSQL_SERVER=9.0 #PGSQL_SERVER=9.1 -#PGSQL_SERVER=9.2 #PGSQL_SERVER=9.2-alpine +# +# PostgreSQL with arm64 support +# +#PGSQL_SERVER=9.2 #PGSQL_SERVER=9.3 #PGSQL_SERVER=9.3-alpine #PGSQL_SERVER=9.4 @@ -320,62 +328,16 @@ MYSQL_SERVER=mariadb-10.6 #PGSQL_SERVER=9.5-alpine #PGSQL_SERVER=9.6 #PGSQL_SERVER=9.6-alpine -#PGSQL_SERVER=10.0 -#PGSQL_SERVER=10.0-alpine -#PGSQL_SERVER=10.1 -#PGSQL_SERVER=10.1-alpine -#PGSQL_SERVER=10.2 -#PGSQL_SERVER=10.2-alpine -#PGSQL_SERVER=10.3 -#PGSQL_SERVER=10.3-alpine -#PGSQL_SERVER=10.4 -#PGSQL_SERVER=10.4-alpine -#PGSQL_SERVER=10.5 -#PGSQL_SERVER=10.5-alpine -#PGSQL_SERVER=10.6 -#PGSQL_SERVER=10.6-alpine -#PGSQL_SERVER=10.7 -#PGSQL_SERVER=10.7-alpine -#PGSQL_SERVER=10.8 -#PGSQL_SERVER=10.8-alpine -#PGSQL_SERVER=10.9 -#PGSQL_SERVER=10.9-alpine -#PGSQL_SERVER=10.10 -#PGSQL_SERVER=10.10-alpine -#PGSQL_SERVER=10.11 -#PGSQL_SERVER=10.11-alpine -#PGSQL_SERVER=11.0 -#PGSQL_SERVER=11.0-alpine -#PGSQL_SERVER=11.1 -#PGSQL_SERVER=11.1-alpine -#PGSQL_SERVER=11.2 -#PGSQL_SERVER=11.2-alpine -#PGSQL_SERVER=11.3 -#PGSQL_SERVER=11.3-alpine -#PGSQL_SERVER=11.4 -#PGSQL_SERVER=11.4-alpine -#PGSQL_SERVER=11.5 -#PGSQL_SERVER=11.5-alpine -#PGSQL_SERVER=11.6 -#PGSQL_SERVER=11.6-alpine -#PGSQL_SERVER=11.7 -#PGSQL_SERVER=11.7-alpine -#PGSQL_SERVER=11.8 -#PGSQL_SERVER=11.8-alpine -#PGSQL_SERVER=11.9 -#PGSQL_SERVER=11.9-alpine -#PGSQL_SERVER=12.0 -#PGSQL_SERVER=12.0-alpine -#PGSQL_SERVER=12.1 -#PGSQL_SERVER=12.1-alpine -#PGSQL_SERVER=12.2 -#PGSQL_SERVER=12.2-alpine -#PGSQL_SERVER=12.3 -#PGSQL_SERVER=12.3-alpine -PGSQL_SERVER=12.4 -#PGSQL_SERVER=12.4-alpine -#PGSQL_SERVER=13.0 -#PGSQL_SERVER=13.0-alpine +#PGSQL_SERVER=10 +#PGSQL_SERVER=10-alpine +#PGSQL_SERVER=11 +#PGSQL_SERVER=11-alpine +#PGSQL_SERVER=12 +#PGSQL_SERVER=12-alpine +#PGSQL_SERVER=13 +#PGSQL_SERVER=13-alpine +#PGSQL_SERVER=14 +PGSQL_SERVER=14-alpine #PGSQL_SERVER=latest #PGSQL_SERVER=alpine @@ -386,17 +348,25 @@ PGSQL_SERVER=12.4 ### IMPORTANT: Alpine based images might cause issues on Docker Toolbox or OSX ### https://github.com/docker/toolbox/issues/510 ### +# +# Redis without arm64 support +# #REDIS_SERVER=2.8 #REDIS_SERVER=3.0 #REDIS_SERVER=3.0-alpine +# +# Redis with arm64 support +# #REDIS_SERVER=3.2 #REDIS_SERVER=3.2-alpine #REDIS_SERVER=4.0 #REDIS_SERVER=4.0-alpine #REDIS_SERVER=5.0 #REDIS_SERVER=5.0-alpine -REDIS_SERVER=6.0 +#REDIS_SERVER=6.0 #REDIS_SERVER=6.0-alpine +#REDIS_SERVER=6.2 +REDIS_SERVER=6.2-alpine #REDIS_SERVER=latest #REDIS_SERVER=alpine @@ -407,12 +377,18 @@ REDIS_SERVER=6.0 ### IMPORTANT: Alpine based images might cause issues on Docker Toolbox or OSX ### https://github.com/docker/toolbox/issues/510 ### +# +# Memcached without arm64 support +# #MEMCD_SERVER=1.4 #MEMCD_SERVER=1.4-alpine +# +# Memcached with arm64 support +# #MEMCD_SERVER=1.5 #MEMCD_SERVER=1.5-alpine -MEMCD_SERVER=1.6 -#MEMCD_SERVER=1.6-alpine +#MEMCD_SERVER=1.6 +MEMCD_SERVER=1.6-alpine #MEMCD_SERVER=latest #MEMCD_SERVER=alpine @@ -420,14 +396,23 @@ MEMCD_SERVER=1.6 ### ### 1.7 Choose Mongo Server Image ### +### https://www.mongodb.com/evolved +### +# +# MongoDB without arm64 support +# #MONGO_SERVER=2.8 #MONGO_SERVER=3.0 #MONGO_SERVER=3.2 +# +# MongoDB with arm64 support +# #MONGO_SERVER=3.4 #MONGO_SERVER=3.6 #MONGO_SERVER=4.0 #MONGO_SERVER=4.2 -MONGO_SERVER=4.4 +#MONGO_SERVER=4.4 +MONGO_SERVER=5.0 #MONGO_SERVER=latest