From 6e339e08e3e1aac50dd7632edfd7d94fb494af2f Mon Sep 17 00:00:00 2001 From: Saylor Berman Date: Tue, 16 Dec 2025 10:21:04 -0700 Subject: [PATCH] Update NGINX and NGINX Agent --- README.md | 2 +- build/Dockerfile.nginx | 7 ++----- build/Dockerfile.nginxplus | 2 +- build/ubi/Dockerfile.nginx | 2 +- build/ubi/Dockerfile.nginxplus | 2 +- go.mod | 2 +- go.sum | 4 ++-- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 76e27911ef..9eeadef547 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ The following table lists the software versions NGINX Gateway Fabric supports. | NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | NGINX Agent | |----------------------|-------------|------------|-----------|------------|-------------| -| Edge | 1.4.1 | 1.25+ | 1.29.3 | R36 | v3.6.0 | +| Edge | 1.4.1 | 1.25+ | 1.29.4 | R36 | v3.6.1 | | 2.2.2 | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.6.0 | | 2.2.1 | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.5.0 | | 2.2.0 | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.3.2 | diff --git a/build/Dockerfile.nginx b/build/Dockerfile.nginx index df3e504cab..3a10b24eb9 100644 --- a/build/Dockerfile.nginx +++ b/build/Dockerfile.nginx @@ -4,17 +4,14 @@ FROM scratch AS nginx-files # the following links can be replaced with local files if needed, i.e. ADD --chown=101:1001 ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.pub nginx_signing.rsa.pub -FROM nginx:1.29.3-alpine-otel +FROM nginx:1.29.4-alpine-otel # renovate: datasource=github-tags depName=nginx/agent -ARG NGINX_AGENT_VERSION=v3.6.0 +ARG NGINX_AGENT_VERSION=v3.6.1 ARG NJS_DIR ARG NGINX_CONF_DIR ARG BUILD_AGENT -# Fixes for CVEs; can be removed once base image is updated -RUN apk update && apk add --no-cache 'libpng>=1.6.53-r0' 'ssl_client>=1.37.0-r20' 'busybox-binsh>=1.37.0-r20' - RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk/keys/nginx_signing.rsa.pub \ 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} diff --git a/build/Dockerfile.nginxplus b/build/Dockerfile.nginxplus index 7865295e92..99ef5a2ab5 100644 --- a/build/Dockerfile.nginxplus +++ b/build/Dockerfile.nginxplus @@ -8,7 +8,7 @@ FROM alpine:3.22 ARG NGINX_PLUS_VERSION=R36 # renovate: datasource=github-tags depName=nginx/agent -ARG NGINX_AGENT_VERSION=v3.6.0 +ARG NGINX_AGENT_VERSION=v3.6.1 ARG NJS_DIR ARG NGINX_CONF_DIR ARG BUILD_AGENT diff --git a/build/ubi/Dockerfile.nginx b/build/ubi/Dockerfile.nginx index 8cd737e897..1fb5c9085a 100644 --- a/build/ubi/Dockerfile.nginx +++ b/build/ubi/Dockerfile.nginx @@ -11,7 +11,7 @@ FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:c69c8a1d3255d5adaa30de2332 FROM redhat/ubi9-minimal:9.7-1764794109 AS ubi-nginx # renovate: datasource=github-tags depName=nginx/agent -ARG NGINX_AGENT_VERSION=v3.6.0 +ARG NGINX_AGENT_VERSION=v3.6.1 ARG NJS_DIR ARG NGINX_CONF_DIR ARG BUILD_AGENT diff --git a/build/ubi/Dockerfile.nginxplus b/build/ubi/Dockerfile.nginxplus index 4cb7ad2e57..44a16c2ebe 100644 --- a/build/ubi/Dockerfile.nginxplus +++ b/build/ubi/Dockerfile.nginxplus @@ -13,7 +13,7 @@ FROM redhat/ubi9-minimal:9.7-1764794109 AS ubi-nginx-plus ARG NGINX_PLUS_VERSION=R36 # renovate: datasource=github-tags depName=nginx/agent -ARG NGINX_AGENT_VERSION=v3.6.0 +ARG NGINX_AGENT_VERSION=v3.6.1 ARG NJS_DIR ARG NGINX_CONF_DIR ARG BUILD_AGENT diff --git a/go.mod b/go.mod index 22aac6b3a2..2e2fcc8a89 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/go-logr/logr v1.4.3 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 - github.com/nginx/agent/v3 v3.6.0 + github.com/nginx/agent/v3 v3.6.1 github.com/nginx/telemetry-exporter v0.1.4 github.com/onsi/ginkgo/v2 v2.27.3 github.com/onsi/gomega v1.38.3 diff --git a/go.sum b/go.sum index 1e66e5ae32..913e02e874 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/nginx/agent/v3 v3.6.0 h1:RRqEBV3+dl0ByFRZVl7ITLDxyj9qPtENKL32K0uwoAI= -github.com/nginx/agent/v3 v3.6.0/go.mod h1:VCyoBL7xiiY2kawECdb9ZH5e+zDJFUJbVEpzKu2sHC0= +github.com/nginx/agent/v3 v3.6.1 h1:CJS88/IkWBJWaIaCd+J8s2MSYsaRpIFxqpUcdzRqbuA= +github.com/nginx/agent/v3 v3.6.1/go.mod h1:VCyoBL7xiiY2kawECdb9ZH5e+zDJFUJbVEpzKu2sHC0= github.com/nginx/nginx-plus-go-client/v3 v3.0.1 h1:SU8MoRQVSa1aXqNUI3fc+OA9GM30aqAhV4yBWs9tD2s= github.com/nginx/nginx-plus-go-client/v3 v3.0.1/go.mod h1:PjlGB6drb5RCWnUp1XDTlzKFPRI2a3ePg2kNCb1AN94= github.com/nginx/telemetry-exporter v0.1.4 h1:3ikgKlyz/O57oaBLkxCInMjr74AhGTKr9rHdRAkkl/w=