Update NGINX to 1.29.3, NGINX Agent to 3.5 (#8494)

* Update NGINX to 1.29.3
Update Debian to 13/trixie

* Update nginx oss to 1.29.3 in data.json and makefile

* Update nginx agent to v3.5 in data.json and makefile

* update oss sha

---------

Co-authored-by: AlexFenlon <[email protected]>

Author: pdabelf5

Makefile

@@ -3,13 +3,13 @@ VER = $(shell grep IC_VERSION .github/data/version.txt | cut -d '=' -f 2)
 GIT_TAG = $(shell git describe --exact-match --tags || echo untagged)
 VERSION = $(VER)-SNAPSHOT
 # renovate: datasource=docker depName=nginx/nginx
-NGINX_OSS_VERSION             ?= 1.29.1
+NGINX_OSS_VERSION             ?= 1.29.3
 NGINX_PLUS_VERSION            ?= R35
 NAP_WAF_VERSION               ?= 35+5.527
 NAP_WAF_COMMON_VERSION        ?= 11.559
 NAP_WAF_PLUGIN_VERSION        ?= 6.23.0
 NAP_AGENT_VERSION             ?= 2
-NGINX_AGENT_VERSION           ?= 3.3
+NGINX_AGENT_VERSION           ?= 3.5
 PLUS_ARGS = --build-arg NGINX_PLUS_VERSION=$(NGINX_PLUS_VERSION) --secret id=nginx-repo.crt,src=nginx-repo.crt --secret id=nginx-repo.key,src=nginx-repo.key
 
 # Variables that can be overridden

build/Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1.20
 ARG BUILD_OS=debian
 # renovate: datasource=docker depName=nginx/nginx
-ARG NGINX_OSS_VERSION=1.29.1
+ARG NGINX_OSS_VERSION=1.29.3
 ARG NGINX_PLUS_VERSION=R35
 ARG NAP_WAF_VERSION=35+5.527
 ARG NAP_WAF_COMMON_VERSION=11.559
 ARG NAP_WAF_PLUGIN_VERSION=6.23.0
-ARG NGINX_AGENT_VERSION=3.3
+ARG NGINX_AGENT_VERSION=3.5
 ARG NAP_AGENT_VERSION=2
 ARG DOWNLOAD_TAG=edge
 ARG DEBIAN_FRONTEND=noninteractive
@@ -88,7 +88,7 @@ USER 101
 
 
 ############################################# Base image for Alpine #############################################
-FROM nginx:1.29.1-alpine3.22@sha256:42a516af16b852e33b7682d5ef8acbd5d13fe08fecadc7ed98605ba5e3b26ab8 AS alpine
+FROM nginx:1.29.3-alpine3.22@sha256:b3c656d55d7ad751196f21b7fd2e8d4da9cb430e32f646adcf92441b72f82b14 AS alpine
 ARG PACKAGE_REPO
 ARG NGINX_OSS_VERSION
 ARG NGINX_AGENT_VERSION
@@ -107,7 +107,7 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk
 
 
 ############################################# Base image for Debian #############################################
-FROM nginx:1.29.1@sha256:8adbdcb969e2676478ee2c7ad333956f0c8e0e4c5a7463f4611d7a2e7a7ff5dc AS debian
+FROM nginx:1.29.3@sha256:553f64aecdc31b5bf944521731cd70e35da4faed96b2b7548a3d8e2598c52a42 AS debian
 ARG NGINX_OSS_VERSION
 ARG NGINX_AGENT_VERSION
 

tests/Dockerfile

@@ -1,5 +1,6 @@
-# syntax=docker/dockerfile:1.20
-FROM python:3.14-bookworm@sha256:ec171bc30122c014f83f7756fe21c4ab26d33e7c4610a63a18da2728f9ed33f8
+# syntax=docker/dockerfile:1.19
+FROM python:3.14-trixie@sha256:49abbd353ed1b33760614f952e03737c9f1870a79a0c66e82849f5ebf73e2044
+
 
 RUN apt-get update \
 	&& apt-get install -y curl git apache2-utils \

tests/data/modules/data.json

@@ -6,19 +6,19 @@
       "packages": [
         {
           "name": "nginx",
-          "version": "1.29.1"
+          "version": "1.29.3"
         },
         {
           "name": "nginx-module-njs",
-          "version": "1.29.1"
+          "version": "1.29.3"
         },
         {
           "name": "nginx-module-otel",
-          "version": "1.29.1"
+          "version": "1.29.3"
         },
         {
           "name": "nginx-agent",
-          "version": "3.3"
+          "version": "3.5"
         }
       ],
       "system": "debian",
@@ -49,7 +49,7 @@
         },
         {
           "name": "nginx-agent",
-          "version": "3.3"
+          "version": "3.5"
         }
       ],
       "system": "debian",
@@ -240,19 +240,19 @@
       "packages": [
         {
           "name": "nginx",
-          "version": "1.29.1"
+          "version": "1.29.3"
         },
         {
           "name": "nginx-module-njs",
-          "version": "1.29.1"
+          "version": "1.29.3"
         },
         {
           "name": "nginx-module-otel",
-          "version": "1.29.1"
+          "version": "1.29.3"
         },
         {
           "name": "nginx-agent",
-          "version": "3.3"
+          "version": "3.5"
         }
       ],
       "system": "alpine",
@@ -283,7 +283,7 @@
         },
         {
           "name": "nginx-agent",
-          "version": "3.3"
+          "version": "3.5"
         }
       ],
       "system": "alpine",
@@ -314,7 +314,7 @@
         },
         {
           "name": "nginx-agent",
-          "version": "3.3"
+          "version": "3.5"
         }
       ],
       "system": "alpine",
@@ -417,19 +417,19 @@
       "packages": [
         {
           "name": "nginx",
-          "version": "1.29.1"
+          "version": "1.29.3"
         },
         {
           "name": "nginx-module-njs",
-          "version": "1.29.1"
+          "version": "1.29.3"
         },
         {
           "name": "nginx-module-otel",
-          "version": "1.29.1"
+          "version": "1.29.3"
         },
         {
           "name": "nginx-agent",
-          "version": "3.3"
+          "version": "3.5"
         }
       ],
       "system": "ubi",
@@ -460,7 +460,7 @@
         },
         {
           "name": "nginx-agent",
-          "version": "3.3"
+          "version": "3.5"
         }
       ],
       "system": "ubi",