Catch TLSParameterErrors from docker-py #2692
Merged
Conversation
This file contains 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
|
LGTM! |
| log.error( | ||
| 'TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY and DOCKER_CERT_PATH are set correctly.\n' | ||
| 'You might need to run `eval "$(docker-machine env default)"`') | ||
| sys.exit(1) |
There was a problem hiding this comment.
This error is really specific to one section of the code, I don't think we need it in the general catch-all error handling.
Could we move it to docker_client.py and re-raise a UserError with this message?
Arguably a few of these other errors should be moved to more specific areas as well.
There was a problem hiding this comment.
Good point - updated.
Some other errors might be moveable - the only ones that need to be here are those which don't happen until we make an API request, I suppose.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
aanand
force-pushed
the
fix-tls-paramater-error
branch
from
6f83a29
to
9ccef1e
Compare
|
LGTM |
aanand
added a commit
that referenced
this pull request
Jan 19, 2016
Catch TLSParameterErrors from docker-py
|
Cherry-picked into #2753 |
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.
No description provided.