Skip to content

Update mainline to 1.31.5 and njs to 1.0.1 - - #423

Merged
thresheek merged 2 commits into
nginx:mainfrom
thresheek:nginx1315
Sep 2, 2026
Merged

Update mainline to 1.31.5 and njs to 1.0.1 -#423
thresheek merged 2 commits into
nginx:mainfrom
thresheek:nginx1315

Conversation

@thresheek

Copy link
Copy Markdown
Member

This PR updates mainline nginx version to 1.31.5, along with njs update to 1.0.1 for both mainline and stable.

Copilot AI lite review requested due to automatic review settings September 2, 2026 18:59
@thresheek
thresheek requested a review from a team as a code owner September 2, 2026 18:59

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

The version bumps and corresponding pkg-oss revision/checksum updates are consistent across the touched generators and Dockerfiles, with only minor maintainability suggestions.

Pull request overview

This PR bumps the mainline NGINX base version to 1.31.5 and updates NJS to 1.0.1 for both mainline and stable, including corresponding pkg-oss revision/checksum updates used for building packages/modules (especially on non-upstream architectures).

Changes:

  • Update mainline NGINX from 1.31.4 → 1.31.5 across generated images.
  • Update NJS from 1.0.0 → 1.0.1 for both mainline and stable variants.
  • Update pkg-oss revision/checksums (including pinning stable to a specific pkg-oss commit SHA) to keep source builds reproducible.
File summaries
File Description
update.sh Updates version matrices (NGINX/NJS) and pkg-oss revision/checksums used to generate Dockerfiles.
stable/debian/Dockerfile Bumps stable NJS version and pins pkg-oss revision/checksum for stable builds.
stable/debian-perl/Dockerfile Updates pkg-oss revision/checksum for stable perl module build path.
stable/debian-otel/Dockerfile Updates pkg-oss revision/checksum for stable otel module build path.
stable/alpine/Dockerfile Bumps stable NJS version and updates pkg-oss revision/checksum for unsupported-arch source builds.
stable/alpine-slim/Dockerfile Updates pkg-oss revision/checksum for unsupported-arch source builds.
stable/alpine-perl/Dockerfile Updates pkg-oss revision/checksum for unsupported-arch source builds.
stable/alpine-otel/Dockerfile Updates pkg-oss revision/checksum for unsupported-arch source builds.
mainline/debian/Dockerfile Bumps mainline NGINX/NJS versions and updates pkg-oss checksum accordingly.
mainline/debian-perl/Dockerfile Updates mainline base image tag and pkg-oss checksum for perl module build path.
mainline/debian-otel/Dockerfile Updates mainline base image tag and pkg-oss checksum for otel module build path.
mainline/alpine/Dockerfile Updates mainline base image tag, bumps NJS version, and updates pkg-oss checksum.
mainline/alpine-slim/Dockerfile Bumps mainline NGINX version and updates pkg-oss checksum for source-build path.
mainline/alpine-perl/Dockerfile Updates mainline base image tag and pkg-oss checksum for perl module build path.
mainline/alpine-otel/Dockerfile Updates mainline base image tag and pkg-oss checksum for otel module build path.
Review details
  • Files reviewed: 15/15 changed files
  • Comments generated: 4
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread stable/alpine-otel/Dockerfile
Comment thread stable/alpine-perl/Dockerfile
Comment thread stable/alpine-slim/Dockerfile
Comment thread stable/alpine/Dockerfile
@thresheek
thresheek enabled auto-merge (rebase) September 2, 2026 19:34
@thresheek
thresheek disabled auto-merge September 2, 2026 19:34
@thresheek
thresheek merged commit 35a0ecd into nginx:main Sep 2, 2026
9 checks passed
@thresheek
thresheek deleted the nginx1315 branch September 2, 2026 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants