Fetch latest changes from the original repo #1
Conversation
This file contains 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
(cherry picked from commit 4209281) Signed-off-by: Konstantin Pavlov <[email protected]>
For the architectures unavailable on nginx.org, build from the official packaging sources. Also adds njs.
While at it, merge mainline versioning changes.
101 was chosen as UID/GID for both supported platforms since that's the first unused pair. This also looks forward compatible at least for now with Debian Buster and Alpine 3.10 as from the :edge tag of the time writing this message. Fixes: #218.
And other minor formatting fixes Signed-off-by: Konstantin Pavlov <[email protected]>
This makes stable images buildable until the next version bump.
Signed-off-by: Konstantin Pavlov <[email protected]>
Signed-off-by: Konstantin Pavlov <[email protected]>
Closes: #821
(Modsecurity is no longer built & shipped in pkg-oss).
apk index no longer accepts untrusted keys since 2.14.2
It seems github actions runners are having issues with ipv6 since lateset updates to Docker 26. Let them sort the issues out first, and then we can revert this change.
Prebuilt binaries from nginx.org are to be signed with different keys moving forward. This change introduces two new 4096-bit RSA keys (aptly named "signing key 2" and "signing key 3") that will be used for that process. The keys can be fetched from nginx.org, too: $ curl -s https://nginx.org/keys/nginx_signing.key | gpg --show-keys - pub rsa4096 2024-05-29 [SC] 8540A6F18833A80E9C1653A42FD21310B49F6B46 uid nginx signing key <[email protected]> pub rsa2048 2011-08-19 [SC] [expires: 2027-05-24] 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 uid nginx signing key <[email protected]> pub rsa4096 2024-05-29 [SC] 9E9BE90EACBCDE69FE9B204CBCDCD8A38D88A2B3 uid nginx signing key <[email protected]> As a nice side-effect, this allows us to re-fetch the older 2048-bit RSA key. It expired on Jun 14 2024, but was extended to be valid for another three years) still used to sign current packages. Unfortunately the key with the extended validity period was uploaded to the keyservers a bit too late to be picked up by current image builds, resulting in somewhat unexpected breakages for downstream images.
While at it, introduced specific env variables for built-in dynamic modules versions, as they can differ from the main nginx binary packages.
Trailing whitespaces break configs that use quotation marks around vars. See nginxinc/docker-nginx-unprivileged#234
Not all alpine-based images have curl that's needed to fetch the sources of modules built.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.