Skip to content
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.

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

Update mainline NGINX to 1.25.3 #167

Merged
merged 2 commits into from
Nov 14, 2023
Merged

Conversation

abscondment
Copy link
Contributor

@abscondment abscondment commented Oct 28, 2023

Proposed changes

Updating mainline to NGINX 1.25.3, which includes this change:

Changes with nginx 1.25.3 24 Oct 2023

*) Change: improved detection of misbehaving clients when using HTTP/2.

Also updates njs to 0.8.2, which is required for the NGINX change to build.

Related to #166

Checklist

Before creating a PR, run through this checklist and mark each as complete:

  • I have read the CONTRIBUTING document
  • I have run ./update.sh and ensured all entrypoint/Dockerfile template changes have been applied to the relevant image entrypoint scripts & Dockerfiles
  • I have tested that the NGINX Unprivileged Docker images build and run correctly on all supported architectures on an unprivileged environment (check out the README for more details)
  • I have updated any relevant documentation (README)

This includes, among other things, improvements related to CVE-2023-44487.

Also update njs to 0.8.2 so the build will succeed.
@abscondment
Copy link
Contributor Author

I couldn't find any specific guidance for testing all of the README.md#architectures, so I wrote this up: https://gist.github.com/abscondment/e12fd25b9ada4d4445f8b2e286e5d6cc

All mainline images passed for all listed architectures using this script.

@alessfg
Copy link
Collaborator

alessfg commented Nov 14, 2023

Thanks for the PR, and sorry it took so long to merge! I have been offline for the past couple weeks.

You are right that there is no real guidance on how to test changes. I have my own little script not unlike yours, and it's on my todo list to create an "offline" GH actions workflow that can be easily tested locally using act or other similar tools. For the time being though, I might combine both our scripts and ask users to use that for tests!

@alessfg alessfg merged commit c235526 into nginxinc:main Nov 14, 2023
@abscondment abscondment deleted the nginx-1.25.3 branch November 14, 2023 16:14
@alessfg
Copy link
Collaborator

alessfg commented Nov 14, 2023

Opened an issue to track improving the local testing docs (#173)!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants