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.

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

[18.06] Improve version output alignment #1207

Merged

Conversation

thaJeztah
Copy link
Member

do not merge (yet):

rc3 was cut, and should be 18.06-GA; discuss with @andrewhsu first before merging

Cherry-pick of #1204 for 18.06

git checkout -b 18.06-backport-improve-version-align upstream/18.06
git cherry-pick -s -S -x 55ff66d967b9134f42aa5a9b28adde87fbfeca6e
git cherry-pick -s -S -x 0f7ae34ea9c9401a109640c2847756ff32e772bd
git push -u origin

cherry-pick was clean; no conflicts

Add some extra fixture information and test, and increase the column-width to account for wide names in component output;

Before this change;

docker version

Client:
 Version:      18.99.5-ce
 API version:  1.38
 Go version:   go1.10.2
 Git commit:   deadbeef
 Built:        Wed May 30 22:21:05 2018
 OS/Arch:      linux/amd64
 Experimental: true

Server: Docker Enterprise Edition (EE) 2.0
 Engine:
  Version:      17.06.2-ee-15
  API version:  1.30 (minimum version 1.12)
  Go version:   go1.8.7
  Git commit:   64ddfa6
  Built:        Mon Jul  9 23:38:38 2018
  OS/Arch:      linux/amd64
  Experimental: false
 Universal Control Plane:
  Version:       17.06.2-ee-15
  ApiVersion:    1.30
  Arch:          amd64
  BuildTime:     Mon Jul  2 21:24:07 UTC 2018
  GitCommit:     4513922
  GoVersion:     go1.9.4
  MinApiVersion: 1.20
  Os:            linux
  Version:       3.0.3-tp2
 Kubernetes:
  Version:      1.8+
  buildDate:    2018-04-26T16:51:21Z
  compiler:     gc
  gitCommit:    8d637aedf46b9c21dde723e29c645b9f27106fa5
  gitTreeState: clean
  gitVersion:   v1.8.11-docker-8d637ae
  goVersion:    go1.8.3
  major:        1
  minor:        8+
  platform:     linux/amd64
 Calico:
  Version:          v3.0.8
  cni:              v2.0.6
  kube-controllers: v2.0.5
  node:             v3.0.8

With this change applied:

docker version

Client:
 Version:           18.99.5-ce
 API version:       1.38
 Go version:        go1.10.2
 Git commit:        deadbeef
 Built:             Wed May 30 22:21:05 2018
 OS/Arch:           linux/amd64
 Experimental:      true

Server: Docker Enterprise Edition (EE) 2.0
 Engine:
  Version:          17.06.2-ee-15
  API version:      1.30 (minimum version 1.12)
  Go version:       go1.8.7
  Git commit:       64ddfa6
  Built:            Mon Jul  9 23:38:38 2018
  OS/Arch:          linux/amd64
  Experimental:     false
 Universal Control Plane:
  Version:          17.06.2-ee-15
  ApiVersion:       1.30
  Arch:             amd64
  BuildTime:        Mon Jul  2 21:24:07 UTC 2018
  GitCommit:        4513922
  GoVersion:        go1.9.4
  MinApiVersion:    1.20
  Os:               linux
  Version:          3.0.3-tp2
 Kubernetes:
  Version:          1.8+
  buildDate:        2018-04-26T16:51:21Z
  compiler:         gc
  gitCommit:        8d637aedf46b9c21dde723e29c645b9f27106fa5
  gitTreeState:     clean
  gitVersion:       v1.8.11-docker-8d637ae
  goVersion:        go1.8.3
  major:            1
  minor:            8+
  platform:         linux/amd64
 Calico:
  Version:          v3.0.8
  cni:              v2.0.6
  kube-controllers: v2.0.5
  node:             v3.0.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 55ff66d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0f7ae34)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.06.0 milestone Jul 12, 2018
@thaJeztah thaJeztah changed the title [do not merge] [18.06] Improve version output alignment [18.06] Improve version output alignment Jul 16, 2018
Copy link
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 2cb2e84 into docker:18.06 Jul 18, 2018
@thaJeztah thaJeztah deleted the 18.06-backport-improve-version-align branch July 18, 2018 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants