Merge branch 'main' into update-version

nginxinc · Jan 23, 2024 · 826d13b · 826d13b
2 parents c9fea48 + bc87847
commit 826d13b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 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
@@ -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
@@ -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
@@ -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" >}}
 |<div style="width:200px">Name</div> | <div style="width:100px">Base image</div> | <div style="width:200px">Third-party modules</div> | F5 Container Registry Image | Architectures |
 | ---| ---| --- | --- | --- |
-|Alpine-based image | ``alpine:3.18`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:3.4.0-alpine` | arm64<br>amd64 |
-|Alpine-based image with FIPS inside | ``alpine:3.18`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic/nginx-plus-ingress:3.4.0-alpine-fips` | arm64<br>amd64 |
+|Alpine-based image | ``alpine:3.19`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:3.4.0-alpine` | arm64<br>amd64 |
+|Alpine-based image with FIPS inside | ``alpine:3.19`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic/nginx-plus-ingress:3.4.0-alpine-fips` | arm64<br>amd64 |
+|Alpine-based image with NGINX App Protect WAF & FIPS inside | ``alpine:3.17`` | NGINX App Protect WAF<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic-nap/nginx-plus-ingress:3.4.0-alpine-fips` | arm64<br>amd64 |
 |Debian-based image | ``debian:12-slim`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:3.4.0` | arm64<br>amd64 |
 |Debian-based image with NGINX App Protect WAF | ``debian:11-slim`` | NGINX App Protect WAF<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>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<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic-dos/nginx-plus-ingress:3.4.0` | amd64 |