From aafbb3badb369ee90bd8cbda713e5440d22a1c54 Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 10:54:07 -0700 Subject: [PATCH 01/16] Update installing-nginx-docker.md Removed gerunds from headings and also fixed capitalization. --- .../installing-nginx-docker.md | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 58c62d2c8..9f6f2466d 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -24,7 +24,7 @@ type: -## Using official NGINX Plus Docker images +## Use Official NGINX Plus Docker Images Since NGINX Plus NGINX Plus [Release 31]({{< ref "nginx/releases.md#r31" >}}) you can get an NGINX Plus image from the official NGINX Plus Docker registry and upload it to your private registry. @@ -46,7 +46,7 @@ The registry contains the following image types: The images can be targeted for a particular operating system and NGINX Plus release using tags. -### Tags for operating systems +### Tags for Operating Systems {{}} | Operating system | Basic OS tag | Tag examples | @@ -56,7 +56,7 @@ The images can be targeted for a particular operating system and NGINX Plus rele | Red Hat Enterprise Linux (x86_64, aarch64) | `ubi` | `r33-ubi`, `r33-ubi-9`, `r33-ubi-9-20240624` | {{}} -### Tags for NGINX Plus versions +### Tags for NGINX Plus Versions The NGINX Plus registry contains images for the two most recent versions of NGINX Plus. The basic operating system tag returns the latest version of NGINX Plus built for the latest version of this operating system. @@ -66,7 +66,7 @@ The NGINX Plus registry contains images for the two most recent versions of NGIN The image may contain a particular version of NGINX Plus or contain a bundle of NGINX Plus and NGINX Agent, and can be targeted for a specific architecture. -### Listing all tags +### List All Tags For a complete tag list for NGINX Plus bundled with NGINX Agent images, use the command: @@ -90,7 +90,7 @@ where: -### Downloading the JSON Web Token or NGINX Plus certificate and key {#myf5-download} +### Download the JSON Web Token or NGINX Plus Certificate and Key {#myf5-download} Before you get a container image, you should provide the JSON Web Token file or SSL certificate and private key files provided with your NGINX Plus subscription. These files grant access to the package repository from which the script will download the NGINX Plus package: @@ -109,7 +109,7 @@ Before you get a container image, you should provide the JSON Web Token file or {{% /tabs %}} -### Set up Docker for NGINX Plus Container Registry +### Set Up Docker for NGINX Plus Container Registry Set up Docker to communicate with the NGINX Container Registry located at `private-registry.nginx.com`. @@ -144,7 +144,7 @@ docker login private-registry.nginx.com {{% /tabs %}} -### Pulling the image +### Pull the Image Next, pull the image you need from `private-registry.nginx.com`. @@ -183,7 +183,7 @@ docker pull private-registry.nginx.com/nginx-plus/modules: {{< include "security/jwt-password-note.md" >}} -### Pushing the image to your private registry +### Push the Image to Your Private Registry After pulling the image, tag it and upload it to your private registry. @@ -205,7 +205,7 @@ docker tag private-registry.nginx.com/nginx-plus/base: /nginx-plus/base: ``` -### Running the NGINX Plus container +### Run the NGINX Plus Container {{< note >}} Starting from [NGINX Plus Release 33]({{< ref "nginx/releases.md#r33" >}}), the JWT file is required for each NGINX Plus instance. For more information, see [About Subscription Licenses]({{< ref "/solutions/about-subscription-licenses.md">}}). {{< /note >}} @@ -390,7 +390,7 @@ Any change made to the files in the local directories `/var/www and /var/nginx/c -### Copying Content and Configuration Files from the Docker Host +### Copy Content and Configuration Files from the Docker Host Docker can copy the content and configuration files from a local directory on the Docker host during container creation. Once a container is created, the files are maintained by creating a new container when files change or by modifying the files in the container. @@ -421,7 +421,7 @@ To make changes to the files in the container, use a helper container as describ -### Maintaining Content and Configuration Files in the Container +### Maintain Content and Configuration Files in the Container As SSH cannot be used to access the NGINX container, to edit the content or configuration files directly you need to create a helper container that has shell access. For the helper container to have access to the files, create a new image that has the proper Docker data volumes defined for the image: @@ -476,12 +476,12 @@ To exit the shell and terminate the container, run the `exit` command. -## Managing Logging +## Manage Logging You can use default logging or customize logging. -### Using Default Logging +### Use Default Logging By default, the NGINX image is configured to send NGINX [access log](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log) and [error log](https://nginx.org/en/docs/ngx_core_module.html#error_log) to the Docker log collector. This is done by linking them to `stdout` and `stderr`: all messages from both logs are then written to the file `/var/lib/docker/containers/container-ID/container-ID-json.log` on the Docker host. The container‑ID is the long‑form ID returned when you [create a container](#docker_oss_image). To display the long form ID, run the command: @@ -507,7 +507,7 @@ To include only access log messages in the output, include only `stdout=1`. To l -### Using Customized Logging +### Use Customized Logging If you want to configure logging differently for certain configuration blocks (such as `server {}` and `location {}`), define a Docker volume for the directory in which to store the log files in the container, create a helper container to access the log files, and use any logging tools. To implement this, create a new image that contains the volume or volumes for the logging files. @@ -524,7 +524,7 @@ Then you can [create an image](#docker_plus_image) and use it to create an NGINX -## Controlling NGINX +## Control NGINX Since there is no direct access to the command line of the NGINX container, NGINX commands cannot be sent to a container directly. Instead, [signals](https://nginx.org/en/docs/control.html) can be sent to a container via Docker `kill` command. From 1d3c67c37c68f566eb7c77d8672001482aaf5c6d Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:03:18 -0700 Subject: [PATCH 02/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Agreed per our discussion! Co-authored-by: Mike Jang <3287976+mjang@users.noreply.github.com> --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 9f6f2466d..430a3db22 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -24,7 +24,7 @@ type: -## Use Official NGINX Plus Docker Images +## Use official NGINX Plus Docker images Since NGINX Plus NGINX Plus [Release 31]({{< ref "nginx/releases.md#r31" >}}) you can get an NGINX Plus image from the official NGINX Plus Docker registry and upload it to your private registry. From 5007c88192ebd5e755fb645c3c593eaeb550663e Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:09:38 -0700 Subject: [PATCH 03/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 430a3db22..8469f64c1 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -46,7 +46,7 @@ The registry contains the following image types: The images can be targeted for a particular operating system and NGINX Plus release using tags. -### Tags for Operating Systems +### Tags for operating systems {{}} | Operating system | Basic OS tag | Tag examples | From 970f5865298fc3edc16cb388c02e180fc007ecbb Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:13:52 -0700 Subject: [PATCH 04/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 8469f64c1..e2aeff945 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -90,7 +90,7 @@ where: -### Download the JSON Web Token or NGINX Plus Certificate and Key {#myf5-download} +### Download the JSON Web Token or NGINX Plus certificate and key {#myf5-download} Before you get a container image, you should provide the JSON Web Token file or SSL certificate and private key files provided with your NGINX Plus subscription. These files grant access to the package repository from which the script will download the NGINX Plus package: From 81bf800de9cfe8e851008fe8228e1f6d4c06685c Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:14:07 -0700 Subject: [PATCH 05/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index e2aeff945..90ffda8a8 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -144,7 +144,7 @@ docker login private-registry.nginx.com {{% /tabs %}} -### Pull the Image +### Pull the image Next, pull the image you need from `private-registry.nginx.com`. From 1ba637ef0192aefa9638d2b9211f1af9bedf9786 Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:14:39 -0700 Subject: [PATCH 06/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 90ffda8a8..0a8cc72f9 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -109,7 +109,7 @@ Before you get a container image, you should provide the JSON Web Token file or {{% /tabs %}} -### Set Up Docker for NGINX Plus Container Registry +### Set Up Docker for NGINX Plus container registry Set up Docker to communicate with the NGINX Container Registry located at `private-registry.nginx.com`. From cc541f4b5ad2d55e67f68e06c9b2507091d675de Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:14:49 -0700 Subject: [PATCH 07/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 0a8cc72f9..044e7e927 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -56,7 +56,7 @@ The images can be targeted for a particular operating system and NGINX Plus rele | Red Hat Enterprise Linux (x86_64, aarch64) | `ubi` | `r33-ubi`, `r33-ubi-9`, `r33-ubi-9-20240624` | {{}} -### Tags for NGINX Plus Versions +### Tags for NGINX Plus versions The NGINX Plus registry contains images for the two most recent versions of NGINX Plus. The basic operating system tag returns the latest version of NGINX Plus built for the latest version of this operating system. From 61e8902086f95bd3e400da4dff4e888e1b7bc336 Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:14:58 -0700 Subject: [PATCH 08/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 044e7e927..1373aa277 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -66,7 +66,7 @@ The NGINX Plus registry contains images for the two most recent versions of NGIN The image may contain a particular version of NGINX Plus or contain a bundle of NGINX Plus and NGINX Agent, and can be targeted for a specific architecture. -### List All Tags +### List all tags For a complete tag list for NGINX Plus bundled with NGINX Agent images, use the command: From 23f338a7f7840ddaa09e13c5a33d6508d9f16c18 Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:15:13 -0700 Subject: [PATCH 09/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 1373aa277..2541c1f3a 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -183,7 +183,7 @@ docker pull private-registry.nginx.com/nginx-plus/modules: {{< include "security/jwt-password-note.md" >}} -### Push the Image to Your Private Registry +### Push the image to your private registry After pulling the image, tag it and upload it to your private registry. From 7452ab5b22f6930d419c00b65e46ac28d2989441 Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:15:22 -0700 Subject: [PATCH 10/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 2541c1f3a..74049a1ea 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -390,7 +390,7 @@ Any change made to the files in the local directories `/var/www and /var/nginx/c -### Copy Content and Configuration Files from the Docker Host +### Copy content and configuration files from the Docker host Docker can copy the content and configuration files from a local directory on the Docker host during container creation. Once a container is created, the files are maintained by creating a new container when files change or by modifying the files in the container. From 964f34b8f81b5adf9f638bdad190fd9c8c7a0c5a Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:15:30 -0700 Subject: [PATCH 11/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 74049a1ea..bf226470f 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -421,7 +421,7 @@ To make changes to the files in the container, use a helper container as describ -### Maintain Content and Configuration Files in the Container +### Maintain content and configuration files in the container As SSH cannot be used to access the NGINX container, to edit the content or configuration files directly you need to create a helper container that has shell access. For the helper container to have access to the files, create a new image that has the proper Docker data volumes defined for the image: From 394a73eb17c3e1a57f2e5e91938f58c4ca664bbc Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:15:38 -0700 Subject: [PATCH 12/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index bf226470f..a5f8053b2 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -476,7 +476,7 @@ To exit the shell and terminate the container, run the `exit` command. -## Manage Logging +## Manage logging You can use default logging or customize logging. From 19eeb15f4b2466324e543303a0ce5128cf7f301d Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:15:46 -0700 Subject: [PATCH 13/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index a5f8053b2..95b75230b 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -481,7 +481,7 @@ To exit the shell and terminate the container, run the `exit` command. You can use default logging or customize logging. -### Use Default Logging +### Use default logging By default, the NGINX image is configured to send NGINX [access log](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log) and [error log](https://nginx.org/en/docs/ngx_core_module.html#error_log) to the Docker log collector. This is done by linking them to `stdout` and `stderr`: all messages from both logs are then written to the file `/var/lib/docker/containers/container-ID/container-ID-json.log` on the Docker host. The container‑ID is the long‑form ID returned when you [create a container](#docker_oss_image). To display the long form ID, run the command: From d88dd93e354b60a378b7ce253c44184ad0c9c6e8 Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:15:56 -0700 Subject: [PATCH 14/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 95b75230b..2e559befb 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -507,7 +507,7 @@ To include only access log messages in the output, include only `stdout=1`. To l -### Use Customized Logging +### Use customized logging If you want to configure logging differently for certain configuration blocks (such as `server {}` and `location {}`), define a Docker volume for the directory in which to store the log files in the container, create a helper container to access the log files, and use any logging tools. To implement this, create a new image that contains the volume or volumes for the logging files. From 480376781eb81078b69d6981f6d071f98ce08ca5 Mon Sep 17 00:00:00 2001 From: apgordon312 Date: Sun, 4 May 2025 14:17:40 -0700 Subject: [PATCH 15/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md Committing change from title case to sentence case. --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 2e559befb..2e5c58a5f 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -205,7 +205,7 @@ docker tag private-registry.nginx.com/nginx-plus/base: /nginx-plus/base: ``` -### Run the NGINX Plus Container +### Run the NGINX Plus container {{< note >}} Starting from [NGINX Plus Release 33]({{< ref "nginx/releases.md#r33" >}}), the JWT file is required for each NGINX Plus instance. For more information, see [About Subscription Licenses]({{< ref "/solutions/about-subscription-licenses.md">}}). {{< /note >}} From d2f0bbaa33fbb52ff8f7c86fdb687aa54a655ae1 Mon Sep 17 00:00:00 2001 From: Mike Jang <3287976+mjang@users.noreply.github.com> Date: Mon, 5 May 2025 07:40:16 -0700 Subject: [PATCH 16/16] Update content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md --- .../admin-guide/installing-nginx/installing-nginx-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md index 2e5c58a5f..503f4eb27 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -109,7 +109,7 @@ Before you get a container image, you should provide the JSON Web Token file or {{% /tabs %}} -### Set Up Docker for NGINX Plus container registry +### Set up Docker for NGINX Plus container registry Set up Docker to communicate with the NGINX Container Registry located at `private-registry.nginx.com`.