diff --git a/build/Dockerfile b/build/Dockerfile index 25983bcefb..1f6bebc825 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -5,12 +5,12 @@ ARG DOWNLOAD_TAG=edge ############################################# Base images containing libs for Opentracing ############################################# -FROM opentracing/nginx-opentracing:nginx-1.23.3 as opentracing-lib -FROM opentracing/nginx-opentracing:nginx-1.23.3-alpine as alpine-opentracing-lib +FROM opentracing/nginx-opentracing:nginx-1.23.4 as opentracing-lib +FROM opentracing/nginx-opentracing:nginx-1.23.4-alpine as alpine-opentracing-lib ############################################# Base image for Debian ############################################# -FROM nginx:1.23.3 AS debian +FROM nginx:1.23.4 AS debian RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \ apt-get update \ @@ -24,7 +24,7 @@ RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \ ############################################# Base image for Alpine ############################################# -FROM nginx:1.23.3-alpine AS alpine +FROM nginx:1.23.4-alpine AS alpine RUN --mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \ apk add --no-cache libcap libstdc++ \ @@ -110,7 +110,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode ############################################# Base image for UBI ############################################# -FROM nginxcontrib/nginx:1.23.3-ubi AS ubi +FROM nginxcontrib/nginx:1.23.4-ubi AS ubi ARG IC_VERSION LABEL name="NGINX Ingress Controller" \ diff --git a/docs/content/technical-specifications.md b/docs/content/technical-specifications.md index 4737c9860a..823291e39e 100644 --- a/docs/content/technical-specifications.md +++ b/docs/content/technical-specifications.md @@ -50,9 +50,9 @@ All images include NGINX 1.23.2. {{% table %}} |Name | Base image | Third-party modules | DockerHub image | Architectures | | ---| ---| ---| --- | --- | -|Alpine-based image | ``nginx:1.23.3-alpine``, which is based on ``alpine:3.17`` | NGINX OpenTracing module, OpenTracing library, OpenTracing tracers for Jaeger, Zipkin and Datadog | ``nginx/nginx-ingress:3.1.0-alpine`` | arm/v7, arm64, amd64, ppc64le, s390x | -|Debian-based image | ``nginx:1.23.3``, which is based on ``debian:11-slim`` | NGINX OpenTracing module, OpenTracing library, OpenTracing tracers for Jaeger, Zipkin and Datadog | ``nginx/nginx-ingress:3.1.0`` | arm/v7, arm64, amd64, ppc64le, s390x | -|Ubi-based image | ``nginxcontrib/nginx:1.23.3-ubi``, which is based on ``redhat/ubi9-minimal`` | | ``nginx/nginx-ingress:3.1.0-ubi`` | arm64, amd64, ppc64le, s390x | +|Alpine-based image | ``nginx:1.23.4-alpine``, which is based on ``alpine:3.17`` | NGINX OpenTracing module, OpenTracing library, OpenTracing tracers for Jaeger, Zipkin and Datadog | ``nginx/nginx-ingress:3.1.0-alpine`` | arm/v7, arm64, amd64, ppc64le, s390x | +|Debian-based image | ``nginx:1.23.4``, which is based on ``debian:11-slim`` | NGINX OpenTracing module, OpenTracing library, OpenTracing tracers for Jaeger, Zipkin and Datadog | ``nginx/nginx-ingress:3.1.0`` | arm/v7, arm64, amd64, ppc64le, s390x | +|Ubi-based image | ``nginxcontrib/nginx:1.23.4-ubi``, which is based on ``redhat/ubi9-minimal`` | | ``nginx/nginx-ingress:3.1.0-ubi`` | arm64, amd64, ppc64le, s390x | {{% /table %}} ### Images with NGINX Plus