Skip to content

Commit 5a1807e

Browse files
pdabelf5dependabot[bot]
pdabelf5
and
dependabot[bot]
authored
Image SHA update cherry picks (#5067)
* Bump opentracing/nginx-opentracing from `426c2ff` to `2e0268d` in /build (#4927) Bumps opentracing/nginx-opentracing from `426c2ff` to `2e0268d`. --- updated-dependencies: - dependency-name: opentracing/nginx-opentracing dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nginx from `a59278f` to `a59278f` in /build (#4926) Bumps nginx from `a59278f` to `a59278f`. --- updated-dependencies: - dependency-name: nginx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump golang from `4db4aac` to `fd78f2f` in /build (#4928) Bumps golang from `4db4aac` to `fd78f2f`. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the docker-images group in /build with 1 update (#4925) * Bump the docker-images group in /build with 1 update Bumps the docker-images group in /build with 1 update: debian. Updates `debian` from 11-slim to 12-slim --- updated-dependencies: - dependency-name: debian dependency-type: direct:production dependency-group: docker-images ... Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Paul Abel <[email protected]> Co-authored-by: Paul Abel <[email protected]> * Bump golang from `fd78f2f` to `51a7800` in /build (#4984) Bumps golang from `fd78f2f` to `51a7800`. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nginxcontrib/nginx from `4059aff` to `4a3e891` in /build (#4992) Bumps nginxcontrib/nginx from `4059aff` to `4a3e891`. --- updated-dependencies: - dependency-name: nginxcontrib/nginx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump redhat/ubi9-minimal from `a340f4b` to `582e18f` in /build (#4994) Bumps redhat/ubi9-minimal from `a340f4b` to `582e18f`. --- updated-dependencies: - dependency-name: redhat/ubi9-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nginx from `a59278f` to `d12e6f7` in /build (#5003) Bumps nginx from `a59278f` to `d12e6f7`. --- updated-dependencies: - dependency-name: nginx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump golang from `51a7800` to `a6a7f1f` in /build (#5004) Bumps golang from `51a7800` to `a6a7f1f`. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nginx from `d12e6f7` to `5b7ff23` in /build (#5012) Bumps nginx from `d12e6f7` to `5b7ff23`. --- updated-dependencies: - dependency-name: nginx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nginx from `5b7ff23` to `156d75f` in /build (#5019) Bumps nginx from `5b7ff23` to `156d75f`. --- updated-dependencies: - dependency-name: nginx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nginx from `156d75f` to `156d75f` in /build (#5028) Bumps nginx from `156d75f` to `156d75f`. --- updated-dependencies: - dependency-name: nginx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump redhat/ubi8 from `fc88b13` to `23d8dfd` in /build (#5029) Bumps redhat/ubi8 from `fc88b13` to `23d8dfd`. --- updated-dependencies: - dependency-name: redhat/ubi8 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump the docker-tests group in /tests with 1 update (#5033) Bumps the docker-tests group in /tests with 1 update: kindest/node. Updates `kindest/node` from v1.29.0 to v1.29.1 --- updated-dependencies: - dependency-name: kindest/node dependency-type: direct:production dependency-group: docker-tests ... Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 30748f6 commit 5a1807e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

‎build/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ ARG DEBIAN_FRONTEND=noninteractive
66

77

88
############################################# Base images containing libs for Opentracing and FIPS #############################################
9-
FROM opentracing/nginx-opentracing:nginx-1.25.3@sha256:426c2ff410f637eb243363f58c118254b5663e90224e5ab3c99d985eea50ec18 as opentracing-lib
9+
FROM opentracing/nginx-opentracing:nginx-1.25.3@sha256:2e0268d3cd31fe047c2fe566f29731865b0c99cc99b579c6584b23cd3c7830ef as opentracing-lib
1010
FROM opentracing/nginx-opentracing:nginx-1.25.3-alpine@sha256:08ccc2c8bb28f01cb17b7619f139830b3af7950826b819b267393aefa32f23ab as alpine-opentracing-lib
1111
FROM ghcr.io/nginxinc/alpine-fips:0.1.1-alpine3.18@sha256:6f124002650fae697152290a14a7caa7f21884e8d78d8236c63fec2d018d721d as alpine-fips
1212

1313

1414
############################################# Base image for Alpine #############################################
15-
FROM nginx:1.25.3-alpine@sha256:a59278fd22a9d411121e190b8cec8aa57b306aa3332459197777583beb728f59 AS alpine
15+
FROM nginx:1.25.3-alpine@sha256:156d75f07c59b2fd59d3d1470631777943bb574135214f0a90c7bb82bde916da AS alpine
1616

1717
RUN --mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
1818
apk add --no-cache libcap libstdc++ \
@@ -24,7 +24,7 @@ RUN --mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
2424

2525

2626
############################################# Base image for Debian #############################################
27-
FROM nginx:1.25.3@sha256:2bdc49f2f8ae8d8dc50ed00f2ee56d00385c6f8bc8a8b320d0a294d9e3b49026 AS debian
27+
FROM nginx:1.25.3@sha256:8b4c32060a41e8c07e4b33c2e2695510c729314d84b2b71a1c5d7002aaf0b5ad AS debian
2828

2929
RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
3030
apt-get update \
@@ -37,7 +37,7 @@ RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
3737

3838

3939
############################################# Base image for UBI #############################################
40-
FROM nginxcontrib/nginx:1.25.3-ubi@sha256:4059affa739e77196cf465edf9fac1150afacc2a4ef3e12ae74cf594b9c1198a AS ubi
40+
FROM nginxcontrib/nginx:1.25.3-ubi@sha256:4a3e891705687db11a02a3ba37a1ce42b01349d49198a956576787ab4a3a7a0c AS ubi
4141
ARG IC_VERSION
4242

4343
LABEL name="NGINX Ingress Controller" \
@@ -111,7 +111,7 @@ RUN --mount=type=bind,from=alpine-fips,target=/tmp/fips/ \
111111

112112

113113
############################################# Base image for Debian with NGINX Plus #############################################
114-
FROM debian:12-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 AS debian-plus
114+
FROM debian:12-slim@sha256:f4a83aa865a2b4a064ff142aa91c713180df9fcb86ce676b5de2981029379c37 AS debian-plus
115115

116116
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
117117
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
@@ -135,7 +135,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
135135

136136

137137
############################################# Base image for Debian with NGINX Plus and App Protect WAF/DoS #############################################
138-
FROM debian:11-slim@sha256:d3d0d14f49b49a4dd98a436711f5646dc39e1c99203ef223d1b6620061e2c0e5 as debian-plus-nap
138+
FROM debian:11-slim@sha256:41c3fecb70015fd9c72d6df95573de3f92d5f4f46fdabe8dbd8d2bfb1531594d as debian-plus-nap
139139
ARG NAP_MODULES
140140

141141
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
@@ -189,7 +189,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
189189

190190

191191
############################################# Base image for UBI with NGINX Plus #############################################
192-
FROM redhat/ubi9-minimal@sha256:a340f4b9fb261a75c84666a3dccb88e193a116da3cebabaf9bcdc33609b61172 AS ubi-plus
192+
FROM redhat/ubi9-minimal@sha256:582e18f13291d7c686ec4e6e92d20b24c62ae0fc72767c46f30a69b1a6198055 AS ubi-plus
193193

194194
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
195195
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
@@ -208,7 +208,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
208208

209209

210210
############################################# Base image for UBI with NGINX Plus and App Protect WAF/DoS #############################################
211-
FROM redhat/ubi8@sha256:1fdb97f2d2a44fdef3feaa69100f154631bae65130105ac685d0e34eb1d8c3d0 as ubi-plus-nap
211+
FROM redhat/ubi8@sha256:23d8dfd08024fdfa34b168c297d8c74a1dc58675b02b3418925932df123b755c as ubi-plus-nap
212212
ARG NAP_MODULES
213213

214214
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
@@ -313,7 +313,7 @@ LABEL org.nginx.kic.image.build.nginx.version="${NGINX_PLUS_VERSION}${NGINX_VERS
313313

314314

315315
############################################# Build nginx-ingress in golang container #############################################
316-
FROM golang:1.21-alpine@sha256:4db4aac30880b978cae5445dd4a706215249ad4f43d28bd7cdf7906e9be8dd6b AS builder
316+
FROM golang:1.21-alpine@sha256:a6a7f1fcf12f5efa9e04b1e75020931a616cd707f14f62ab5262bfbe109aa84a AS builder
317317
ARG IC_VERSION
318318
ARG TARGETARCH
319319

‎tests/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.5
22
# this is here so we can grab the latest version of kind and have dependabot keep it up to date
3-
FROM kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
3+
FROM kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144
44

55
FROM python:3.12@sha256:3733015cdd1bd7d9a0b9fe21a925b608de82131aa4f3d397e465a1fcb545d36f
66

0 commit comments

Comments
 (0)