Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump nginx from 1.25.2 to 1.25.3 #4572

Merged
merged 3 commits into from
Oct 26, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ ARG DOWNLOAD_TAG=edge


############################################# Base images containing libs for Opentracing and FIPS #############################################
FROM opentracing/nginx-opentracing:nginx-1.25.2 as opentracing-lib
FROM opentracing/nginx-opentracing:nginx-1.25.2-alpine as alpine-opentracing-lib
FROM opentracing/nginx-opentracing:nginx-1.25.3 as opentracing-lib
FROM opentracing/nginx-opentracing:nginx-1.25.3-alpine as alpine-opentracing-lib
FROM ghcr.io/nginxinc/alpine-fips:0.1.1-alpine3.18 as alpine-fips


############################################# Base image for Debian #############################################
FROM nginx:1.25.2 AS debian
FROM nginx:1.25.3 AS debian

RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
apt-get update \
Expand All @@ -23,7 +23,7 @@ RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \


############################################# Base image for Alpine #############################################
FROM nginx:1.25.2-alpine AS alpine
FROM nginx:1.25.3-alpine AS alpine

RUN --mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
apk add --no-cache libcap libstdc++ \
Expand Down Expand Up @@ -129,7 +129,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.25.2-ubi AS ubi
FROM nginxcontrib/nginx:1.25.3-ubi AS ubi
ARG IC_VERSION

LABEL name="NGINX Ingress Controller" \
Expand Down