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.

Sign up for GitHub

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

Jump to bottom

Add upstream packaged nginx.confs #957

Merged
merged 6 commits into from
Apr 6, 2023
Merged

Add upstream packaged nginx.confs #957

merged 6 commits into from
Apr 6, 2023

Conversation

amouat
Copy link
Contributor

@amouat amouat commented Apr 3, 2023 •
edited
Loading

Adds configs found in the upstream pacakges, but not in the source repo. See https://hg.nginx.org/pkg-oss/

Related: chainguard-images/images#382

Pre-review Checklist

For new package PRs only

  • This PR is marked as fixing a pre-existing package request bug
    • Alternatively, the PR is marked as related to a pre-existing package request bug, such as a dependency
  • REQUIRED - The package is available under an OSI-approved or FSF-approved license
  • REQUIRED - The version of the package is still receiving security updates

For security-related PRs

  • The security fix is recorded in annotations and secfixes

For version bump PRs

  • The epoch field is reset to 0
  • Patch source: patch source here

@amouat amouat requested a review from a team as a code owner April 3, 2023 09:05
@amouat amouat requested review from imjasonh and jr-chainguard April 3, 2023 09:05
@amouat amouat marked this pull request as draft April 3, 2023 09:10
imjasonh
imjasonh reviewed Apr 3, 2023
View reviewed changes
nginx.yaml Outdated Show resolved Hide resolved
nginx/nginx.conf Outdated Show resolved Hide resolved
nginx/nginx.default.conf Show resolved Hide resolved
amouat and others added 5 commits April 5, 2023 22:07
@amouat
Add upstream packaged nginx.confs
4dacf75 
Signed-off-by: Adrian Mouat <adrian@chainguard.dev>
@amouat
Fix config.
6436175 
Signed-off-by: Adrian Mouat <adrian@chainguard.dev>
@amouat @imjasonh
Update nginx/nginx.conf
e911c95 
Co-authored-by: Jason Hall <jason@chainguard.dev>
Signed-off-by: Adrian Mouat <adrian@chainguard.dev>
@amouat @imjasonh
Update nginx/nginx.default.conf
1d9a1ea 
Co-authored-by: Jason Hall <jason@chainguard.dev>
Signed-off-by: Adrian Mouat <adrian@chainguard.dev>
@amouat
Fix package config.
36706ad 
- also update version
- and send access_log to stdout in base config

Signed-off-by: Adrian Mouat <adrian@chainguard.dev>
@amouat amouat marked this pull request as ready for review April 5, 2023 20:14
@amouat
Forgot to reset epoch.
516915e 
Signed-off-by: Adrian Mouat <adrian@chainguard.dev>
@amouat
Copy link
Contributor Author

amouat commented Apr 6, 2023 •
edited
Loading

Note I have combined a patch update with this PR. Most changes are to a new subpackage, hence non-breaking. That being said, the default access log was changed to write to /dev/stdout, which I consider a bug-fix.

@rawlingsj rawlingsj merged commit 7b9988d into wolfi-dev:main Apr 6, 2023
@amouat amouat mentioned this pull request Apr 6, 2023
Closed
This was referenced Nov 29, 2024
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@imjasonh imjasonh imjasonh left review comments

@rawlingsj rawlingsj rawlingsj approved these changes

@jr-chainguard jr-chainguard Awaiting requested review from jr-chainguard jr-chainguard was automatically assigned from wolfi-dev/wolfi-repository-maintainers

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@amouat @imjasonh @rawlingsj