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

Add nginx startup probe #405

Merged
merged 6 commits into from Jun 28, 2023
Merged

Conversation

ishioni
Copy link
Contributor

@ishioni ishioni commented Jun 1, 2023

Pull Request

Description of the change

Add startupProbe to nginx. For some reason it was missing compared to the apache version

Benefits

Both types support the same range of probes

Possible drawbacks

none?

Applicable issues

  • fixes #

Additional information

Checklist

nginx was missing startupProbe for some reason

Signed-off-by: Piotr Maksymiuk <50323052+ishioni@users.noreply.github.com>
Signed-off-by: Piotr Maksymiuk <50323052+ishioni@users.noreply.github.com>
@ishioni ishioni changed the title Nginx startup probe Add nginx startup probe Jun 3, 2023
@ishioni
Copy link
Contributor Author

ishioni commented Jun 7, 2023

@jessebot Could you take a look?

@ishioni
Copy link
Contributor Author

ishioni commented Jun 26, 2023

@provokateurin Can this be merged please?

@provokateurin
Copy link
Member

@ishioni Please resolve the conflict, I will merge afterwards.

provokateurin and others added 4 commits June 28, 2023 00:48
Signed-off-by: jld3103 <jld3103yt@gmail.com>
Signed-off-by: jld3103 <jld3103yt@gmail.com>
Signed-off-by: Piotr Maksymiuk <50323052+ishioni@users.noreply.github.com>
Signed-off-by: Piotr Maksymiuk <50323052+ishioni@users.noreply.github.com>
@ishioni
Copy link
Contributor Author

ishioni commented Jun 27, 2023

@provokateurin Done

@provokateurin provokateurin merged commit c015ea9 into nextcloud:main Jun 28, 2023
2 checks passed
@provokateurin
Copy link
Member

Ah I just saw you merged the main branch into this one. Please rebase onto the main branch next time, it results in cleaner git history.

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.

None yet

2 participants