Merge branch 'master' into small-changes

Author: keharper

src/_data/toc/configuration-guide.yml

@@ -353,6 +353,9 @@ pages:
         - label: Set up optional database replication
           url: /config-guide/multi-master/multi-master_slavedb.html
 
+    - label: Revert from a split database to a single database
+      url: /config-guide/revert-split-database.html
+
     - label: Custom Logging
       url: /config-guide/log/log-intro.html
       children:

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

@@ -218,6 +218,8 @@ The Test container, based on the [magento/magento-cloud-docker-php][php-cloud] D
 **Docker base image**: [magento/magento-cloud-docker-nginx:1.19-1.2.0][tls]<br>
 **Ports**: `443` (default), `8080:80` (Varnish bypass)<br/>
 
+By default, the TLS container is included with the Docker Compose configuration. However, you can generate a configuration without TLS by adding the `--no-tls` option to the `ece-docker build:compose` command.
+
 The TLS termination proxy container facilitates the Varnish SSL termination over HTTPS.
 
 -  The default port for TLS communication is `443`.
@@ -267,6 +269,11 @@ docker-compose exec varnish varnishadm ban req.url '~' '.'
 
 The Web container uses NGINX to handle web requests after TLS and Varnish. This container passes all requests to the FPM container to serve the PHP code. See [Request flow]({{site.baseurl}}/cloud/docker/docker-containers.html#request-flow).
 
+This container provides two NGINX configuration options for building the Docker configuration:
+
+-  `--nginx-worker-processes` to set the number of worker processes for NGINX. The default is `1`.
+-  `--nginx-worker-connections` to set the maximum number of connections that each worker process can handle simultaneously. The default is `1024`.
+
 The NGINX configuration for this container is the standard Magento [nginx config], which includes the configuration to auto-generate NGINX certificates for the container. You can customize the NGINX configuration by mounting a new configuration file using a volume.
 
 {:.procedure}

src/cloud/docker/docker-containers.md

@@ -53,9 +53,9 @@ The following table shows the options to customize service container configurati
 | [redis][redis-container] | Redis     | `--redis` | 3.2, 4.0, 5.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` | 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).
+| [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.
 | [varnish][varnish-container] | Varnish | `--no-varnish` | 4, 6.2 | Varnish is provisioned by default. Use the `--no-varnish` option to skip Varnish service installation.
-| [web][web-container] | NGINX | `--nginx` | 1.19-1.2.0, latest | Use the `--nginx` option to install a specific nginx version.
+| [web][web-container] | NGINX | `--nginx`<br/>`--nginx-worker-processes`<br/>`--nginx-worker-connections` | 1.19-1.2.1, latest | Use the `--nginx` option to install a specific nginx version.<br/>Use the `--nginx-worker-processes` option to define the number of NGINX worker processes. The default is 1.<br/>Use the `--nginx-worker-connections` option to define the maximum number of connections that each worker process can handle simultaneously. The default is 1024 NGINX worker connections per process.
 
 Use the following command to view all available options for the `ece-docker build:compose` command:
 

src/cloud/docker/docker-quick-reference.md

@@ -54,60 +54,6 @@ View the available options for the `ece-docker build:compose` command:
 php ./vendor/bin/ece-docker build:compose -h
 ```
 
-```terminal
-Description:
-  Build docker configuration
-
-Usage:
-  build:compose [options]
-
-Options:
-      --php=PHP                                        PHP version
-      --nginx=NGINX                                    Nginx version
-      --db=DB                                          DB version
-      --db-image=DB-IMAGE                              DB image
-      --expose-db-port=EXPOSE-DB-PORT                  Expose DB port
-      --expose-db-quote-port=EXPOSE-DB-QUOTE-PORT      Expose port for DB sales
-      --expose-db-sales-port=EXPOSE-DB-SALES-PORT      Expose port for DB quote
-      --with-entrypoint                                Add DB entrypoint volume
-      --with-mariadb-conf                              Add MariaDb config volume
-      --redis=REDIS                                    Redis version
-      --es=ES                                          Elasticsearch version
-      --rmq=RMQ                                        RabbitMQ version
-      --node=NODE                                      Node.js version
-      --selenium-version=SELENIUM-VERSION              Selenium version
-      --selenium-image=SELENIUM-IMAGE                  Selenium image
-      --no-es                                          Disable Elasticsearch
-      --no-mailhog                                     Disable MailHog
-      --mailhog-http-port                              Custom HTTP port for MailHog
-      --mailhog-smtp-port                              Custom SMTP port for MailHog
-      --set-docker-host                                Sets host.docker.internal for fpm_xdebug container to
-                                                       resolve debug issue for LINUX system
-  -m, --mode=MODE                                      Mode of environment (developer, production)
-      --sync-engine=SYNC-ENGINE                        File sync engine. Works only with developer mode. Available: (docker-sync, mutagen, native)
-      --with-cron                                      Add cron container
-      --no-varnish                                     Remove Varnish container
-      --with-selenium                                  Add Selenium latest version
-      --with-test                                      Add container for running tests
-      --no-tmp-mounts                                  Remove /tmp mounted volume
-      --with-xdebug                                    Enables XDebug
-      --env-vars[=ENV-VARS]                            Cloud environment variables
-      --installation-type[=INSTALLATION-TYPE]          Sets magento installation type [default: "composer"]
-      --host[=HOST]                                    Host name
-      --port[=PORT]                                    Port
-      --tls-port                                       TLS port
-      --es-env-var=ES-ENV-VAR                          Environment variable for elasticsearch service (multiple values allowed)
-      --db-increment-increment=DB-INCREMENT-INCREMENT  "auto_increment_increment" database variable
-      --db-increment-offset=DB-INCREMENT-OFFSET        "auto_increment_offset" database variable
-  -h, --help                                           Display this help message
-  -q, --quiet                                          Do not output any message
-  -V, --version                                        Display this application version
-      --ansi                                           Force ANSI output
-      --no-ansi                                        Disable ANSI output
-  -n, --no-interaction                                 Do not ask any interactive question
-  -v|vv|vvv, --verbose                                 Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
-  ```
-
 {:.bs-callout-info}
 See [Service versions] for additional information about the service configuration options for the `ece-docker build:compose` command.
 

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

@@ -16,6 +16,32 @@ The release notes include:
 -  {:.new}New features
 -  {:.fix}Fixes and improvements
 
+## v1.2.1
+*Release date: December 21, 2020*<br/>
+
+-  {:.new}<!--MCLOUD-7259-->**NGINX command options**–Added build command options to change the number of NGINX `worker_processes` and NGINX `worker_connections` for TLS and Web services. The `worker_process` parameter retains the ability to set the value to `auto`. Examples:
+
+    ```terminal
+    ./vendor/bin/ece-docker build:compose --nginx-worker-processes=2
+    ./vendor/bin/ece-docker build:compose --nginx-worker-connections=2048
+    ```
+
+-  {:.new}<!--MCLOUD-7259-->**TLS command option**–Added build command option to create a configuration without the TLS service. Example:
+
+   ```terminal
+   ./vendor/bin/ece-docker build:compose --no-tls
+   ```
+
+-  {:.new}<!--MCLOUD-7259-->**NGINX memory consumption**–Reduced the memory consumed by the NGINX process for TLS and Web services.
+
+-  {:.new}<!--No ticket -->**Blackfire**–Disabled Blackfire PHP extension by default in the Cloud Docker image.
+
+-  {:.fix}<!--MCLOUD-7232-->**PHP-FPM container**–Fixed PHP-FPM container health check by changing the `WEB_PORT` from `80` to `8080`.
+
+-  {:.fix}<!--MCLOUD-7442-->**Invalid volume naming**–Fixed an error with invalid volume naming in developer mode.
+
+-  {:.fix}<!--Issue 295-->**NGINX upstream port**—Updated the Docker NGINX 1.19 image to use port 8080 to avoid an infinite loop. *[Fix submitted by Adarsh Manickam](https://github.com/magento/magento-cloud-docker/pull/296).*
+
 ## v1.2.0
 *Release date: November 9, 2020*<br/>
 

src/guides/v2.3/config-guide/revert-split-database.md

@@ -0,0 +1,66 @@
+---
+group: configuration-guide
+title: Revert from a split database to a single database
+ee_only: true
+functional_areas:
+  - Configuration
+  - System
+  - Setup
+---
+
+For {{ site.data.var.ee }} customers who have implemented [Split Database]({{ page.baseurl }}/config-guide/multi-master/multi-master.html), the following topic describes how to revert or migrate back to a single database. We recommend that {{ site.data.var.ee }} merchants currently using Split Database who are upgrading to 2.4.2 and above review these steps, as well as our [announcement](https://community.magento.com/t5/Magento-DevBlog/Deprecation-of-Split-Database-in-Magento-Commerce/ba-p/465187) on the planned deprecation of Split Database.
+
+Reverting from a split database to a single database implementation involves creating backups of the `magento_quote` and `magento_sales` databases before loading them into the single `magento_main` database.
+
+In this example, we log in to all three databases, which are installed on the same host (`magento2-mysql`) as the "root" user. You must replace these values with the appropriate values for your databases.
+
+1. Create a backup of the `magento_quote` database:
+
+   ```bash
+   mysqldump -h "magento2-mysql" -u root -p magento_quote > ./quote.sql
+   ```
+
+1. Create a backup of the `magento_sales` database:
+
+   ```bash
+   mysqldump -h "magento2-mysql" -u root -p magento_sales > ./sales.sql
+   ```
+
+1. Load the `magento_quote` database into the `magento_main` database:
+
+   ```bash
+   mysql -h "magento2-mysql" -u root -p magento_main < ./quote.sql
+   ```
+
+1. Load the `magento_sales` database into the `magento_main` database:
+
+   ```bash
+   mysql -h "magento2-mysql" -u root -p magento_main < ./sales.sql
+   ```
+
+1. Drop the `magento_sales` database:
+
+   ```bash
+   mysql -h "magento2-mysql" -u root -p -e "DROP DATABASE magento_sales;"
+   ```
+
+1. Drop the `magento_quote` database:
+
+   ```bash
+   mysql -h "magento2-mysql" -u root -p -e "DROP DATABASE magento_quote;"
+   ```
+
+1. Remove the deployment configuration for `checkout` and `sales` in the `connections` and `resources` sections of the `env.php` file.
+1. Restore foreign keys:
+
+   ```bash
+   bin/magento setup:upgrade
+   ```
+
+## Verify your work
+
+To verify that your single database implementation is working properly, perform the following tasks and verify that data is added to the `magento_main` database tables using a database tool like [phpMyAdmin]({{ page.baseurl }}/install-gde/prereq/optional.html#install-optional-phpmyadmin):
+
+1. Verify that foreign keys have been restored. For example, the `QUOTE_STORE_ID_STORE_STORE_ID` key in the `quote` database table.
+1. Verify that customers can place orders from the storefront.
+1. Verify that orders created before reverting the split database to a single database are available in the Admin.

src/guides/v2.3/extension-dev-guide/proxies.md

@@ -73,3 +73,13 @@ With the proxy used in place of `SlowLoading`, the `SlowLoading` class will not
 Because DI configuration is used to inject a proxy, proxies can be dropped in to replace their corresponding classes - or proxy replacements _removed_ - without touching application code.
 
 As a practical example of a proxy, you can see the [StoreManager]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Store/Model/StoreManager.php){:target="_blank"} class and then see the generated `StoreManager` proxy class.
+
+The following excerpt from the Magento code passes the `storeManager` argument as a proxy to the `Magento\Store\Model\Resolver\Store` class. The `StoreManagerInterface` model is defined as a proxy class by the added `Proxy` at the end of the original class in the `di.xml` file.
+
+```xml
+<type name="Magento\Store\Model\Resolver\Store">
+    <arguments>
+        <argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
+    </arguments>
+</type>
+```

src/guides/v2.4/config-guide/revert-split-database.md

@@ -0,0 +1 @@
+../../v2.3/config-guide/revert-split-database.md