Skip to content

Commit 7b1353d

Browse files
nginx-botpdabelf5
andauthored
Docker image update 7502f23c (#8384)
Update docker images 7502f23c Co-authored-by: Paul Abel <[email protected]>
1 parent d04609a commit 7b1353d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

build/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ ARG PACKAGE_REPO=pkgs.nginx.com
1515

1616

1717
############################################# Base images containing libs for FIPS #############################################
18-
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi8@sha256:8d0c9d6ec488e7f393d4563fa6ac82b572873fe691eb7e6e9c86366373f4273d AS ubi8-packages
19-
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:073c40696d255cbc11aff52473f975e99c8253e0982da7f42d9f70b567b31eb2 AS ubi9-packages
18+
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi8@sha256:256357eac099babadfaf326aa22acb8d99af4ba6e15d96bae5bf104b2ce3ea79 AS ubi8-packages
19+
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:46e38dc6d8a9151f28f6dd775c528425ca4dfbc2a39055da08f653c12f959d27 AS ubi9-packages
2020
FROM ghcr.io/nginx/alpine-fips:0.4.0-alpine3.19@sha256:0b400b81b5f403d69535a54839296ae35ced374eb1bb04db5b4282f380fef09a AS alpine-fips-3.19
2121
FROM ghcr.io/nginx/alpine-fips:0.4.0-alpine3.22@sha256:61ed75f252bde7da1e6db33d2709456e87478280dfae3d11084f94c361e9f329 AS alpine-fips-3.22
2222
FROM redhat/ubi9-minimal:9.6@sha256:7c5495d5fad59aaee12abc3cbbd2b283818ee1e814b00dbc7f25bf2d14fa4f0c AS ubi-minimal
23-
FROM golang:1.25-alpine@sha256:b6ed3fd0452c0e9bcdef5597f29cc1418f61672e9d3a2f55bf02e7222c014abd AS golang-builder
23+
FROM golang:1.25-alpine@sha256:a86c313035ea07727c53a9037366a63c2216f3c5690c613179f37ee33ea71301 AS golang-builder
2424

2525
############################################# NGINX files #############################################
2626
FROM scratch AS nginx-files
@@ -174,7 +174,7 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_s
174174
&& ubi-clean.sh
175175

176176
############################################# Base image for Alpine with NGINX Plus ##############################################
177-
FROM alpine:3.22@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1 AS alpine-plus
177+
FROM alpine:3.22@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 AS alpine-plus
178178
ARG NGINX_PLUS_VERSION
179179
ARG PACKAGE_REPO
180180
ARG NGINX_AGENT_VERSION
@@ -212,7 +212,7 @@ RUN --mount=type=bind,from=alpine-fips-3.22,target=/tmp/fips/ \
212212

213213

214214
############################################# Base image for Alpine with NGINX Plus, App Protect WAF and FIPS #############################################
215-
FROM alpine:3.19@sha256:3be987e6cde1d07e873c012bf6cfe941e6e85d16ca5fc5b8bedc675451d2de67 AS alpine-plus-nap-fips
215+
FROM alpine:3.19@sha256:6baf43584bcb78f2e5847d1de515f23499913ac9f12bdf834811a3145eb11ca1 AS alpine-plus-nap-fips
216216
ARG NGINX_PLUS_VERSION
217217
ARG NAP_WAF_VERSION
218218
ARG PACKAGE_REPO
@@ -246,7 +246,7 @@ RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \
246246

247247

248248
############################################# Base image for Alpine with NGINX Plus, App Protect WAFv5 and FIPS #############################################
249-
FROM alpine:3.19@sha256:3be987e6cde1d07e873c012bf6cfe941e6e85d16ca5fc5b8bedc675451d2de67 AS alpine-plus-nap-v5-fips
249+
FROM alpine:3.19@sha256:6baf43584bcb78f2e5847d1de515f23499913ac9f12bdf834811a3145eb11ca1 AS alpine-plus-nap-v5-fips
250250
ARG NGINX_PLUS_VERSION
251251
ARG NAP_WAF_VERSION
252252
ARG PACKAGE_REPO
@@ -505,7 +505,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
505505

506506

507507
############################################# Base image for UBI8 with NGINX Plus and App Protect WAF #############################################
508-
FROM redhat/ubi8@sha256:534c2c0efa4150ede18e3f9d7480d3b9ec2a52e62bc91cd54e08ee7336819619 AS ubi-8-plus-nap
508+
FROM redhat/ubi8@sha256:2f698e145dd30ac9f611b8984b910640bc210fae476dc36aa9ba200fad2a30ed AS ubi-8-plus-nap
509509
ARG NGINX_PLUS_VERSION
510510
ARG NAP_WAF_VERSION
511511
ARG BUILD_OS
@@ -545,7 +545,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
545545

546546

547547
############################################# Base image for UBI8 with NGINX Plus and App Protect WAFv5 #############################################
548-
FROM redhat/ubi8@sha256:534c2c0efa4150ede18e3f9d7480d3b9ec2a52e62bc91cd54e08ee7336819619 AS ubi-8-plus-nap-v5
548+
FROM redhat/ubi8@sha256:2f698e145dd30ac9f611b8984b910640bc210fae476dc36aa9ba200fad2a30ed AS ubi-8-plus-nap-v5
549549
ARG NGINX_PLUS_VERSION
550550
ARG NAP_WAF_VERSION
551551

build/dependencies/Dockerfile.ubi8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.19
2-
FROM redhat/ubi8@sha256:534c2c0efa4150ede18e3f9d7480d3b9ec2a52e62bc91cd54e08ee7336819619 AS rpm-build
2+
FROM redhat/ubi8@sha256:2f698e145dd30ac9f611b8984b910640bc210fae476dc36aa9ba200fad2a30ed AS rpm-build
33
RUN mkdir -p /rpms/ \
44
&& dnf install rpm-build gcc make cmake -y \
55
&& rpmbuild --rebuild --nodebuginfo https://mirror.stream.centos.org/9-stream/BaseOS/source/tree/Packages/c-ares-1.19.1-1.el9.src.rpm \

tests/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.19
2-
FROM python:3.13-bookworm@sha256:c900d35aba5fe4c1dc1cd358408baae2902ff2a2926a1d15cc5002c6061ddb2e
2+
FROM python:3.13-bookworm@sha256:afe6f5c21893b34eff06617b81429646e21981cfa36e6e5916e8b3608d6fcba3
33

44
RUN apt-get update \
55
&& apt-get install -y curl git apache2-utils \

0 commit comments

Comments
 (0)