docker info: fix connection errors and exit code being discarded#1
Open
thaJeztah wants to merge 2 commits intoBenehiko:info-exit-codefrom
Open
docker info: fix connection errors and exit code being discarded#1thaJeztah wants to merge 2 commits intoBenehiko:info-exit-codefrom
thaJeztah wants to merge 2 commits intoBenehiko:info-exit-codefrom
Conversation
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
Check whether `formatInfo` or `prettyPrintInfo` handled the error, otherwise
return it. Previously we'd print the error, but the function may not have
handled the error if a template was used that didn't consume the ServerErrors
field.
Before;
docker -H example.invalid info > /dev/null
ERROR: error during connect: Get "http://example.invalid:2375/v1.48/info": dial tcp: lookup example.invalid: no such host
errors pretty printing info
echo $?
1
docker -H example.invalid info --format '{{.Architecture}}' > /dev/null
error during connect: Get "http://example.invalid:2375/v1.48/info": dial tcp: lookup example.invalid: no such host
echo $?
0
# invalid template
docker -H example.invalid info --format '{{.Whoops}}' > /dev/null
error during connect: Get "http://example.invalid:2375/v1.48/info": dial tcp: lookup example.invalid: no such host
template: :1:2: executing "" at <.Whoops>: cant evaluate field Whoops in type system.dockerInfo
echo $?
1
After;
docker -H example.invalid info > /dev/null
ERROR: error during connect: Get "http://example.invalid:2375/v1.48/info": dial tcp: lookup example.invalid: no such host
errors pretty printing info
echo $?
1
docker -H example.invalid info --format '{{.Architecture}}' > /dev/null
error during connect: Get "http://example.invalid:2375/v1.48/info": dial tcp: lookup example.invalid: no such host
echo $?
1
docker -H example.invalid info --format '{{.Whoops}}' > /dev/null
error during connect: Get "http://example.invalid:2375/v1.48/info": dial tcp: lookup example.invalid: no such host
template: :1:2: executing "" at <.Whoops>: cant evaluate field Whoops in type system.dockerInfo
echo %?
1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
b69b09a to
c899a20
Compare
c899a20 to
353230d
Compare
This file contains hidden or 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
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.
Check whether
formatInfoorprettyPrintInfohandled the error, otherwise return it. Previously we'd print the error, but the function may not have handled the error if a template was used that didn't consume the ServerErrors field.Before;
After;
- What I did
- How I did it
- How to verify it
- Human readable description for the release notes
- A picture of a cute animal (not mandatory but encouraged)