Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.03] Fix docker version output alignment#498

Merged
andrewhsu merged 1 commit intodocker-archive:18.03from
thaJeztah:18.03-backport-fix-version-output
Apr 18, 2018
Merged

[18.03] Fix docker version output alignment#498
andrewhsu merged 1 commit intodocker-archive:18.03from
thaJeztah:18.03-backport-fix-version-output

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Use tabwriter to print the version output

backport of docker/cli#965 for 18.03

git checkout -b 18.03-backport-fix-version-output upstream/18.03
git cherry-pick -s -S -x -Xsubtree=components/cli 48eb7a082dfcca6b16a3466a98cd27b04deb07c7
git push -u origin 18.03-backport-fix-version-output

no conflicts

@thaJeztah thaJeztah added this to the 18.03.1 milestone Apr 9, 2018
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @tiborvass @cpuguy83 PTAL

Copy link
Copy Markdown
Contributor

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@jose-bigio
Copy link
Copy Markdown

Listing failures for record keeping purposes (It doesn't seem like this Pull Request should fail ANY tests).

Failed CE tests with:

14:46:59 ----------------------------------------------------------------------
14:46:59 FAIL: check_test.go:366: DockerSwarmSuite.TearDownTest
14:46:59 
14:46:59 unmount of /tmp/docker-execroot/d9066c900e1bb/netns failed: invalid argument
14:46:59 unmount of /tmp/docker-execroot/d9066c900e1bb/netns failed: no such file or directory
14:46:59 check_test.go:371:
14:46:59     d.Stop(c)
14:46:59 daemon/daemon.go:389:
14:46:59     t.Fatalf("Error while stopping the daemon %s : %v", d.id, err)
14:46:59 ... Error: Error while stopping the daemon d2753ddbcb6d9 : exit status 130
14:46:59 
14:46:59 
14:46:59 ----------------------------------------------------------------------

and

8 ----------------------------------------------------------------------
07:25:28 FAIL: docker_cli_swarm_test.go:248: DockerSwarmSuite.TestSwarmNodeTaskListFilter
07:25:28 
07:25:28 [d992e47897dcf] waiting for daemon to start
07:25:28 [d992e47897dcf] daemon started
07:25:28 
07:25:28 docker_cli_swarm_test.go:257:
07:25:28     // make sure task has been deployed.
07:25:28     waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 3)
07:25:28 docker_utils_test.go:465:
07:25:28     c.Assert(v, checker, args...)
07:25:28 ... obtained int = 1
07:25:28 ... expected int = 3
07:25:28 ... output: "69a4caa37ff2\n"
07:25:28 
07:25:28 [d992e47897dcf] exiting daemon
07:30:24 sh: echo: I/O error
07:30:31 --- FAIL: Test (1811.84s)

For PowerPC

@jose-bigio jose-bigio requested a review from tiborvass April 10, 2018 16:59
@thaJeztah
Copy link
Copy Markdown
Member Author

17:13:18 runner/runner.go:12:2: cannot find package "gopkg.in/fsnotify.v1" in any of:
17:13:18 	/usr/local/go/src/gopkg.in/fsnotify.v1 (from $GOROOT)
17:13:18 	/go/src/gopkg.in/fsnotify.v1 (from $GOPATH)

Should be resolved so just needs to be restarted in CI

Use tabwriter to print the version output

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 48eb7a082dfcca6b16a3466a98cd27b04deb07c7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 18.03-backport-fix-version-output branch from 101da54 to a0c8cc8 Compare April 12, 2018 02:14
@thaJeztah
Copy link
Copy Markdown
Member Author

hm, odd failure on s390x; https://jenkins.dockerproject.org/job/docker-ce-pr-s390x/543/execution/node/321/log/?consoleFull

06:31:44 ----------------------------------------------------------------------
06:31:44 FAIL: docker_cli_logs_test.go:19: DockerSuite.TestLogsContainerSmallerThanPage
06:31:44 
06:31:44 docker_cli_logs_test.go:20:
06:31:44     testLogsContainerPagination(c, 32767)
06:31:44 docker_cli_logs_test.go:38:
06:31:44     c.Assert(out, checker.HasLen, testLen+1)
06:31:44 ... obtained string = ""
06:31:44 ... n int = 32768
06:31:44 
06:31:46 

could actually be fixed by another PR, let me check on that one

@andrewhsu andrewhsu merged commit b522d93 into docker-archive:18.03 Apr 18, 2018
@thaJeztah thaJeztah deleted the 18.03-backport-fix-version-output branch April 18, 2018 22:00
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 24, 2020
…ix-version-output

[18.03] Fix docker version output alignment
docker-jenkins pushed a commit that referenced this pull request Aug 31, 2020
[19.03 backport] bump buildx to v0.4.2
Upstream-commit: 395008c8af7a26ba5980f074bfdcb205b1651950
Component: packaging
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants