Fetch latest changes from the original repo#1
Open
dima11051994 wants to merge 336 commits into
Open
Conversation
By popular request in #419
…esses The script is a no-op bye default, you would need to enable its logic by setting an NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE variable to any value. The script then tries to get the following values: - getconf _NPROCESSORS_ONLN - the amount of cpus from cpuset cgroupv1 - the quotas from cpu/cpuacct cgroupv1 - the amount of cpus from cgroupv2 - the quotas from cgroupv2 The lowest of all five is then applied to nginx.conf. Fixes #472
…rsion We're now using a tip of default branch on pkg-oss which moves fast and breaks things. A better solution is probably to check out a specific nginx tag and build whatever is available for it. This, however, is not currently possible with 1.19.6, and only works for 1.19.7. This should probably be reverted once we have enough tags supporting it.
While at it, bumped alpine base image to 3.13 and njs to 0.5.3
This is suggested as a fix for build issues (#525) in https://gitlab.alpinelinux.org/alpine/abuild/-/commit/32b7789e9ac09dad7f6d39df349c9a94e93e00c8
While at it, move mainline builds to alpine 3.14.
Signed-off-by: Elouan Martinet <[email protected]>
Follows up on d99874f
`docker manifest` cli invocation does not support oci indexes with multiple manifests; move to buildx to create and push the manifests instead.
Currently, Alpine upstream repos ship the same version/release of nginx as we do, which means apk prefers it over ours. We make sure that the correct version is chosen by redefining what repositories apk has at the invocation, but that means we need to preinstall the dependencies, so let's do just that.
Follows up on 8690489 as requested by Docker Library folks.
Pin unpinned actions in ci.yml to their full commit SHAs to prevent supply-chain attacks via mutable tags. - actions/checkout: v3 -> f43a0e5ff2bd294095638e18286ca9a3d1956744 - docker-library/bashbrew: v0.1.12 -> d23b94357ef16d21a8d14578d5338152e4460c91 Co-authored-by: Copilot <[email protected]>
mainline goes to 1.29.7 stable goes to 1.28.3 njs@stable goes to 0.9.6
While at it, bump njs as well
Reported by Rupesh Kumar (NullSpec7or).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
17 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We need to update nginx version for our services, but we still want to have our custom logic (installing VTS module) to be present in new images. So, that's why we just want to merge all the upstream changes to our fork.