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

Fetch latest changes from the original repo #1

Open
wants to merge 252 commits into
base: master
Choose a base branch
from

Conversation

dima11051994
Copy link

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.

thresheek and others added 30 commits September 25, 2018 19:18
(cherry picked from commit 4209281)
Signed-off-by: Konstantin Pavlov <thresh@videolan.org>
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 <thresh@videolan.org>
This makes stable images buildable until the next version bump.
Signed-off-by: Konstantin Pavlov <thresh@videolan.org>
Signed-off-by: Konstantin Pavlov <thresh@videolan.org>
thresheek and others added 29 commits April 23, 2024 14:35
This also adds otel module to stable images.
With that, added otel tags for stable, too.
This is currently needed for mainline versions to pick up an update njs
release (0.8.4-2).
(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 <signing-key-2@nginx.com>

pub   rsa2048 2011-08-19 [SC] [expires: 2027-05-24]
      573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
uid                      nginx signing key <signing-key@nginx.com>

pub   rsa4096 2024-05-29 [SC]
      9E9BE90EACBCDE69FE9B204CBCDCD8A38D88A2B3
uid                      nginx signing key <signing-key-3@nginx.com>

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.