Merge branch 'master' into patch-1

Author: keharper

src/_data/var.yml

@@ -21,20 +21,20 @@ mbi: Adobe Commerce Reporting
 # Cloud product name variables
 
 ece: Cloud for Adobe Commerce
-ece-release-date: April 20, 2021
+ece-release-date: July 29, 2021
 csuite: Cloud Suite for Commerce
 ct: ece-tools
 ct-repo: magento/ece-tools
-ct-release: 2002.1.6
+ct-release: 2002.1.7
 mcp-prod: Cloud Patches for Commerce
 mcp-package: magento/magento-cloud-patches
-mcp-release: 1.0.10
+mcp-release: 1.0.11
 mcd-package: magento/magento-cloud-docker
 mcd-prod: Cloud Docker for Commerce
-mcd-release: 1.2.3
+mcd-release: 1.2.4
 mcc-prod: Cloud Components of Commerce
 mcc-package: magento/magento-cloud-components
-mcc-release: 1.0.7
+mcc-release: 1.0.8
 
 # TIP: Use the following syntax to use a variable in the documentation source: {{site.data.var.xx}} where xx
 # is the variable value.

src/cloud/cdn/trouble-fastly.md

@@ -294,13 +294,13 @@ To rollback the VCL version:
 1. To get a list of the available VCL versions for a service, run the following command
 
    ```bash
-   curl -H "Fastly-Key: <FASTLY_API_TOKEN>" https://api.fastly.com/service/<FASTLY_SERVICE_ID>/version/
+   curl -H "Fastly-Key: <FASTLY_API_TOKEN>" -H "Accept: application/json" https://api.fastly.com/service/<FASTLY_SERVICE_ID>/version
    ```
 
 1. Run the following command to change the active VCL version to a specified version.
 
    ```bash
-   curl -H "Fastly-Key: <FASTLY_API_TOKEN>" -H 'Content-Type: application/json' -H "Accept: application/json" -X PUT https://api.fastly.com/service/<FASTLY_SERVICE_ID>/version/<Version #>/activate
+   curl -H "Fastly-Key: <FASTLY_API_TOKEN>" -H "Content-Type: application/x-www-form-urlencoded" -H "Accept: application/json" -X PUT https://api.fastly.com/service/<FASTLY_SERVICE_ID>/version/<VERSION_ID>/activate
    ```
 
 For details about using the Fastly API to review and manage VCL, see [Manage VCL using the API]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api).

src/cloud/docker/docker-containers-service.md

@@ -307,6 +307,27 @@ To mount the custom index.php file using volumes:
         - ./pub/index.php:/app/pub/index.php:ro
 ```
 
+## Zookeeper container
+
+**Container name**: Zookeeper<br/>
+**Docker base image**:  [zookeeper/latest/](https://hub.docker.com/_/zookeeper)<br/>
+**Ports exposed**: 2181<br/>
+
+Developers can use Zookeeper to manage locks to prevent the launch of duplicate cron jobs and cron groups for {{ site.data.var.ee }} and {{ site.data.var.ce }} projects running on servers with multiple nodes.
+
+For {{ site.data.var.ee }} projects on Adobe cloud infrastructure, lock provider settings are configured automatically during provisioning. See [Cloud variables]({{ site.baseurl }}/cloud/env/variables-cloud.html).
+
+For projects hosted on other infrastructure, developers can add the Zookeeper container to the Docker environment and [configure the service][Configure the lock provider].
+
+```bash
+./vendor/bin/ece-docker build:compose --php <version> --with-zookeeper
+```
+
+The latest Zookeeper version is installed by default from Docker Hub. You can add the following options to customize the installation:
+
+-  `--zookeeper-version` – Specify a specific version to install from [Docker Hub](https://hub.docker.com/_/zookeeper).
+-  `--zookeeper-image`  – Specify the Zookeeper image name to install from a custom image.
+
 <!--Link definitions-->
 
 [centos]: https://hub.docker.com/_/centos
@@ -322,7 +343,7 @@ To mount the custom index.php file using volumes:
 [mariadb Docker documentation]: https://hub.docker.com/_/mariadb
 [mariadb]: https://hub.docker.com/_/mariadb
 [nginx config]: https://github.com/magento-dockerhub/magento-cloud-docker/blob/master/images/nginx/1.9/etc/vhost.conf
-[nginx configs]: https://github.com/magento/magento-cloud-docker/tree/develop/images/nginx/1.9/etc
+[nginx configs]: https://github.com/magento/magento-cloud-docker/tree/develop/images/nginx/1.19/etc
 [nginx]: https://hub.docker.com/r/magento/magento-cloud-docker-nginx
 [PHP extensions]: {{site.baseurl}}/cloud/project/magento-app-php-application.html#php-extensions
 [php-cloud]: https://hub.docker.com/r/magento/magento-cloud-docker-php
@@ -333,3 +354,4 @@ To mount the custom index.php file using volumes:
 [varnish]: https://hub.docker.com/r/magento/magento-cloud-docker-varnish
 [varnish]: https://hub.docker.com/r/magento/magento-cloud-docker-varnish
 [web config]: https://github.com/magento/docker
+[Configure the lock provider]: {{site.baseurl}}/guides/v2.4/install-gde/install/cli/install-cli-subcommands-lock.html#instgde-cli-lockconfig

src/cloud/docker/docker-containers.md

@@ -17,9 +17,20 @@ The `{{site.data.var.ct}}` package uses the following release versioning sequenc
 {:.bs-callout-info}
 See [Upgrades and patches]({{ site.baseurl }}/cloud/project/project-upgrade-parent.html) for information about updating to the latest release of the `{{site.data.var.ct}}` package.
 
-## v2002.1.6
+## v2002.1.7
 *Release date: {{ site.data.var.ece-release-date }}*<br/>
 
+**Configuration updates**–
+
+-  {:.new}<!--MCLOUD-8003-->Added support for Composer 2.0.
+
+-  {:.fix} **Updated composer requirements for `symphony/console`**–Updated the {{ site.data.var.ct }} `composer.json` version requirements for the `symphony/console` package to fix an issue that caused the `di:compile` commands to fail with the following error: `Incompatible argument type: Required type: int. Actual type: string`<!--MC-42919-->
+
+-  {:.fix}<!--MCLOUD-7938-->Updated the end-of-life software checks (`eol.yaml`) to include Elasticsearch 7.9.x.
+
+## v2002.1.6
+*Release date: April 20, 2021*<br/>
+
 -  {:.new}<!--MCLOUD-7694--> **Redis authentication credentials**—Added the ability to read Redis authorization credentials from the `relationships` property during the deploy phase.
 -  {:.new}<!--MCLOUD-7695--> **Elasticsearch authorization credentials**—Added the ability to read Elasticsearch authorization credentials from the `relationships` property during the deploy phase.
 -  {:.new}<!--MCLOUD-7698--> **Dedicated session storage service**—Added `redis-session` as a second option for session storage. You can use the `redis-session` service to store session information and use the `redis` service for cache to provide better performance.

src/cloud/release-notes/ece-release-notes.md

@@ -11,6 +11,11 @@ The [Magento Cloud Components](https://github.com/magento/magento-cloud-componen
 
 The `{{site.data.var.mcc-package}}` package uses the following version sequence: `<major>.<minor>.<patch>`.
 
+## v1.0.8
+*Release date: {{ site.data.var.ece-release-date }}*<br/>
+
+-  {:.fix}**Removed trailing slashes from auto-generated URLs**–Removed the trailing slashes from Category Page URLs generated during cache warm up.<!--MCLOUD-7192-->
+
 ## v1.0.7
 *Release date: September 9, 2020*<br/>
 

src/cloud/release-notes/mcc-release-notes.md

@@ -16,6 +16,13 @@ The release notes include:
 -  {:.new}New features
 -  {:.fix}Fixes and improvements
 
+## v1.2.4
+*Release date: {{ site.data.var.ece-release-date }}*<br/>
+
+-  {:.new}**New `Zookeeper` container**–Added a [Zookeeper container]({{ site.baseurl}}/cloud/docker/docker-containers-service.html#zookeeper-container) to manage lock provider configuration for projects that are not deployed to {{ site.data.var.ee }} on Cloud infrastructure.<!--MCLOUD-8000-->
+
+-  {:.new}**Added support for Composer 2.0.**–Added Composer version 2.0 to the Composer configuration file to support upgrades from Composer 1.0 which is approaching end-of-life.<!--MCLOUD-8003-->
+
 ## v1.2.3
 *Release date: June 14, 2021*<br/>
 

src/cloud/release-notes/mcd-release-notes.md

@@ -21,6 +21,15 @@ See [Apply patches]({{site.baseurl}}/cloud/project/project-patch.html) for instr
 
 <!--Add release notes below-->
 
+## v1.0.11
+*Release date: {{ site.data.var.ece-release-date }}*<br/>
+
+-  {:.fix} **Fixed an issue caused by applying the B2B Layered navigation patch**–For customers that have applied the B2B Layered navigation patch, this fix resolves an `Undefined offset` error that displays on the Search page after switching the Store view.<!--MCLOUD-5287-->
+
+-  {:.fix} **Paypal Checkout patch**–Fixes a Magento 2.3.7 issue with PayPal Express where the previously placed order price is displayed.<!--MC-42674-->
+
+-  {:.fix} **Patch category support**–Added support for processing patch categories and origin sources assigned to Magento Quality Patches. The categories allow customers to use filters and sorting to find patches more quickly when using [Magento Quality Patches](https://github.com/magento/quality-patches) and the Site-wide Analysis Tool (SWAT). <!--MC-38577-->
+
 ## v1.0.10
 *Release date: May 10, 2021*<br/>