The Wayback Machine - https://web.archive.org/web/20260104004235/https://github.com/docker/cli/pull/965
Skip to content

Fix docker version output alignment #965

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
Merged
vdemeester merged 1 commit into from
Mar 28, 2018
Merged

Fix docker version output alignment #965

vdemeester merged 1 commit into from
Mar 28, 2018

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Mar 26, 2018 •
edited
Loading

closes #964
closes #769
closes #913

Use tabwriter to print the version output

@tiborvass I tried using a tab writer, and this seems to work correctly; do you know what bug you ran into?

Output with this change:

Client:
 Version:      18.04.0-dev
 API version:  1.37
 Go version:   go1.9.4
 Git commit:   76439457
 Built:        Mon Mar 26 14:10:50 2018
 OS/Arch:      linux/amd64
 Experimental: false
 Orchestrator: swarm

Server:
 Engine:
  Version:      18.03.0-ce-rc4
  API version:  1.37 (minimum version 1.12)
  Go version:   go1.9.4
  Git commit:   fbedb97
  Built:        Thu Mar 15 07:42:29 2018
  OS/Arch:      linux/amd64
  Experimental: true
vdemeester
vdemeester approved these changes Mar 26, 2018
View reviewed changes
Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐫
@thaJeztah
Copy link
Member Author

thaJeztah commented Mar 26, 2018

Or do we want "client" and "server" columns to be aligned? (guess we can do so by making the "min" width bigger)
This was referenced Mar 26, 2018
Closed
Closed
dnephin
dnephin reviewed Mar 26, 2018
View reviewed changes
cli/command/system/version.go Outdated
err = err2
}
dockerCli.Out().Write([]byte{'\n'})
buffer.WriteTo(t)
Copy link
Contributor

@dnephin dnephin Mar 26, 2018

Choose a reason for hiding this comment

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

Why do you need a buffer here? Can't you use t as the first arg to tmpl.Execute ?
Copy link
Member Author

@thaJeztah thaJeztah Mar 26, 2018

Choose a reason for hiding this comment

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

Oh! was debugging, looks like I don't need it here anymore no.
@thaJeztah
Fix docker version output alignment
48eb7a0 
Use tabwriter to print the version output

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the fix-version-output branch from 69003e9 to 48eb7a0 Compare March 26, 2018 15:59
dnephin
dnephin approved these changes Mar 26, 2018
View reviewed changes
Copy link
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

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

LGTM
seemethere
seemethere approved these changes Mar 27, 2018
View reviewed changes
Copy link
Contributor

@seemethere seemethere left a comment

Choose a reason for hiding this comment

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

LGTM
@vdemeester vdemeester merged commit eb4a4fe into docker:master Mar 28, 2018
@GordonTheTurtle GordonTheTurtle added this to the 18.04.0 milestone Mar 28, 2018
@thaJeztah thaJeztah deleted the fix-version-output branch March 28, 2018 07:59
@thaJeztah thaJeztah modified the milestones: 18.04.0, 18.05.0 Apr 9, 2018
@thaJeztah thaJeztah mentioned this pull request Apr 9, 2018
Merged
@thaJeztah thaJeztah mentioned this pull request Apr 26, 2018
Closed
@thaJeztah thaJeztah mentioned this pull request May 31, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

process/cherry-picked status/2-code-review

5 participants

@thaJeztah @vdemeester @dnephin @seemethere @GordonTheTurtle