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

Separate client infomation in docker system info #1638

Merged
merged 5 commits into from
Jan 25, 2019
Merged

Separate client infomation in docker system info #1638

merged 5 commits into from
Jan 25, 2019

Commits on Jan 25, 2019

  1. Add unit test for formatInfo. 

    Signed-off-by: Ian Campbell <[email protected]>
    Ian Campbell committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    eb714f7 View commit details
    Browse the repository at this point in the history

  2. Check json output in existing docker info unit tests. 

    This is in addition to the more specific `formatInfo` unit tests added
previously.

Signed-off-by: Ian Campbell <[email protected]>
    Ian Campbell committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    7913fb6 View commit details
    Browse the repository at this point in the history

  3. Separate client and daemon info in docker system info 

    Right now the only client side info we have is whether debug is enabled, but we
expect more in the future.

We also preemptively prepare for the possibility of multiple errors when
gathering both daemon and client info.

Signed-off-by: Ian Campbell <[email protected]>
    Ian Campbell committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    62ed1c0 View commit details
    Browse the repository at this point in the history

  4. Allow prettyPrintInfo to return multiple errors 

    This allows it to print what it can, rather than aborting half way when a bad
security context is hit.

Signed-off-by: Ian Campbell <[email protected]>
    Ian Campbell committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    c9e60ae View commit details
    Browse the repository at this point in the history

  5. Rework docker info output to be more like docker version 

    That is, reindent the two sections by one space.

While the code was done by hand the `.golden` files had the extra space
inserted with emacs' `string-insert-rectangle` macro to (try to) avoid possible
manual errors. The docs were edited the same way.

Signed-off-by: Ian Campbell <[email protected]>
    Ian Campbell committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    bcb06b5 View commit details
    Browse the repository at this point in the history