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

Commit abf7cd6

Browse files
bdenhammeker12
bdenham
and
meker12
authored
Cloud Docker release 1.2.1 (#8429)
* Cloud Docker release notes 1.2.1 (#8404) * WIP release notes * Apply suggestions from code review Co-authored-by: Margaret Eker <meker@adobe.com> * MCLOUD-7447: Release notes and documentation for cloud docker 1.2.1 * MCLOUD-7447: Updated based on reviews Co-authored-by: Margaret Eker <meker@adobe.com> * MCLOUD-7447: Cloud Docker 1.2.1 release docs and notes-Reviewed. * Update src/cloud/docker/docker-containers-service.md Co-authored-by: Margaret Eker <meker@adobe.com> * Update src/cloud/docker/docker-containers-service.md Co-authored-by: Margaret Eker <meker@adobe.com> * Update src/cloud/release-notes/mcd-release-notes.md Co-authored-by: Margaret Eker <meker@adobe.com> * Update src/cloud/release-notes/mcd-release-notes.md Co-authored-by: Margaret Eker <meker@adobe.com> * Update src/cloud/release-notes/mcd-release-notes.md Co-authored-by: Margaret Eker <meker@adobe.com> * Update src/cloud/docker/docker-containers-service.md Co-authored-by: Margaret Eker <meker@adobe.com> Co-authored-by: Margaret Eker <meker@adobe.com>
1 parent 831e45d commit abf7cd6

File tree

4 files changed

+33
-56
lines changed

4 files changed

+33
-56
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ The Test container, based on the [magento/magento-cloud-docker-php][php-cloud] D
218218
**Docker base image**: [magento/magento-cloud-docker-nginx:1.19-1.2.0][tls]<br>
219219
**Ports**: `443` (default), `8080:80` (Varnish bypass)<br/>
220220

221+
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.
222+
221223
The TLS termination proxy container facilitates the Varnish SSL termination over HTTPS.
222224

223225
- The default port for TLS communication is `443`.
@@ -267,6 +269,11 @@ docker-compose exec varnish varnishadm ban req.url '~' '.'
267269

268270
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).
269271

272+
This container provides two NGINX configuration options for building the Docker configuration:
273+
274+
- `--nginx-worker-processes` to set the number of worker processes for NGINX. The default is `1`.
275+
- `--nginx-worker-connections` to set the maximum number of connections that each worker process can handle simultaneously. The default is `1024`.
276+
270277
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.
271278

272279
{:.procedure}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ The following table shows the options to customize service container configurati
5353
| [redis][redis-container] | Redis | `--redis` | 3.2, 4.0, 5.0 | Standard redis container
5454
| [selenium][selenium-container]| Selenium | `--with-selenium`<br>`--selenium-version`<br>`--selenium-image`| Any | Enables Magento application testing using the Magento Functional Testing Framework (MFTF)
5555
| [test][test-container]| PHP CLI | `--with-test`| Any | Optional container with a writable file system for running tests
56-
| [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).
56+
| [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.
5757
| [varnish][varnish-container] | Varnish | `--no-varnish` | 4, 6.2 | Varnish is provisioned by default. Use the `--no-varnish` option to skip Varnish service installation.
58-
| [web][web-container] | NGINX | `--nginx` | 1.19-1.2.0, latest | Use the `--nginx` option to install a specific nginx version.
58+
| [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.
5959

6060
Use the following command to view all available options for the `ece-docker build:compose` command:
6161

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

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -54,60 +54,6 @@ View the available options for the `ece-docker build:compose` command:
5454
php ./vendor/bin/ece-docker build:compose -h
5555
```
5656

57-
```terminal
58-
Description:
59-
Build docker configuration
60-
61-
Usage:
62-
build:compose [options]
63-
64-
Options:
65-
--php=PHP PHP version
66-
--nginx=NGINX Nginx version
67-
--db=DB DB version
68-
--db-image=DB-IMAGE DB image
69-
--expose-db-port=EXPOSE-DB-PORT Expose DB port
70-
--expose-db-quote-port=EXPOSE-DB-QUOTE-PORT Expose port for DB sales
71-
--expose-db-sales-port=EXPOSE-DB-SALES-PORT Expose port for DB quote
72-
--with-entrypoint Add DB entrypoint volume
73-
--with-mariadb-conf Add MariaDb config volume
74-
--redis=REDIS Redis version
75-
--es=ES Elasticsearch version
76-
--rmq=RMQ RabbitMQ version
77-
--node=NODE Node.js version
78-
--selenium-version=SELENIUM-VERSION Selenium version
79-
--selenium-image=SELENIUM-IMAGE Selenium image
80-
--no-es Disable Elasticsearch
81-
--no-mailhog Disable MailHog
82-
--mailhog-http-port Custom HTTP port for MailHog
83-
--mailhog-smtp-port Custom SMTP port for MailHog
84-
--set-docker-host Sets host.docker.internal for fpm_xdebug container to
85-
resolve debug issue for LINUX system
86-
-m, --mode=MODE Mode of environment (developer, production)
87-
--sync-engine=SYNC-ENGINE File sync engine. Works only with developer mode. Available: (docker-sync, mutagen, native)
88-
--with-cron Add cron container
89-
--no-varnish Remove Varnish container
90-
--with-selenium Add Selenium latest version
91-
--with-test Add container for running tests
92-
--no-tmp-mounts Remove /tmp mounted volume
93-
--with-xdebug Enables XDebug
94-
--env-vars[=ENV-VARS] Cloud environment variables
95-
--installation-type[=INSTALLATION-TYPE] Sets magento installation type [default: "composer"]
96-
--host[=HOST] Host name
97-
--port[=PORT] Port
98-
--tls-port TLS port
99-
--es-env-var=ES-ENV-VAR Environment variable for elasticsearch service (multiple values allowed)
100-
--db-increment-increment=DB-INCREMENT-INCREMENT "auto_increment_increment" database variable
101-
--db-increment-offset=DB-INCREMENT-OFFSET "auto_increment_offset" database variable
102-
-h, --help Display this help message
103-
-q, --quiet Do not output any message
104-
-V, --version Display this application version
105-
--ansi Force ANSI output
106-
--no-ansi Disable ANSI output
107-
-n, --no-interaction Do not ask any interactive question
108-
-v|vv|vvv, --verbose Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
109-
```
110-
11157
{:.bs-callout-info}
11258
See [Service versions] for additional information about the service configuration options for the `ece-docker build:compose` command.
11359

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,30 @@ The release notes include:
1616
- {:.new}New features
1717
- {:.fix}Fixes and improvements
1818

19+
## v1.2.1
20+
*Release date: December 21, 2020*<br/>
21+
22+
- {:.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:
23+
24+
```terminal
25+
./vendor/bin/ece-docker build:compose --nginx-worker-processes=2
26+
./vendor/bin/ece-docker build:compose --nginx-worker-connections=2048
27+
```
28+
29+
- {:.new}<!--MCLOUD-7259-->**TLS command option**–Added build command option to create a configuration without the TLS service. Example:
30+
31+
```terminal
32+
./vendor/bin/ece-docker build:compose --no-tls
33+
```
34+
35+
- {:.new}<!--MCLOUD-7259-->**NGINX memory consumption**–Reduced the memory consumed by the NGINX process for TLS and Web services.
36+
37+
- {:.new}<!--No ticket -->**Blackfire**–Disabled Blackfire PHP extension by default in the Cloud Docker image.
38+
39+
- {:.fix}<!--MCLOUD-7232-->**PHP-FPM container**–Fixed PHP-FPM container health check by changing the `WEB_PORT` from `80` to `8080`.
40+
41+
- {:.fix}<!--MCLOUD-7442-->**Invalid volume naming**–Fixed an error with invalid volume naming in developer mode.
42+
1943
## v1.2.0
2044
*Release date: November 9, 2020*<br/>
2145

0 commit comments

Comments
 (0)