Skip to content

DO NOT MERGE Test agent release 3.5.1 #4315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

DO NOT MERGE Test agent release 3.5.1 #4315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4101a5
Test agent release 3.5.0
dhurley Nov 11, 2025
1d321e9
Merge branch 'main' into test/agent-3.5.0
dhurley Nov 19, 2025
229d285
Test agent v3.5.1
dhurley Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions build/Dockerfile.nginx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,22 @@ FROM nginx:1.29.3-alpine-otel

# renovate: datasource=github-tags depName=nginx/agent
ARG NGINX_AGENT_VERSION=v3.5.0
ARG NGINX_AGENT_BRANCH=release-3.5.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#v}
# Build nginx-agent from source using the fix branch
RUN apk add --no-cache git go make \
&& git clone --branch ${NGINX_AGENT_BRANCH} --depth 1 https://github.com/nginx/agent.git /tmp/agent \
&& cd /tmp/agent \
&& make build \
&& cp /tmp/agent/build/nginx-agent /usr/bin/nginx-agent \
&& mkdir -p /etc/nginx-agent \
&& cp /tmp/agent/nginx-agent.conf /etc/nginx-agent/ \
&& cd / \
&& rm -rf /tmp/agent \
&& apk del git go make

RUN apk add --no-cache bash \
&& mkdir -p /usr/lib/nginx/modules \
Expand Down
16 changes: 14 additions & 2 deletions build/Dockerfile.nginxplus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ FROM alpine:3.22
ARG NGINX_PLUS_VERSION=R35
# renovate: datasource=github-tags depName=nginx/agent
ARG NGINX_AGENT_VERSION=v3.5.0
ARG NGINX_AGENT_BRANCH=release-3.5.1
ARG NJS_DIR
ARG NGINX_CONF_DIR
ARG BUILD_AGENT
Expand All @@ -19,8 +20,19 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
addgroup -g 1001 -S nginx \
&& 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#v}
&& apk add --no-cache nginx-plus nginx-plus-module-njs nginx-plus-module-otel

# Build nginx-agent from source using the fix branch
RUN apk add --no-cache git go make \
&& git clone --branch ${NGINX_AGENT_BRANCH} --depth 1 https://github.com/nginx/agent.git /tmp/agent \
&& cd /tmp/agent \
&& make build \
&& cp /tmp/agent/build/nginx-agent /usr/bin/nginx-agent \
&& mkdir -p /etc/nginx-agent \
&& cp /tmp/agent/nginx-agent.conf /etc/nginx-agent/ \
&& cd / \
&& rm -rf /tmp/agent \
&& apk del git go make

RUN apk add --no-cache bash \
&& mkdir -p /usr/lib/nginx/modules \
Expand Down
Loading