From fff702b2e5035b2c6cfae8cacf18c9d1b8e5780d Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Wed, 5 Nov 2025 11:43:30 +0000 Subject: [PATCH 1/3] Update NGINX to 1.29.3 Update Debian to 13/trixie --- build/Dockerfile | 8 ++++---- tests/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index eb1c02920d..6df107dead 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.19 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 @@ -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:1beed3ca46acebe9d3fb62e9067f03d05d5bfa97a00f30938a0a3580563272ad AS debian ARG NGINX_OSS_VERSION ARG NGINX_AGENT_VERSION @@ -281,7 +281,7 @@ RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \ ############################################# Base image for Debian with NGINX Plus only ############################################# -FROM debian:12-slim@sha256:936abff852736f951dab72d91a1b6337cf04217b2a77a5eaadc7c0f2f1ec1758 AS debian-plus-only +FROM debian:13-slim@sha256:a347fd7510ee31a84387619a492ad6c8eb0af2f2682b916ff3e643eb076f925a AS debian-plus-only ARG NGINX_PLUS_VERSION ENV NGINX_VERSION=${NGINX_PLUS_VERSION} diff --git a/tests/Dockerfile b/tests/Dockerfile index 73d5f6a0ae..dee3839ee2 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.19 -FROM python:3.14-bookworm@sha256:e392e288e977be19c14f075d3ec056b9a24113741ead2fcf5e4f3b3009285581 +FROM python:3.14-trixie@sha256:49abbd353ed1b33760614f952e03737c9f1870a79a0c66e82849f5ebf73e2044 RUN apt-get update \ && apt-get install -y curl git apache2-utils \ From 4fb93d64305d514bb6eb6a2ad2eefbfdc426677a Mon Sep 17 00:00:00 2001 From: Alex Fenlon Date: Fri, 14 Nov 2025 13:59:08 +0000 Subject: [PATCH 2/3] Update nginx oss to 1.29.3 in data.json and makefile --- Makefile | 2 +- tests/data/modules/data.json | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 7d6164d8fd..d33a9a8494 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ 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 diff --git a/tests/data/modules/data.json b/tests/data/modules/data.json index 9ed3defab0..aa6b4db9e8 100644 --- a/tests/data/modules/data.json +++ b/tests/data/modules/data.json @@ -6,15 +6,15 @@ "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", @@ -240,15 +240,15 @@ "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", @@ -417,15 +417,15 @@ "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", From 790977c74772f8fbf063d51c09a7e2cae92e67d0 Mon Sep 17 00:00:00 2001 From: Alex Fenlon Date: Fri, 14 Nov 2025 13:59:43 +0000 Subject: [PATCH 3/3] Update nginx agent to v3.5 in data.json and makefile --- Makefile | 2 +- build/Dockerfile | 2 +- tests/data/modules/data.json | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index d33a9a8494..1e6587177c 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ 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 diff --git a/build/Dockerfile b/build/Dockerfile index a30ba8ee49..1f11cf356f 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -6,7 +6,7 @@ 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 diff --git a/tests/data/modules/data.json b/tests/data/modules/data.json index aa6b4db9e8..d29d991a31 100644 --- a/tests/data/modules/data.json +++ b/tests/data/modules/data.json @@ -18,7 +18,7 @@ }, { "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", @@ -252,7 +252,7 @@ }, { "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", @@ -429,7 +429,7 @@ }, { "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",