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

[23.0 backport] fix docker info, docker version --format=json not outputting json format #4230

Merged
merged 4 commits into from
Apr 26, 2023
Merged

[23.0 backport] fix docker info, docker version --format=json not outputting json format #4230

merged 4 commits into from
Apr 26, 2023

Commits on Apr 26, 2023

  1. cli/command/formatter: export JSONFormat const 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 1aaa179)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    9912408 View commit details
    Browse the repository at this point in the history

  2. fix docker info --format=json not outputting json format 

    The --format=json option was added for all inspect commands, but was not implemented
for "docker info". This patch implements the missing option.

Before this patch:

    docker info --format=json
    json

With this patch applied:

    docker info --format=json
    {"ID":"80c2f18a-2c88-4e4a-ba69-dca0eea59835","Containers":7,"ContainersRunning":"..."}

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 46234b8)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    2c1fde2 View commit details
    Browse the repository at this point in the history

  3. cli/command/system: make default version template a const 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 80640bc)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    9dfe5a2 View commit details
    Browse the repository at this point in the history

  4. fix docker version --format=json not outputting json format 

    The --format=json option was added for all inspect commands, but was not
implemented for "docker version". This patch implements the missing option.

Before this patch:

    docker version --format=json
    json

With this patch:

    docker version --format=json
    {"Client":{"Platform":{"Name":""},"Version":"24.0.0-dev","ApiVersion":"..."}}

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 23bd746)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    f914316 View commit details
    Browse the repository at this point in the history