diff --git a/build/Dockerfile.nginx b/build/Dockerfile.nginx index bf60b1d7af..514b4eb270 100644 --- a/build/Dockerfile.nginx +++ b/build/Dockerfile.nginx @@ -6,15 +6,15 @@ ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.p FROM nginx:1.28.0-alpine-otel -# renovate: datasource=github-tags depName=nginx/agent extractVersion=^v?(?.*)$ -ARG NGINX_AGENT_VERSION=3.0.0 +# renovate: datasource=github-tags depName=nginx/agent +ARG NGINX_AGENT_VERSION=v3.0.1 ARG NJS_DIR ARG NGINX_CONF_DIR ARG BUILD_AGENT 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} + && apk add --no-cache nginx-agent=${NGINX_AGENT_VERSION#v} RUN apk add --no-cache libcap bash \ && mkdir -p /usr/lib/nginx/modules \ diff --git a/build/Dockerfile.nginxplus b/build/Dockerfile.nginxplus index ece5d6c453..b77aa9a744 100644 --- a/build/Dockerfile.nginxplus +++ b/build/Dockerfile.nginxplus @@ -7,8 +7,8 @@ ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.p FROM alpine:3.21 ARG NGINX_PLUS_VERSION=R34 -# renovate: datasource=github-tags depName=nginx/agent extractVersion=^v?(?.*)$ -ARG NGINX_AGENT_VERSION=3.0.0 +# renovate: datasource=github-tags depName=nginx/agent +ARG NGINX_AGENT_VERSION=v3.0.1 ARG NJS_DIR ARG NGINX_CONF_DIR ARG BUILD_AGENT @@ -20,7 +20,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \ && adduser -S -D -H -u 101 -h /var/cache/nginx -s /sbin/nologin -G nginx -g nginx nginx \ && printf "%s\n" "https://pkgs.nginx.com/plus/${NGINX_PLUS_VERSION}/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \ && printf "%s\n" "https://pkgs.nginx.com/nginx-agent/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \ - && apk add --no-cache nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-agent=${NGINX_AGENT_VERSION} + && apk add --no-cache nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-agent=${NGINX_AGENT_VERSION#v} RUN apk add --no-cache libcap bash \ && mkdir -p /usr/lib/nginx/modules \ diff --git a/go.mod b/go.mod index 7a54bfbe40..5962a32ca7 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,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.0.0 + github.com/nginx/agent/v3 v3.0.1 github.com/nginx/telemetry-exporter v0.1.4 github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.37.0 diff --git a/go.sum b/go.sum index 6b06bdf8c7..518e490cec 100644 --- a/go.sum +++ b/go.sum @@ -137,8 +137,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.0.0 h1:iUAho/Q1qx63CP4Eunf94DmLFOrOe7/r3oCPwy72p7E= -github.com/nginx/agent/v3 v3.0.0/go.mod h1:O/31aKtii/mpiZmFGMcTNDoLtKzwTyTXOBMSRkMaPvs= +github.com/nginx/agent/v3 v3.0.1 h1:AH8WLGjqbpM3VimoIN1pW3r6iCcl7gZTPkXnJws3eGQ= +github.com/nginx/agent/v3 v3.0.1/go.mod h1:O/31aKtii/mpiZmFGMcTNDoLtKzwTyTXOBMSRkMaPvs= github.com/nginx/telemetry-exporter v0.1.4 h1:3ikgKlyz/O57oaBLkxCInMjr74AhGTKr9rHdRAkkl/w= github.com/nginx/telemetry-exporter v0.1.4/go.mod h1:bl6qmsxgk4a9D0X8R5E3sUNXN2iECPEK1JNbRLhN5C4= github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1 h1:5VVK38bnELMDWnwfF6dSv57ResXh9AUzeDa72ENj94o=