forked from nginx/docker-nginx
-
Notifications
You must be signed in to change notification settings - Fork 0
Fetch latest changes from the original repo #1
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
Open
dima11051994
wants to merge
293
commits into
prodatakey:master
Choose a base branch
from
nginx:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
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
Fixes #394.
Added: - arm32v7 for Alpine - arm32v5 and mips64le for Debian
This allows to launch configuration scripts on the start of container.
This aims to fix #394. IPv6 will not be enabled if /proc/net/if_inet6 is not available inside a container or a default.conf differs from the one installed by the package manager. Those who modify default.conf are considered savvy enough to enable ipv6 via custom configuration.
This entrypoint script will look for files in /etc/nginx/templates/ with a ".conf.template" suffix, run them through envsubst replacing defined environment variables, and output to /etc/nginx/conf.d/ preserving file name sans .template. Fixes #232.
- remove undefined behaviour from the if statements - exit early if a file already has an ipv6 listen - fixed md5sum check
Additionally, ignore folders that could match suffixes.
- allow to run with nginx-debug cmd - prevent running if /docker-entrypoint.d was replaced with unreadable or empty dir - don't run find multiple times
A POSIX compatible sh is guaranteed to be available as /bin/sh. By not using /usr/bin/env simply whitelisting /docker-entrypoint.sh within mandatory access control frameworks, such as AppArmor, is sufficient. When /usr/bin/env is used /docker-entrypoint.sh and the shell that provides sh (e.g. /bin/dash for debian based images) need to be whitelisted, increasing the possible attack area, by providing access to a full shell.
While at it, updated njs to 0.8.10 for mainline.
While at it, bump njs and otel to contemporary versions as well.
This makes sure all keys are exported to a keyring archive, as opposed to only the first key.
…for. mainline is now based on trixie, which removes mips64le and adds riscv64. stable is currently kept as-is.
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.