Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

security: don't crash on clair timeouts #1762

Merged
merged 1 commit into from
Apr 6, 2018
Merged

Conversation

mssola
Copy link
Collaborator

@mssola mssola commented Apr 5, 2018

Moreover, I've also added a configuration option so the timeouts for the
registry and clair can be configured separately. This has been done
because the Clair timeout by default is 900 seconds, which might be a
bit too high for registries.

Fixes #1751

Signed-off-by: Miquel Sabaté Solà [email protected]

@mssola mssola requested a review from vitoravelino April 5, 2018 14:35
@mssola
Copy link
Collaborator Author

mssola commented Apr 5, 2018

If accepted, this should be also cherry picked into the v2.3 branch.

vitoravelino
vitoravelino previously approved these changes Apr 5, 2018
Copy link
Contributor

@vitoravelino vitoravelino left a comment

Choose a reason for hiding this comment

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

LGTM 👍

Moreover, I've also added a configuration option so the timeouts for the
registry and clair can be configured separately. This has been done
because the Clair timeout by default is 900 seconds, which might be a
bit too high for registries.

Fixes SUSE#1751

Signed-off-by: Miquel Sabaté Solà <[email protected]>
@mssola mssola merged commit 25f79e1 into SUSE:master Apr 6, 2018
@mssola mssola deleted the clair-timeout branch April 6, 2018 07:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants