From d1c14565465036dbef4db9227f1ffa94a0aa0329 Mon Sep 17 00:00:00 2001 From: Jon Cahill-Torre Date: Thu, 3 Jul 2025 17:44:04 +0100 Subject: [PATCH 1/3] fix: add v2 v3 docker pull steps --- ...t-nginx-plus-container-images-to-nginx-one.md | 6 +++--- .../manage-config-sync-groups.md | 7 +------ .../installing-nginx/installing-nginx-docker.md | 16 ++++++++++++++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md b/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md index ffac51180..7e14bf0cf 100644 --- a/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md +++ b/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md @@ -42,13 +42,13 @@ sudo docker login private-registry.nginx.com --username=YOUR_JWT_HERE --password ### Pull the NGINX Plus image -Pull the NGINX Plus image from the private registry. Replace `VERSION_TAG` with the desired version, such as `alpine`, `debian`, or `ubi`. +Pull the NGINX Plus image from the private registry. Replace `` with the desired version, such as `alpine`, `debian`, or `ubi`. ```sh -sudo docker pull private-registry.nginx.com/nginx-plus/agent:VERSION_TAG +docker pull private-registry.nginx.com/nginx-plus/agentv3: ``` -You must specify a version tag. The `latest` tag is not supported. Learn more in the [Deploying NGINX and NGINX Plus on Docker]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}) guide. +You must specify a distribution tag. The `latest` tag is not supported. Learn more in the [Deploying NGINX and NGINX Plus on Docker]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}) guide.
diff --git a/content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md b/content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md index 47cd6a28e..4601f26f4 100644 --- a/content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md +++ b/content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md @@ -162,14 +162,9 @@ When adding a new NGINX instance that is not yet registered with NGINX One, you - From the **OS Type** list, choose the appropriate operating system for your Docker image. - After selecting the OS, run the provided command to pull the Docker image. - **Note**: Subject to availability, you can modify the `agent: ` to match the specific NGINX Plus version, OS type, and OS version you need. For example, you might use `agent: r32-ubi-9`. For more details on version tags and how to pull an image, see [Deploying NGINX and NGINX Plus on Docker]({{< ref "nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}). + **Note**: Subject to availability, you can modify the `agentv3:` to match the specific NGINX Plus version, OS type, and OS version you need. For example, you might use `agentv3:r32-ubi-9`. For more details on version tags and how to pull an image, see [Deploying NGINX and NGINX Plus on Docker]({{< ref "nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}). - - From the **OS Type** list, choose the appropriate operating system for your Docker image. - - After selecting the OS, run the provided command to pull the Docker image. - - **Note**: Subject to availability, you can modify the `agent: ` to match the specific NGINX Plus version, OS type, and OS version you need. For example, you might use `agent: r32-ubi-9`. For more details on version tags and how to pull an image, see [Deploying NGINX and NGINX Plus on Docker]({{< ref "nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}). - 10. Run the provided command, which includes the data plane key, in your NGINX instance terminal to start the Docker container. 11. Select **Done** to complete the process. 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 31c02eebe..b47f900e3 100644 --- a/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md +++ b/content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md @@ -156,24 +156,36 @@ For NGINX Plus, run: docker pull private-registry.nginx.com/nginx-plus/base: ``` -For NGINX Plus with NGINX Agent, run: +For NGINX Plus with NGINX Agent version 2, run: ```shell docker pull private-registry.nginx.com/nginx-plus/agent: ``` +For NGINX Plus with NGINX Agent version 3, run: + +```shell +docker pull private-registry.nginx.com/nginx-plus/agentv3: +``` + For NGINX Plus installed from `nginx` user (rootless installation), run: ```shell docker pull private-registry.nginx.com/nginx-plus/rootless-base: ``` -For NGINX Plus with NGINX Agent installed from `nginx` user (rootless installation), run: +For NGINX Plus with NGINX Agent version 2 installed from `nginx` user (rootless installation), run: ```shell docker pull private-registry.nginx.com/nginx-plus/rootless-agent: ``` +For NGINX Plus with NGINX Agent version 3 installed from `nginx` user (rootless installation), run: + +```shell +docker pull private-registry.nginx.com/nginx-plus/rootless-agentv3: +``` + For NGINX modules, run: ```shell From 6d8d1e3561a8a4bdc4dbab6692f21d19d9b6a857 Mon Sep 17 00:00:00 2001 From: Jon Cahill-Torre Date: Thu, 3 Jul 2025 17:46:59 +0100 Subject: [PATCH 2/3] fix: fix variable anme --- .../connect-nginx-plus-container-images-to-nginx-one.md | 4 ++-- .../config-sync-groups/manage-config-sync-groups.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md b/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md index 7e14bf0cf..1391d9deb 100644 --- a/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md +++ b/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md @@ -62,7 +62,7 @@ sudo docker pull private-registry.nginx.com/nginx-plus/agent:debian ### Start the NGINX Plus container -Start the Docker container to connect it to NGINX One. Replace `YOUR_NGINX_ONE_DATA_PLANE_KEY_HERE` with your data plane key and `VERSION_TAG` with the version tag you pulled. +Start the Docker container to connect it to NGINX One. Replace `YOUR_NGINX_ONE_DATA_PLANE_KEY_HERE` with your data plane key and `version-tag` with the version tag you pulled. **For NGINX Plus R33 or later**: @@ -79,7 +79,7 @@ sudo docker run \ --env=NGINX_AGENT_TLS_ENABLE=true \ --restart=always \ --runtime=runc \ --d private-registry.nginx.com/nginx-plus/agent: +-d private-registry.nginx.com/nginx-plus/agent: ```
diff --git a/content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md b/content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md index 4601f26f4..5db71008b 100644 --- a/content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md +++ b/content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md @@ -162,7 +162,7 @@ When adding a new NGINX instance that is not yet registered with NGINX One, you - From the **OS Type** list, choose the appropriate operating system for your Docker image. - After selecting the OS, run the provided command to pull the Docker image. - **Note**: Subject to availability, you can modify the `agentv3:` to match the specific NGINX Plus version, OS type, and OS version you need. For example, you might use `agentv3:r32-ubi-9`. For more details on version tags and how to pull an image, see [Deploying NGINX and NGINX Plus on Docker]({{< ref "nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}). + **Note**: Subject to availability, you can modify the `agentv3:` to match the specific NGINX Plus version, OS type, and OS version you need. For example, you might use `agentv3:r32-ubi-9`. For more details on version tags and how to pull an image, see [Deploying NGINX and NGINX Plus on Docker]({{< ref "nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}). 10. Run the provided command, which includes the data plane key, in your NGINX instance terminal to start the Docker container. From 714b454f2c75822ce2c6d60c2d40da1189c8289e Mon Sep 17 00:00:00 2001 From: Jon Cahill-Torre Date: Thu, 3 Jul 2025 18:07:32 +0100 Subject: [PATCH 3/3] fix: clarification --- .../connect-nginx-plus-container-images-to-nginx-one.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md b/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md index 1391d9deb..5f4d251b5 100644 --- a/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md +++ b/content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md @@ -48,7 +48,7 @@ Pull the NGINX Plus image from the private registry. Replace `` wit docker pull private-registry.nginx.com/nginx-plus/agentv3: ``` -You must specify a distribution tag. The `latest` tag is not supported. Learn more in the [Deploying NGINX and NGINX Plus on Docker]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}) guide. +You must specify a version tag that matches your distribution. The `latest` tag is not supported. Learn more in the [Deploying NGINX and NGINX Plus on Docker]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}) guide.