Skip to content
Merged
Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@


############################################# Base images containing libs for FIPS #############################################
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi8@sha256:ea2f5d57c65b1682418708b6f6c234ba4ace4e48ecceeda97e7bb3a560601efb AS ubi8-packages
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:7dc715d51c9664d892376fada482f29a95023dc81657f89fa4cf7a62fd98d837 AS ubi9-packages
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi8@sha256:12b2f675a94fed04ab5787d78a27b4f8723991bdbe1403257e71de368e7ec852 AS ubi8-packages
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:c9c269ae1ae6a4608fe4e6536073cdea9445433de652fd8ac667992a1ed198d6 AS ubi9-packages
FROM ghcr.io/nginx/alpine-fips:0.3.0-alpine3.19@sha256:449f1a149e81e36bb929ebd362433a06a158ff2a7e3ba05b4b8d9ea96d59ae91 AS alpine-fips-3.19
FROM ghcr.io/nginx/alpine-fips:0.3.0-alpine3.21@sha256:5e5033f34ae7147ce8df928fa58c485bc08ded8ace22428b4c16df30e3b39901 AS alpine-fips-3.21
FROM redhat/ubi9-minimal:9.6@sha256:6d5a6576c83816edcc0da7ed62ba69df8f6ad3cbe659adde2891bfbec4dbf187 AS ubi-minimal
FROM golang:1.24-alpine@sha256:9c4b616be9d26e4762219223331bab5db98649e4be1f6badeac3f7c00a340e3f AS golang-builder
FROM redhat/ubi9-minimal:9.6@sha256:e6b39b0a2cd88c0d904552eee0dca461bc74fe86fda3648ca4f8150913c79d0f AS ubi-minimal
FROM golang:1.24-alpine@sha256:c8c5f95d64aa79b6547f3b626eb84b16a7ce18a139e3e9ca19a8c078b85ba80d AS golang-builder

############################################# NGINX files #############################################
FROM scratch AS nginx-files
Expand Down Expand Up @@ -469,7 +469,7 @@


############################################# Base image for UBI8 with NGINX Plus and App Protect WAF #############################################
FROM redhat/ubi8@sha256:e2ebb79368f8691bc4324d75040c0b0c34a97f4a9c430cf7d8866b310ab9c38e AS ubi-8-plus-nap
FROM redhat/ubi8@sha256:4f0a4e4deb450583408a06165e92a4dcd4f0740a23815f3326fc5c97ee9ca768 AS ubi-8-plus-nap
ARG NGINX_PLUS_VERSION
ARG BUILD_OS

Expand Down Expand Up @@ -508,7 +508,7 @@


############################################# Base image for UBI8 with NGINX Plus and App Protect WAFv5 #############################################
FROM redhat/ubi8@sha256:e2ebb79368f8691bc4324d75040c0b0c34a97f4a9c430cf7d8866b310ab9c38e AS ubi-8-plus-nap-v5
FROM redhat/ubi8@sha256:4f0a4e4deb450583408a06165e92a4dcd4f0740a23815f3326fc5c97ee9ca768 AS ubi-8-plus-nap-v5
ARG NGINX_PLUS_VERSION

ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
Expand Down Expand Up @@ -561,7 +561,7 @@
# 101 is nginx
USER 101

LABEL org.opencontainers.image.version="${IC_VERSION}" \

Check warning on line 564 in build/Dockerfile

View workflow job for this annotation

GitHub Actions / Build Docker OSS (ubi, linux/arm64, linux/amd64) / build

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$NGINX_VERSION' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 564 in build/Dockerfile

View workflow job for this annotation

GitHub Actions / Build Docker NAP (ubi-9-plus-nap, goreleaser, linux/amd64, waf) / build

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$NGINX_VERSION' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 564 in build/Dockerfile

View workflow job for this annotation

GitHub Actions / Build Docker NAP (ubi-9-plus-nap, goreleaser, linux/amd64, dos) / build

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$NGINX_VERSION' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 564 in build/Dockerfile

View workflow job for this annotation

GitHub Actions / Build Docker NAP (ubi-9-plus-nap, goreleaser, linux/amd64, waf,dos) / build

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$NGINX_VERSION' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 564 in build/Dockerfile

View workflow job for this annotation

GitHub Actions / Build Docker NAP (ubi-9-plus-nap-v5, goreleaser, linux/amd64, waf) / build

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$NGINX_VERSION' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
org.opencontainers.image.documentation=https://docs.nginx.com/nginx-ingress-controller \
org.opencontainers.image.vendor="NGINX Inc <[email protected]>" \
org.nginx.kic.image.build.target="${TARGETPLATFORM}" \
Expand Down
2 changes: 1 addition & 1 deletion build/dependencies/Dockerfile.ubi8
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.16
FROM redhat/ubi8@sha256:e2ebb79368f8691bc4324d75040c0b0c34a97f4a9c430cf7d8866b310ab9c38e AS rpm-build
FROM redhat/ubi8@sha256:4f0a4e4deb450583408a06165e92a4dcd4f0740a23815f3326fc5c97ee9ca768 AS rpm-build
RUN mkdir -p /rpms/ \
&& dnf install rpm-build gcc make cmake -y \
&& rpmbuild --rebuild --nodebuginfo https://mirror.stream.centos.org/9-stream/BaseOS/source/tree/Packages/c-ares-1.19.1-1.el9.src.rpm \
Expand Down
2 changes: 1 addition & 1 deletion build/dependencies/Dockerfile.ubi9
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.16
FROM redhat/ubi9:9.6@sha256:4e5d4250bfb3ee9a8b32449dfe68c3dcb2307e6df4a4c4173d75f77b1c03df71 AS rpm-build
FROM redhat/ubi9:9.6@sha256:836460d59c1fd64297328bae646cd7f56dcebc039fdbb8d14112597895f08d07 AS rpm-build
RUN mkdir -p /rpms/ \
&& dnf install rpm-build gcc make cmake -y \
&& rpmbuild --rebuild --nodebuginfo https://mirror.stream.centos.org/9-stream/BaseOS/source/tree/Packages/c-ares-1.19.1-1.el9.src.rpm \
Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe58
# this is here so we can grab the latest version of skopeo and have dependabot keep it up to date
FROM quay.io/skopeo/stable:v1.19.0

FROM python:3.13@sha256:7175df81f9a313ee52286c94a5c35620d37afb31f9e05e47a3e058db84d53854
FROM python:3.13@sha256:4ea77121eab13d9e71f2783d7505f5655b25bb7b2c263e8020aae3b555dbc0b2

RUN apt-get update \
&& apt-get install -y curl git apache2-utils \
Expand Down
Loading