Cloud 2002.0.20 release

_data/toc/cloud-guide.yml

@@ -38,6 +38,9 @@ pages:
         - label: Magento Cloud CLI
           url: /cloud/reference/cli-ref-topic.html
 
+        -  label: ece-tools package
+           url: /cloud/reference/ece-tools-reference.html
+
         - label: Git
           url: /cloud/reference/git-integration.html
 
@@ -105,6 +108,9 @@ pages:
         - label: Connect to the database
           url: /cloud/docker/docker-database.html
 
+        - label: Functional testing in Docker
+          url: /cloud/docker/docker-development-testing.html
+
         - label: Docker quick reference
           url: /cloud/docker/docker-quick-reference.html
 

_includes/cloud/note-ece-tools-release-info.md

@@ -1,2 +1,2 @@
-{: .bs-callout .bs-callout-info}
+{: .bs-callout-info}
 For current {{ site.data.var.ece }} release information, see [Release notes for ece-tools]({{ page.baseurl }}/cloud/release-notes/cloud-tools.html).

guides/v2.1/cloud/bk-cloud.md

@@ -22,7 +22,7 @@ Amazon Web Services (AWS) powers the underlying Infrastructure as a Service (Iaa
 
 ## {{site.data.var.ct}} package
 
-The `{{site.data.var.ct}}` package is a scalable deployment tool that simplifies the Cloud upgrade process. In 2018, we deprecated the `magento-cloud-configuration` and `ece-patches` packages in favor of providing a single package. We encourage all customers to [upgrade to use `{{site.data.var.ct}}`]({{page.baseurl}}/cloud/project/ece-tools-upgrade-project.html) as soon as possible to benefit from the package features, such as commands to create a backup of the database, apply custom patches, and verify environment configuration. 
+The [`{{site.data.var.ct}}` package][ece] is a scalable deployment tool that simplifies the Cloud upgrade process. In 2018, we deprecated the `magento-cloud-configuration` and `ece-patches` packages in favor of providing a single package. We encourage all customers to [upgrade to use `{{site.data.var.ct}}`]({{page.baseurl}}/cloud/project/ece-tools-upgrade-project.html) as soon as possible to benefit from the package features, such as commands to create a backup of the database, apply custom patches, and verify environment configuration. 
 
 <!-- Link definitions -->
 
@@ -31,3 +31,5 @@ The `{{site.data.var.ct}}` package is a scalable deployment tool that simplifies
 
 [Cloud Stack]: {{site.baseurl}}/common/images/cloud/CloudStack.png
 {: width="804px" height="721px"}
+
+[ece]: {{page.baseurl}}/cloud/reference/ece-tools-reference.html

guides/v2.1/cloud/docker/docker-config.md

@@ -52,38 +52,44 @@ For example, the following command starts the Docker configuration generator for
 ./vendor/bin/ece-tools docker:build --mode="developer" --php 7.2
 ```
 
-### Prerequisites
+## Prerequisites
 
-You must have the following software installed on your local workstation:
+1.  You must have the following software installed on your local workstation:
 
--  PHP version 7.1 or later
-    -  [php@7.1](https://formulae.brew.sh/formula/php@7.1)
-    -  [php@7.2](https://formulae.brew.sh/formula/php@7.2)
--  [Composer](https://getcomposer.org)
--  [Docker](https://www.docker.com/get-started)
--  [docker-sync](https://docker-sync.readthedocs.io/en/latest/getting-started/installation.html)—file synchronization is required for developer mode
+    -  PHP version 7.1 or later
+        -  [php@7.1](https://formulae.brew.sh/formula/php@7.1)
+        -  [php@7.2](https://formulae.brew.sh/formula/php@7.2)
+    -  [Composer](https://getcomposer.org)
+    -  [Docker](https://www.docker.com/get-started)
+    -  File synchronization required for developer mode—use one of the following:
+       -  [docker-sync](https://docker-sync.readthedocs.io/en/latest/getting-started/installation.html)
+       -  [mutagen](https://mutagen.io/documentation/installation/#installation)
 
-Before you begin, you must add the following hostname to your `/etc/hosts` file:
+1.  Update the hosts file.
 
-```
-127.0.0.1 magento2.docker
-```
+    Before you begin, you must add the following hostname to your `/etc/hosts` file:
 
-Alternatively, you can run the following command to add it to the file:
+    ```
+    127.0.0.1 magento2.docker
+    ```
 
-```bash
-echo "127.0.0.1 magento2.docker" | sudo tee -a /etc/hosts
-```
+    Alternatively, you can run the following command to add it to the file:
 
-### Stopping default Apache instance on Mac OS
+    ```bash
+    echo "127.0.0.1 magento2.docker" | sudo tee -a /etc/hosts
+    ```
 
-Because Mac OS provides built-in Apache service, and may occupy port `80`, you must stop the service with the following command:
+1.  Stop the default Apache instance on Mac OS.
 
-```bash
-sudo apachectl stop
-```
+    Because Mac OS provides built-in Apache service, and may occupy port `80`, you must stop the service with the following command:
+
+    ```bash
+    sudo apachectl stop
+    ```
 
-#### To launch Docker:
+1.  Optionally, [enable Xdebug]({{page.baseurl}}/cloud/docker/docker-development-debug.html#enable-xdebug).
+
+## Launch the Docker environment
 
 1.  Download a Magento application template from the [Magento Cloud repository](https://github.com/magento/magento-cloud). Be careful to select the branch that corresponds with the Magento version.
 
@@ -110,7 +116,7 @@ Continue launching your Docker environment in the default _production_ mode.
 1.  _Optional_: If you have a custom PHP configuration file, copy the default configuration DIST file to your custom configuration file and make any necessary changes.
 
     ```bash
-    cp docker/config.php.dist docker/config.php
+    cp .docker/config.php.dist .docker/config.php
     ```
 
     Convert custom PHP configuration files to Docker ENV files.
@@ -121,12 +127,12 @@ Continue launching your Docker environment in the default _production_ mode.
 
     This generates the following Docker ENV files:
 
-    * `docker/config.env`
+    * `.docker/config.env`
 
     {: .bs-callout .bs-callout-info}
     The `{{site.data.var.ct}}` version 2002.0.12 package does not support the `docker:config:convert` command.
 
-1.  _Optional_: Configure the Docker global variables in the `docker-compose.yml` file. For example, you can [enable and configure Xdebug]({{ page.baseurl }}/cloud/docker/docker-development-debug.html).
+1.  _Optional_: Configure the Docker global variables in the `docker-compose.yml` file. For example, you can [configure Xdebug]({{ page.baseurl }}/cloud/docker/docker-development-debug.html#configure-xdebug).
 
 1.  Build files to containers and run in the background.
 
@@ -138,15 +144,15 @@ Continue launching your Docker environment in the default _production_ mode.
 
     - Build Magento in the Docker container:
 
-        ```bash
-        docker-compose run build cloud-build
-        ```
+      ```bash
+      docker-compose run build cloud-build
+      ```
 
     - Deploy Magento in the Docker container:
 
-        ```bash
-        docker-compose run deploy cloud-deploy
-        ```
+      ```bash
+      docker-compose run deploy cloud-deploy
+      ```
 
     {: .bs-callout .bs-callout-info}
     For `{{site.data.var.ct}}` v2002.0.12, install Magento with the `docker-compose run cli magento-installer` command.
@@ -184,7 +190,7 @@ The `{{site.data.var.ct}}` version 2002.0.18 and later supports developer mode.
 1.  _Optional_: If you have a custom PHP configuration file, copy the default configuration DIST file to your custom configuration file and make any necessary changes.
 
     ```bash
-    cp docker/config.php.dist docker/config.php
+    cp .docker/config.php.dist .docker/config.php
     ```
 
     Convert custom PHP configuration files to Docker ENV files.
@@ -195,16 +201,24 @@ The `{{site.data.var.ct}}` version 2002.0.18 and later supports developer mode.
 
     This generates the following Docker ENV files:
 
-    * `docker/config.env`
+    * `.docker/config.env`
 
 1.  _Optional_: Configure the Docker global variables in the `docker-compose.yml` file. For example, you can [enable and configure Xdebug]({{ page.baseurl }}/cloud/docker/docker-development-debug.html).
 
 1.  Start the file synchronization.
 
+    For the `docker-sync` tool:
+
     ```bash
     docker-sync start
     ```
 
+    For the `mutagen` tool:
+
+    ```bash
+    bash ./mutagen.sh 
+    ```
+
 1.  Build files to containers and run in the background.
 
     ```bash
@@ -272,11 +286,11 @@ docker-sync stop
 
 ## Advanced usage
 
-### Extending docker-compose.yml configuration
+### Extend the Docker configuration
 
-You can use Docker's built-in [extension mechanism](https://docs.docker.com/compose/reference/overview/#specifying-multiple-compose-files).
+You can use the built-in extension mechanism of Docker to [specify multiple compose files](https://docs.docker.com/compose/reference/overview/#specifying-multiple-compose-files). The following example replaces the default value of the `ENABLE_SENDMAIL` environment variable.
 
-1.  Create a `docker-compose-dev.yml` file inside your project's root directory and add the following content:
+1.  Create a `docker-compose-dev.yml` file inside your project root directory and add the following content:
 
     ```yaml
     version: '2'
@@ -286,8 +300,6 @@ You can use Docker's built-in [extension mechanism](https://docs.docker.com/comp
           - ENABLE_SENDMAIL=true
     ```
 
-    This replaces the default value of the `ENABLE_SENDMAIL` environment variable.
-
 1.  Pass both configuration files while executing your commands. For example:
 
     ```bash

guides/v2.1/cloud/docker/docker-database.md

@@ -7,9 +7,9 @@ functional_areas:
   - Configuration
 ---
 
-There are two ways to connect to the database. Before you begin, you can find the database credentials in the `database` section of the `docker/config.php` file. The examples use the following default credentials:
+There are two ways to connect to the database. Before you begin, you can find the database credentials in the `database` section of the `.docker/config.php` file. The examples use the following default credentials:
 
-> Filename: `docker/config.php`
+> Filename: `.docker/config.php`
 
 ```php?start_inline=1
 return [
@@ -85,4 +85,4 @@ return [
     | 10.0.38-MariaDB-1~xenial |
     +--------------------------+
     ```
-    {: .no-copy}
+    {: .no-copy}

guides/v2.1/cloud/docker/docker-development-debug.md

@@ -18,29 +18,43 @@ If you use Microsoft Windows, take the following steps before continuing:
 
 ## Enable Xdebug
 
-To enable Xdebug, you must configure your `docker-compose.yaml` file at the time you configure your local workstation to [Launch Docker]({{ page.baseurl }}/cloud/docker/docker-config.html).
+To enable Xdebug for your project, add `xdebug` to the `runtime:extensions` section of the `.magento.app.yaml` file.
 
 ```yaml
-generic:
-  image: alpine
-  environment:
-    - PHP_MEMORY_LIMIT=2048M
-    - DEBUG=false
-    - ENABLE_SENDMAIL=false
-    - UPLOAD_MAX_FILESIZE=64M
-    - MAGENTO_ROOT=/app
-    - PHP_ENABLE_XDEBUG=false
-    - PHP_IDE_CONFIG=serverName=magento_cloud_docker
-    - XDEBUG_CONFIG=remote_host=host.docker.internal
-  env_file:
-    - ./docker/config.env
+runtime:
+    extensions:
+        - redis
+        - xsl
+        - json
+        - blackfire
+        - newrelic
+        - xdebug
 ```
 
-You can change any Xdebug configuration using the`XDEBUG_CONFIG` option. For example, to change the `xdebug.remote_port` option:
+## Configure Xdebug
 
-```yaml
-XDEBUG_CONFIG='remote_host=host.docker.internal remote_port=9002'
-```
+1.  Rebuild the `docker-compose.yml` file by continuing to configure your local workstation to [launch the Docker environment]({{ page.baseurl }}/cloud/docker/docker-config.html). The following is an excerpt from the `docker-compose.yml` file that shows Docker global variables.
+
+    ```yaml
+    generic:
+      image: alpine
+      environment:
+        - PHP_MEMORY_LIMIT=2048M
+        - UPLOAD_MAX_FILESIZE=64M
+        - MAGENTO_ROOT=/app
+        - PHP_IDE_CONFIG=serverName=magento_cloud_docker
+        - XDEBUG_CONFIG=remote_host=host.docker.internal
+        - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl xdebug'
+      env_file:
+        - ./.docker/config.env
+    ```
+    {:.no-copy}
+
+1.  Change any Xdebug configuration using the`XDEBUG_CONFIG` option. For example, to change the `xdebug.remote_port` option:
+
+    ```yaml
+    XDEBUG_CONFIG='remote_host=host.docker.internal remote_port=9002'
+    ```
 
 #### To configure PhpStorm to work with Xdebug:
 
@@ -68,7 +82,7 @@ XDEBUG_CONFIG='remote_host=host.docker.internal remote_port=9002'
 
 1.  Click **Apply**.
 
-## Using Xdebug
+## Use Xdebug
 
 The following steps describe debugging web requests and CLI commands.