From 45ab81124483bfd09bfbb9a801a6301058d6ee67 Mon Sep 17 00:00:00 2001 From: Piotr Rogowski Date: Mon, 15 Apr 2024 13:39:55 +0200 Subject: [PATCH] Remove variants using mariadb < 10.11 because this version is no longer hosted my mariadb --- README.md | 11 +---------- hooks/variants | 9 --------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/README.md b/README.md index eabc142..03090e3 100644 --- a/README.md +++ b/README.md @@ -31,21 +31,12 @@ See [all tags](https://github.com/mageops/docker-magento-run-tests/pkgs/containe - `stable` - latest tag named `vX.Y` ## Notable versions - | Version | Docker tag | PHP | DB| Elasticsearch | Composer version | | --- | --- | ---: | ---: | ---: | ---: | -| **php71-es7-mariadb103** | _php71-es7-mariadb103-stable_ | 7.1.X | MariaDB 10.3 | 7.2.0 | 1 | -| **php72-es7-mariadb103** | _php72-es7-mariadb103-stable_ | 7.2.X | MariaDB 10.3 | 7.2.0 | 1 | -| **php73-es7-mariadb104** | _php73-es7-mariadb104-stable_ | 7.3.X | MariaDB 10.4 | 7.2.0 | 1 | -| **php74-es7-mariadb104** | _php74-es7-mariadb104-stable_ | 7.4.X | MariaDB 10.4 | 7.2.0 | 1 | -| **php80-es7-mariadb104** | _php80-es7-mariadb104-stable_ | 8.0.X | MariaDB 10.4 | 7.17.3 | 2 | -| **php81-es7-mariadb104** | _php81-es7-mariadb104-stable_ | 8.1.X | MariaDB 10.4 | 7.17.3 | 2 | -| **php80-es7-mariadb108** | _php80-es7-mariadb108-stable_ | 8.0.X | MariaDB 10.8 | 7.17.3 | 2 | | **php80-es7-mysql80** | _php80-es7-mysql80-stable_ | 8.0.X | Mysql 8.0 | 7.17.3 | 2 | -| **php81-es7-mariadb108** | _php81-es7-mariadb108-stable_ | 8.1.X | MariaDB 10.8 | 7.17.3 | 2 | -| **php81-es7-mariadb1010** | _php81-es7-mariadb1010-stable_ | 8.1.X | MariaDB 10.10 | 7.17.3 | 2 | | **php81-es7-mysql80** | _php81-es7-mysql80-stable_ | 8.1.X | Mysql 8.0 | 7.17.3 | 2 | | **php82-es84-mysql80** | _php82-es84-mysql80-stable_ | 8.2.X | Mysql 8.0 | 8.4.3 | 2 | +| **php83-es811-mysql80** | _php83-es811-mysql80-stable_ | 8.3.X | Mysql 8.0 | 8.11.4 | 2 | _Note: The `exec` mount opt on `/tmp` is needed for elasticsearch because it maps mem to temp files._ _The image is big and there's not really a way around it since it has a lot of software and is based on CentOS (which we use for local dev / production deployments, so we want to keep everything else close)._ diff --git a/hooks/variants b/hooks/variants index 22b9f8c..819a7c8 100644 --- a/hooks/variants +++ b/hooks/variants @@ -23,16 +23,7 @@ if [[ ! -z "$DOCKER_BUILD_CACHE_FROM" ]] ; then fi IMAGE_VARIANTS=( - 'VARIANT_NAME="php71-es7-mariadb103" ; PHP_VERSION="7.1" ; ELASTICSEARCH_VERSION="7.2.0-x86_64" ; MARIADB_VERSION="10.3" ; COMPOSER_VERSION=1' - 'VARIANT_NAME="php72-es7-mariadb103" ; PHP_VERSION="7.2" ; ELASTICSEARCH_VERSION="7.2.0-x86_64" ; MARIADB_VERSION="10.3" ; COMPOSER_VERSION=1' - 'VARIANT_NAME="php73-es7-mariadb104" ; PHP_VERSION="7.3" ; ELASTICSEARCH_VERSION="7.2.0-x86_64" ; MARIADB_VERSION="10.4" ; COMPOSER_VERSION=1' - 'VARIANT_NAME="php74-es7-mariadb104" ; PHP_VERSION="7.4" ; ELASTICSEARCH_VERSION="7.2.0-x86_64" ; MARIADB_VERSION="10.4" ; COMPOSER_VERSION=1' - 'VARIANT_NAME="php80-es7-mariadb104" ; PHP_VERSION="8.0" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MARIADB_VERSION="10.4" ; COMPOSER_VERSION=2' - 'VARIANT_NAME="php81-es7-mariadb104" ; PHP_VERSION="8.1" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MARIADB_VERSION="10.4" ; COMPOSER_VERSION=2' - 'VARIANT_NAME="php80-es7-mariadb108" ; PHP_VERSION="8.0" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MARIADB_VERSION="10.8" ; COMPOSER_VERSION=2' 'VARIANT_NAME="php80-es7-mysql80" ; PHP_VERSION="8.0" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MYSQL_VERSION="8.0" ; COMPOSER_VERSION=2 ; MYSQL_FLAVOR=mysql' - 'VARIANT_NAME="php81-es7-mariadb108" ; PHP_VERSION="8.1" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MARIADB_VERSION="10.8" ; COMPOSER_VERSION=2' - 'VARIANT_NAME="php81-es7-mariadb1010" ; PHP_VERSION="8.1" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MARIADB_VERSION="10.10" ; COMPOSER_VERSION=2' 'VARIANT_NAME="php81-es7-mysql80" ; PHP_VERSION="8.1" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MYSQL_VERSION="8.0" ; COMPOSER_VERSION=2 ; MYSQL_FLAVOR=mysql' 'VARIANT_NAME="php82-es84-mysql80" ; PHP_VERSION="8.2" ; ELASTICSEARCH_VERSION="8.4.3-x86_64" ; MYSQL_VERSION="8.0" ; COMPOSER_VERSION=2 ; MYSQL_FLAVOR=mysql' 'VARIANT_NAME="php83-es811-mysql80" ; PHP_VERSION="8.3" ; ELASTICSEARCH_VERSION="8.11.4-x86_64" ; MYSQL_VERSION="8.0" ; COMPOSER_VERSION=2 ; MYSQL_FLAVOR=mysql'