From 3be0c469803b70729c674a7ba09df5113ca1c3a4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2026 08:56:23 +0000
Subject: [PATCH 1/3] Update nginx Docker tag to v1.30.0

| datasource | package | from   | to     |
| ---------- | ------- | ------ | ------ |
| docker     | nginx   | 1.29.8 | 1.30.0 |


Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 build/Dockerfile.nginx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Dockerfile.nginx b/build/Dockerfile.nginx
index 2b59ee6983..e6edb5a247 100644
--- a/build/Dockerfile.nginx
+++ b/build/Dockerfile.nginx
@@ -4,7 +4,7 @@ FROM scratch AS nginx-files
 # the following links can be replaced with local files if needed, i.e. ADD --chown=101:1001 <local_file> <container_file>
 ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.pub nginx_signing.rsa.pub
 
-FROM nginx:1.29.8-alpine-otel
+FROM nginx:1.30.0-alpine-otel
 
 # renovate: datasource=github-tags depName=nginx/agent
 ARG NGINX_AGENT_VERSION=v3.9.0

From f7b4e43b7e60a73d532d8a4ce22f1606739d7ac1 Mon Sep 17 00:00:00 2001
From: Saylor Berman <s.berman@f5.com>
Date: Mon, 20 Apr 2026 08:29:34 -0600
Subject: [PATCH 2/3] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4d8ac55a78..e11a573a58 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ The following table lists the software versions NGINX Gateway Fabric supports. O
 
 | NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | NGINX Agent |
 |----------------------|-------------|------------|-----------|------------|-------------|
-| Edge                 | 1.5.1       | 1.31+      | 1.29.8    | R36        | v3.9.0      |
+| Edge                 | 1.5.1       | 1.31+      | 1.30.0    | R36        | v3.9.0      |
 | 2.5.1                | 1.5.1       | 1.31+      | 1.29.7    | R36        | v3.8.0      |
 | 2.4.2                | 1.4.1       | 1.25+      | 1.29.5    | R36        | v3.7.1      |
 | 2.3.0                | 1.4.1       | 1.25+      | 1.29.3    | R36        | v3.6.0      |

From d2fcde17f9d25577a6a7de6c3f50954eb4ba529b Mon Sep 17 00:00:00 2001
From: Saylor Berman <s.berman@f5.com>
Date: Mon, 20 Apr 2026 08:30:08 -0600
Subject: [PATCH 3/3] Update Dockerfile.nginx

---
 build/Dockerfile.nginx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build/Dockerfile.nginx b/build/Dockerfile.nginx
index e6edb5a247..afdb3bab26 100644
--- a/build/Dockerfile.nginx
+++ b/build/Dockerfile.nginx
@@ -16,9 +16,6 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk
     printf "%s\n" "https://packages.nginx.org/nginx-agent/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
     && apk add --no-cache nginx-agent=${NGINX_AGENT_VERSION#v}
 
-# Upgrade for CVEs 2026-33416 and 2026-33636
-RUN apk update && apk upgrade --no-cache libpng
-
 RUN apk add --no-cache bash \
     && mkdir -p /usr/lib/nginx/modules \
     # forward request and error logs to docker log collector