Skip to content

Commit

Permalink
Bump nginx to 1.23.4 (#3852)
Browse files Browse the repository at this point in the history
  • Loading branch information
lucacome committed May 4, 2023
1 parent 1af92da commit aacce5d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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++ \
Expand Down Expand Up @@ -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" \
Expand Down
6 changes: 3 additions & 3 deletions docs/content/technical-specifications.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit aacce5d

Please sign in to comment.