Skip to content

fix docker info, docker version --format=json not outputting json format #4168

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

Merged
merged 4 commits into from
Apr 11, 2023
Merged

fix docker info, docker version --format=json not outputting json format #4168

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1aaa179
cli/command/formatter: export JSONFormat const
thaJeztah Apr 10, 2023
46234b8
fix docker info --format=json not outputting json format
thaJeztah Apr 9, 2023
80640bc
cli/command/system: make default version template a const
thaJeztah Apr 10, 2023
23bd746
fix docker version --format=json not outputting json format
thaJeztah Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/command/system/version.go
View file
Open in desktop
Copy link
Member

@rumpl rumpl Apr 11, 2023

Choose a reason for hiding this comment

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

Sneaky little commit that's unrelated :)

Copy link
Member Author

@thaJeztah thaJeztah Apr 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

It's a .golden file, and used for the extra test-case that was added;

assert.Check(t, golden.String(cli.OutBuffer().String(), "docker-client-version.json.golden"))

Copy link
Member Author

@thaJeztah thaJeztah Apr 11, 2023

Choose a reason for hiding this comment

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

😂 so I thought you meant that JSON file, but it was referring to the "make it a const" commit. I had that in another PR, but doing it later would mean we had more code-churn, as the lines using it are touched by this PR, so I moved it first to prevent that.

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/tonistiigi/go-rosetta"
)

var versionTemplate = `{{with .Client -}}
const defaultVersionTemplate = `{{with .Client -}}
Client:{{if ne .Platform.Name ""}} {{.Platform.Name}}{{end}}
Version: {{.Version}}
API version: {{.APIVersion}}{{if ne .APIVersion .DefaultAPIVersion}} (downgraded from {{.DefaultAPIVersion}}){{end}}
Expand Down Expand Up @@ -195,7 +195,7 @@ func prettyPrintVersion(dockerCli command.Cli, vd versionInfo, tmpl *template.Te

func newVersionTemplate(templateFormat string) (*template.Template, error) {
if templateFormat == "" {
templateFormat = versionTemplate
templateFormat = defaultVersionTemplate
}
tmpl := templates.New("version").Funcs(template.FuncMap{"getDetailsOrder": getDetailsOrder})
tmpl, err := tmpl.Parse(templateFormat)
Expand Down