Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

MCLOUD-7204: Update Redis and ES service versions #8502

Merged
merged 5 commits into from
Jan 12, 2021
Merged

MCLOUD-7204: Update Redis and ES service versions #8502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3dfea22
MCLOUD-7204: Update Redis and ES service versions
bdenham Jan 12, 2021
e5fb152
MCLOUD-7204: Update Redis and ES service versions
bdenham Jan 12, 2021
a2ad69b
MCLOUD-7204: Update Redis and ES service versions
bdenham Jan 12, 2021
77bf39f
Merge branch '2.4.2-develop' into MCLOUD-7204a
bdenham Jan 12, 2021
4f5b238
Merge branch '2.4.2-develop' into MCLOUD-7204a
bdenham Jan 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/cloud/docker/docker-containers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ The following table shows the options to customize service container configurati
| Name | Service | Key & options | Available Versions | Notes
| ------------- | ---------- | ---------- | ------------------ |------------------
| [db] | MariaDB or MySQL<br> | `--db`, `--db-image` (MySQL)<br>`--expose-db-port`<br>`--db-increment`<br>`--db-offset`<br>`--with-entrypoint`<br>`--with-mariadb-config`|10.0, 10.1, 10.2<br>5.6, 5.7 | Use the increment and offset options to customize the [auto-increment settings][Using AUTO_INCREMENT] for replication.<br><br>Use the `--with-entrypoint` and `--with-mariadb-config` options to automatically configure database directories in the Docker environment<br><br>*Example build commands:*<br>`ece-docker build:compose --db <mariadb-version>`<br>`ece-docker build:compose --db <mysql-version> --db-image`
| [elasticsearch] | Elasticsearch | `--es`<br>`--es-env-var`<br>`--no-es` | 1.7, 2.4, 5.2, 6.5, 6.8, 7.5, 7.6, 7.7 | Use the options to specify the Elasticsearch version, customize Elasticsearch configuration options, or to build a Docker environment without Elasticsearch.
| [fpm][fpm-container] | PHP FPM | `--php`<br>`--with-xdebug` | 7.0, 7.1, 7.2, 7.3, 7.4 | Used for all incoming requests. Optionally, install a specific php version or add Xdebug to debug PHP code in the Docker environment.
| [elasticsearch] | Elasticsearch | `--es`<br>`--es-env-var`<br>`--no-es` | 1.7, 2.4, 5.2, 6.5, 6.8, 7.5, 7.6, 7.7, 7.9 | Use the options to specify the Elasticsearch version, customize Elasticsearch configuration options, or to build a Docker environment without Elasticsearch.
| [fpm][fpm-container] | PHP FPM | `--php`<br>`--with-xdebug` | 7.2, 7.3, 7.4 | Used for all incoming requests. Optionally, install a specific php version or add Xdebug to debug PHP code in the Docker environment.
| [fpm_xdebug][fpm_xdebug-container] | Xdebug | `--set-docker-host` | latest | Optional container for PHP debugging<br>On Linux systems, `--set-docker-host` sets the `.host.docker.internal` value in the container `/etc/hosts` file.
| [mailhog][mailhog-container] | MailHog | `--no-mailhog`<br>`--mailhog-http-port`<br>`--mailhog-smtp-port` | latest | Email service to replace Sendmail service, which can cause issues in Docker environment
| [node][node-container] | Node | `--node` | 6, 8, 10, 11 | Node container to run gulp or other NPM based commands in the Docker environment. Use the `--node` option to install a specific node version.
| [rabbitmq][rabbitmq-container]| RabbitMQ | `--rmq` | 3.5, 3.7, 3.8 | Use the `--rmq` option to install a specific RabbitMQ version.
| [redis][redis-container] | Redis | `--redis` | 3.2, 4.0, 5.0 | Standard redis container
| [redis][redis-container] | Redis | `--redis` | 3.2, 5.0, 6.0 | Standard redis container
| [selenium][selenium-container]| Selenium | `--with-selenium`<br>`--selenium-version`<br>`--selenium-image`| Any | Enables Magento application testing using the Magento Functional Testing Framework (MFTF)
| [test][test-container]| PHP CLI | `--with-test`| Any | Optional container with a writable file system for running tests
| [tls][tls-container] | SSL Endpoint | `--tls-port`<br/>`--no-tls` | nginx 1.19-1.2.0, latest | Terminates SSL, can be configured to pass to varnish or nginx. Use the `--tls-port` option to change the default port (443).<br/>Use the `--no-tls` option to disable tls.
Expand Down
4 changes: 2 additions & 2 deletions src/cloud/project/services-redis.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ functional_areas:
- Cloud
- Setup
redirect_from:
- /cloud/project/project-conf-files_services-redis.html
- /cloud/project/project-conf-files_services-redis.html
---

[Redis](http://redis.io) is an optional, backend cache solution that replaces the Zend Framework [Zend_Cache_Backend_File](http://framework.zend.com/apidoc/1.0/Zend_Cache/Backend/Zend_Cache_Backend_File.html), which is used in Magento 2 by default.

We support Redis versions 3.2 and 5.0. See [Configure Redis]({{ site.baseurl }}/guides/v2.3/config-guide/redis/config-redis.html).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we write that we support Redis 3.2, 5.0, and 6.0. but on page https://devdocs.magento.com/cloud/project/services.html#service-versions exist version 4.0. It doesn't look clear for me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andriyShevtsov Good catch. From here https://wiki.corp.magento.com/display/PRODM/Platform+Health+Roadmap it looks like 4.0 should be removed. So I will remove 4.0 from the service version table. If this is not correct, let me know.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oshmyheliuk and @andriyShevtsov: Redis 4.0 is also included in the docker container table, as shown here: https://devdocs.magento.com/cloud/docker/docker-containers.html#service-configuration-options.

So do I just need to add 4.0 to the services-redis page? It's unclear to me.

We support Redis versions 3.2, 5.0, and 6.0. See [Configure Redis]({{ site.baseurl }}/guides/v2.4/config-guide/redis/config-redis.html).

{% include cloud/service-config-integration-starter.md %}

Expand Down
6 changes: 3 additions & 3 deletions src/cloud/project/services.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ functional_areas:
- Cloud
- Setup
redirect_from:
- /cloud/project/project-conf-files_services.html
- /cloud/project/project-conf-files_services.html
---

The `services.yaml` file defines the services supported and used by {{site.data.var.ece}}, such as MySQL, Redis, and ElasticSearch. You do not need to subscribe to external service providers. This file is in the `.magento` directory of your project.
Expand Down Expand Up @@ -170,13 +170,13 @@ The following table lists the services used in {{site.data.var.ece}} and their v
{:.error-table}
Service | Magento 2.4 |Magento 2.3 | Magento 2.2
--------- | ------------- |-------------| ------------
`elasticsearch` | 7.7 | **Magento version 2.3.5 and later**— 5.2, 6.5, 6.8, 7.5, 7.7<br>**Magento version 2.3.1 to 2.3.4**— 5.2, 6.5<br>**Magento version 2.3.0**— 5.2 | **Magento version 2.2.8 and later**— 5.2, 6.5 <br>**Magento version 2.2.0 to 2.2.7**— 5.2
`elasticsearch` | 7.7, 7.9 | **Magento version 2.3.5 and later**— 5.2, 6.5, 6.8, 7.5, 7.7, 7.9<br>**Magento version 2.3.1 to 2.3.4**— 5.2, 6.5<br>**Magento version 2.3.0**— 5.2 | **Magento version 2.2.8 and later**— 5.2, 6.5 <br>**Magento version 2.2.0 to 2.2.7**— 5.2
`mariadb` | 10.2, 10.3, 10.4 | **Magento version 2.3.0 to 2.3.5**–10.1 to 10.2<br> | 10.1 to 10.2
`nginx` | | 1.9 | 1.9
`node` | | 6, 8, 10, 11 | 6, 8, 10, 11
`php` | 7.3, 7.4 | **Magento version 2.3.4 and later**— 7.1, 7.2, 7.3<br>**Magento version 2.3.3**— 7.1, 7.2, 7.3<br>**Magento version 2.3.0 to 2.3.2**— 7.1, 7.2 | **Magento version 2.2.10 and later**— 7.1, 7.2<br>**Magento version 2.2.5 to 2.2.9**— 7.0, 7.1<br>**Magento version 2.2.4 and earlier**— 7.0.2, 7.0.4, ~7.0.6, 7.1<br><br>**Note:** Beginning with {{ site.data.var.ct }} v2002.1.0, you must use PHP version 7.1.3 or later for both Magento 2.2 and 2.3.
`rabbitmq`| 3.8 | **Magento version 2.3.5**–3.8<br>**Magento version 2.3.3 - 2.3.4**— 3.7, 3.8<br>**Magento version 2.3.0 to 2.3.3**— 3.7 | 3.5
`redis` | 5.x| **Magento version 2.3.1 - 2.3.5**–4.x, 5.x<br>**Magento version 2.3.0**— 3.2, 4.0 | 3.2, 4.0, 5.0
`redis` | 5.x, 6.x | **Magento version 2.3.1 - 2.3.7**–5.x, 6.x<br>**Magento version 2.3.0**— 3.2 | 3.2, 5.0, 6.x
`varnish` | 6.x | **Magento version 2.3.3 to 2.3.5**— 4.0, 5.0, 6.2<br>**Magento version 2.3.0 to 2.3.2**— 4.0, 5.0 | 4.0, 5.0<br>**Note:** On Cloud projects, you must use the [Fastly service]({{site.baseurl}}/cloud/cdn/cloud-fastly.html) for caching. Varnish is available only for local development.

{:.bs-callout-info}
Expand Down