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

Support Nginx-1.26 on Fedora 40 #297

Merged
merged 5 commits into from
Jul 1, 2024
Merged

Support Nginx-1.26 on Fedora 40 #297

merged 5 commits into from
Jul 1, 2024

Conversation

phracek
Copy link
Member

@phracek phracek commented May 21, 2024 •
edited by github-actions bot
Loading

This pull request adds support Nginx 1.26 on Fedora 40. The rest are not supported for now.

@phracek phracek mentioned this pull request May 21, 2024
Merged
@phracek
Copy link
Member Author

phracek commented May 21, 2024

Manually executed tests on Fedora:

 [PASSED] for 'test-app' test_s2i_usage (00:00:01)
 [PASSED] for 'test-app' test_docker_run_usage (00:00:00)
 [PASSED] for 'test-app' test_application (00:00:03)
 [PASSED] for 'test-app' test_log_output (00:00:01)
 [PASSED] for 'test-app' test_log_volume_output (00:00:02)
 [PASSED] for 'test-app' test_application_user (00:00:03)
 [PASSED] for 'start-hook-test-app' test_pre_init_script (00:00:02)
 [FAILED] for 'miscellaneous-tests' run_dockerfiles_test (00:00:01)

zmiklank
zmiklank reviewed May 21, 2024
View reviewed changes
Copy link
Contributor

@zmiklank zmiklank left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for adding the new version of nginx. Please make sure to not squash the commits when merging.

@phracek
Copy link
Member Author

phracek commented May 21, 2024

Thank you for adding the new version of nginx. Please make sure to not squash the commits when merging.

As soon as the new version is coming, I do not squash commits at all, because each commit is important for git history.

@phracek phracek force-pushed the support_nginx_126 branch from 775b32b to 7de20e4 Compare June 6, 2024 11:05
@phracek
Copy link
Member Author

phracek commented Jun 6, 2024

[test-all]

@phracek phracek mentioned this pull request Jun 19, 2024
Merged
@phracek
Copy link
Member Author

phracek commented Jun 19, 2024

[test-all]

pkubatrh
pkubatrh reviewed Jun 19, 2024
View reviewed changes
pkubatrh
pkubatrh reviewed Jun 19, 2024
View reviewed changes
phracek added a commit that referenced this pull request Jun 20, 2024
@phracek
Add 1.26 examples directory. This is needed for passing tests
b98486b 
#297

Signed-off-by: Petr "Stone" Hracek <[email protected]>
@phracek phracek mentioned this pull request Jun 20, 2024
Merged
phracek added a commit that referenced this pull request Jun 20, 2024
@phracek
Add 1.26 examples directory. This is needed for passing tests (#305)
f3d5723 
#297

Signed-off-by: Petr "Stone" Hracek <[email protected]>
@phracek phracek force-pushed the support_nginx_126 branch 2 times, most recently from db4b662 to 175256b Compare June 20, 2024 10:23
@phracek
Copy link
Member Author

phracek commented Jun 20, 2024

I have re-written this PR, including commit reorganization

[test][test-openshift]

@phracek phracek mentioned this pull request Jun 26, 2024
Merged
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 27, 2024 •
edited
Loading

Pull Request validation

Failed

🔴 Review - Missing review from a member

Success

🟢 CI - All checks have passed

@phracek phracek requested review from zmiklank and pkubatrh and removed request for zmiklank June 27, 2024 11:57
@pkubatrh
Copy link
Member

pkubatrh commented Jul 1, 2024

Please squash bc5533b and 743fe95 together, otherwise lgtm

phracek added 5 commits July 1, 2024 14:02
@phracek
Moving version 1.24 to 1.26 and save git history
e001149 
Signed-off-by: Petr "Stone" Hracek <[email protected]>
@phracek
Copy version 1.26 back to 1.24
bfd2c56 
Several fixed for new-files
- Fix symlinks
- Add new examples/1.26/test-app directory

Signed-off-by: Petr "Stone" Hracek <[email protected]>
@phracek
Remove c8s Dockerfile and .exclude file
c6caec9 
Fix versions in Dockerfiles

Update README's

Signed-off-by: Petr "Stone" Hracek <[email protected]>
@phracek
Add build-and-push action support for Fedora nginx-126 registry image
621c2db 
Signed-off-by: Petr "Stone" Hracek <[email protected]>
@phracek
Do not test 1.24 Fedora version.
fd4218a 
Enable nginx:1.22 module in 1.22-micro. Default nginx is 1.20

Disable testing 1.26 CentOS Stream 9 because module is missing

Do not test Nginx-1.26 on RHEL8 and RHEL9

Signed-off-by: Petr "Stone" Hracek <[email protected]>
@phracek phracek force-pushed the support_nginx_126 branch from 175256b to fd4218a Compare July 1, 2024 12:03
@phracek
Copy link
Member Author

phracek commented Jul 1, 2024

Squashed.

@phracek
Copy link
Member Author

phracek commented Jul 1, 2024

[test-all]

@phracek phracek merged commit c8479b2 into master Jul 1, 2024
28 checks passed
@phracek phracek deleted the support_nginx_126 branch July 1, 2024 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zmiklank zmiklank zmiklank left review comments

@pkubatrh pkubatrh Awaiting requested review from pkubatrh

Assignees
No one assigned
Labels
pr/missing-review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@phracek @pkubatrh @zmiklank