From bc878473e10c770e5deae48b64e034c81c31780c Mon Sep 17 00:00:00 2001
From: Paul Abel <128620221+pdabelf5@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:38:00 +0000
Subject: [PATCH] add alpine fips image options to installation docs (#4962)
---
.../nic-images/pulling-ingress-controller-image.md | 2 ++
.../nic-images/using-the-jwt-token-docker-secret.md | 2 ++
docs/content/technical-specifications.md | 5 +++--
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/docs/content/installation/nic-images/pulling-ingress-controller-image.md b/docs/content/installation/nic-images/pulling-ingress-controller-image.md
index bfe2466981..b43ff76e8e 100644
--- a/docs/content/installation/nic-images/pulling-ingress-controller-image.md
+++ b/docs/content/installation/nic-images/pulling-ingress-controller-image.md
@@ -66,6 +66,7 @@ $ curl https://private-registry.nginx.com/v2/nginx-ic/nginx-plus-ingress/tags/li
"name": "nginx-ic/nginx-plus-ingress",
"tags": [
"3.4.0-alpine",
+ "3.4.0-alpine-fips",
"3.4.0-ubi",
"3.4.0"
]
@@ -75,6 +76,7 @@ $ curl https://private-registry.nginx.com/v2/nginx-ic-nap/nginx-plus-ingress/tag
{
"name": "nginx-ic-nap/nginx-plus-ingress",
"tags": [
+ "3.4.0-alpine-fips",
"3.4.0-ubi",
"3.4.0"
]
diff --git a/docs/content/installation/nic-images/using-the-jwt-token-docker-secret.md b/docs/content/installation/nic-images/using-the-jwt-token-docker-secret.md
index a2e4e6fcac..39f82cb227 100644
--- a/docs/content/installation/nic-images/using-the-jwt-token-docker-secret.md
+++ b/docs/content/installation/nic-images/using-the-jwt-token-docker-secret.md
@@ -161,6 +161,7 @@ You can also use the certificate and key from the MyF5 portal and the Docker reg
"name": "nginx-ic/nginx-plus-ingress",
"tags": [
"3.4.0-alpine",
+ "3.4.0-alpine-fips",
"3.4.0-ubi",
"3.4.0"
]
@@ -170,6 +171,7 @@ You can also use the certificate and key from the MyF5 portal and the Docker reg
{
"name": "nginx-ic-nap/nginx-plus-ingress",
"tags": [
+ "3.4.0-alpine-fips",
"3.4.0-ubi",
"3.4.0"
]
diff --git a/docs/content/technical-specifications.md b/docs/content/technical-specifications.md
index 7144b6d0e8..ee53fde3c8 100644
--- a/docs/content/technical-specifications.md
+++ b/docs/content/technical-specifications.md
@@ -69,8 +69,9 @@ NGINX Plus images are available through the F5 Container registry `private-regis
{{< bootstrap-table "table table-striped table-bordered table-responsive" >}}
|Name
| Base image
| Third-party modules
| F5 Container Registry Image | Architectures |
| ---| ---| --- | --- | --- |
-|Alpine-based image | ``alpine:3.18`` | NGINX Plus JavaScript and OpenTracing modules
OpenTracing tracers for Jaeger
Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:3.4.0-alpine` | arm64
amd64 |
-|Alpine-based image with FIPS inside | ``alpine:3.18`` | NGINX Plus JavaScript and OpenTracing modules
OpenTracing tracers for Jaeger
Zipkin and Datadog
FIPS module and OpenSSL configuration | `nginx-ic/nginx-plus-ingress:3.4.0-alpine-fips` | arm64
amd64 |
+|Alpine-based image | ``alpine:3.19`` | NGINX Plus JavaScript and OpenTracing modules
OpenTracing tracers for Jaeger
Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:3.4.0-alpine` | arm64
amd64 |
+|Alpine-based image with FIPS inside | ``alpine:3.19`` | NGINX Plus JavaScript and OpenTracing modules
OpenTracing tracers for Jaeger
Zipkin and Datadog
FIPS module and OpenSSL configuration | `nginx-ic/nginx-plus-ingress:3.4.0-alpine-fips` | arm64
amd64 |
+|Alpine-based image with NGINX App Protect WAF & FIPS inside | ``alpine:3.17`` | NGINX App Protect WAF
NGINX Plus JavaScript and OpenTracing modules
OpenTracing tracers for Jaeger
Zipkin and Datadog
FIPS module and OpenSSL configuration | `nginx-ic-nap/nginx-plus-ingress:3.4.0-alpine-fips` | arm64
amd64 |
|Debian-based image | ``debian:12-slim`` | NGINX Plus JavaScript and OpenTracing modules
OpenTracing tracers for Jaeger
Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:3.4.0` | arm64
amd64 |
|Debian-based image with NGINX App Protect WAF | ``debian:11-slim`` | NGINX App Protect WAF
NGINX Plus JavaScript and OpenTracing modules
OpenTracing tracers for Jaeger
Zipkin and Datadog | `nginx-ic-nap/nginx-plus-ingress:3.4.0` | amd64 |
|Debian-based image with NGINX App Protect DoS | ``debian:11-slim`` | NGINX App Protect DoS
NGINX Plus JavaScript and OpenTracing modules
OpenTracing tracers for Jaeger
Zipkin and Datadog | `nginx-ic-dos/nginx-plus-ingress:3.4.0` | amd64 |