toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,848 Commits 3 Branches 295 Tags
c114e9c465231f8a8f940019f2f614ae7d0407ca
Commit Graph
41848 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle c114e9c465 Merge component 'cli' from git@github.com:docker/cli master 2018-08-15 00:07:01 +00:00
Brian Goff a46d6924fa Merge pull request #1014 from AkihiroSuda/connhelper-sshonly 
support SSH connection
Upstream-commit: e92614a175
Component: cli
 2018-08-14 15:12:06 -07:00
GordonTheTurtle 2b0a9fe44a Merge component 'cli' from git@github.com:docker/cli master 2018-08-14 20:36:50 +00:00
GordonTheTurtle e37773a24d Merge component 'engine' from git@github.com:docker/engine master 2018-08-14 17:02:40 +00:00
Sebastiaan van Stijn d8d0aaab1d Merge pull request #1284 from adshmh/refactor-stack-ps-tests 
refactor stack ps tests 
Upstream-commit: 4d4392ba04
Component: cli
 2018-08-14 18:59:56 +02:00
Sebastiaan van Stijn 1eafd46aad Merge pull request #37412 from AzureCR/naduggar/logissue 
Select polling based watcher for docker log file watcher on Windows
Upstream-commit: 678d4b3a6d4cd7824d26592090b4dec507ce4bc2
Component: engine
 2018-08-14 14:40:44 +02:00
Sebastiaan van Stijn 0de052caee Merge pull request #37635 from kolyshkin/test-logs 
integration-cli: error logging improvements
Upstream-commit: 3c5eac362884bb60f9c7778966559d04b44cfb6a
Component: engine
 2018-08-14 14:38:34 +02:00
Kir Kolyshkin 0b5da3a767 integration-cli: error report improvements 
1. After running d.Cmd(), in case an error is returned, it makes sense
to print command output, as its stderr may contain a clue about what
went wrong. This is by no means complete, just as far as I could go.

2. In case the comment in c.Assert is a constant string, it's better
to provide it as a comment which will be printed.

3. An arbitrary string should not be passed on to a function expecting
%-style formatting. Use %s to fix this.

4. Print the output string before transformation, not after.

5. Unify the output format (drop "out:" prefix").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: ac038eab298eeecab55a62440de302e3bb3f4889
Component: engine
 2018-08-14 12:52:30 +03:00
Kir Kolyshkin fe821da2fd integration: use %s for check.Commentf() 
It is wrong to pass an arbitrary string to a function expecting
%-style formatting. One solution would be to replace any % with %%,
but it's easier to just do what this patch does.

Generated with:

for f in $(git grep -l 'check.Commentf(out)'); do \
	sed -i -e 's/check\.Commentf(out)/check.Commentf("%s", out)/g' $f; \
done

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 83363fb2d4d97d952a0052d079faa8ae39aa20b6
Component: engine
 2018-08-14 10:45:39 +03:00
GordonTheTurtle b04c87dc5b Merge component 'engine' from git@github.com:docker/engine master 2018-08-13 05:01:54 +00:00
Yong Tang 96af87df0a Merge pull request #37443 from Projjol/new_names 
Add in two new names for names-generator
Upstream-commit: 1fd7e4c28d3a4a21c3540f03a045f96a4190b527
Component: engine
 2018-08-12 19:04:56 -07:00
Arash Deshmeh 0b69793ee3 refactor stack ps tests to table-driven 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 340e4ee8e5
Component: cli
 2018-08-10 15:13:45 -04:00
GordonTheTurtle af7228d929 Merge component 'cli' from git@github.com:docker/cli master 2018-08-10 12:36:59 +00:00
Silvin 70a91dd01b Merge pull request #1283 from adshmh/refactor-trust-revoke-tests 
refactor trust revoke command unit tests
Upstream-commit: 3a3e720f91
Component: cli
 2018-08-10 11:03:58 +02:00
Vincent Demeester e3e25812ec Merge pull request #1280 from adshmh/refactor-trust-inspect-tests 
refactor trust inspect command unit tests
Upstream-commit: 560b0cd863
Component: cli
 2018-08-10 10:37:53 +02:00
Arash Deshmeh ea09ac3378 refactored trust revoke command unit tests to use table-driven style 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 984d76b9dd
Component: cli
 2018-08-09 15:58:54 -04:00
GordonTheTurtle f68f53a53c Merge component 'cli' from git@github.com:docker/cli master 2018-08-09 16:36:51 +00:00
Sebastiaan van Stijn e2e1350a4c Merge pull request #1266 from adshmh/use-natural-sort-order-for-network-list 
use sortorder library for sorting network list output
Upstream-commit: 6ef11c516d
Component: cli
 2018-08-09 12:05:55 +02:00
GordonTheTurtle ea9e6f1a60 Merge component 'engine' from git@github.com:docker/engine master 2018-08-09 01:03:02 +00:00
Akihiro Suda b552588bbc Merge pull request #37609 from seratch/fix-typos 
Fix the several typos detected by github.com/client9/misspell
Upstream-commit: 4122eb1a43a42c4c8b827b4d0fb3d6543f9f2c91
Component: engine
 2018-08-09 08:48:05 +09:00
GordonTheTurtle 2cb7dab3fc Merge component 'engine' from git@github.com:docker/engine master 2018-08-08 21:00:38 +00:00
Tibor Vass 71cb67c2af Merge pull request #37582 from andrewhsu/bk 
vndr containerd to a88b631, buildkit to e57eed4, and fsutil to b19464c
Upstream-commit: a3e78ca0c6a1a20c5ffeeaa51e3e0b4ff623a464
Component: engine
 2018-08-08 10:55:19 -07:00
Arash Deshmeh 64bf68b122 refactor trust inspect command unit tests to table-driven style 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: f8f0d72cf9
Component: cli
 2018-08-08 13:50:00 -04:00
Arash Deshmeh 7435e1c862 use sortorder lib for sorting the output of volume list command 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 5cc1f9006a
Component: cli
 2018-08-08 12:20:21 -04:00
Arash Deshmeh 73b3c56c30 use sortorder lib for sorting in trust package 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 04bb3c770f
Component: cli
 2018-08-08 12:20:10 -04:00
Arash Deshmeh 21c2c41660 use sortorder lib for sorting network list output 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: a921313caf
Component: cli
 2018-08-08 12:06:59 -04:00
Kazuhiro Sera 71a3e53c36 Fix the several typos detected by github.com/client9/misspell 
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
Upstream-commit: 1e49fdcafc6601cd9dd5c46551ee283baa0272ef
Component: engine
 2018-08-09 00:45:00 +09:00
GordonTheTurtle 5f75afe983 Merge branch 'master' of github.com:docker/docker-ce 2018-08-07 17:03:38 +00:00
GordonTheTurtle 53e0010b72 Merge component 'cli' from git@github.com:docker/cli master 2018-08-07 16:37:00 +00:00
GordonTheTurtle ad843ef36b Merge component 'cli' from git@github.com:docker/cli master 2018-08-07 16:32:36 +00:00
Sebastiaan van Stijn d098202034 Merge pull request #1277 from vdemeester/template-subtests-followup 
Migrate `TestExtractVariables` to subtests…
Upstream-commit: 1d04f7d66b
Component: cli
 2018-08-07 16:30:11 +02:00
Vincent Demeester 68e01b8ab7 Migrate TestExtractVariables to subtests… 
… as suggested in previous PR comment.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9cd7c1361c
Component: cli
 2018-08-07 16:06:13 +02:00
Tibor Vass a3a5617ab6 builder: fix compilation errors after vendoring 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c53d7e71046581775a8888706c0fd6baddb81a0b
Component: engine
 2018-08-07 06:03:10 +00:00
GordonTheTurtle 77d0975ce7 Merge component 'engine' from git@github.com:docker/engine master 2018-08-05 17:02:36 +00:00
Yong Tang c811febb3c Merge pull request #37586 from thaJeztah/bump_swarmkit 
Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
Upstream-commit: f57f260b49b6142366e6bc1274204ee0a1205945
Component: engine
 2018-08-05 09:11:58 -07:00
GordonTheTurtle 7e95203d7f Merge component 'engine' from git@github.com:docker/engine master 2018-08-04 01:01:42 +00:00
GordonTheTurtle 4706b6f33a Merge component 'cli' from git@github.com:docker/cli master 2018-08-04 00:36:35 +00:00
Sebastiaan van Stijn c213d85ec3 Merge pull request #1271 from albers/completion-shellcheck 
Fix shellcheck warnings
Upstream-commit: b5768bea9b
Component: cli
 2018-08-04 01:36:36 +02:00
Sebastiaan van Stijn 6d14e4f6a2 Merge pull request #1269 from albers/completion-cp--archive 
Add bash completion for `cp --archive`
Upstream-commit: e8cd06c8eb
Component: cli
 2018-08-03 23:48:52 +02:00
Harald Albers 22b9c5ed2c Merge pull request #1270 from Ace-Tang/master 
bash completion: fix uncorrect completion
Upstream-commit: ad28cec012
Component: cli
 2018-08-03 23:26:09 +02:00
Sebastiaan van Stijn baf9cf6d1a Merge pull request #37583 from Microsoft/jjh.37562 
Don't invoke HCS shutdown if terminate called; removes unused vars and no-op calls
Upstream-commit: eeea12db7a65e6ad633747e49928c80b0f18d86b
Component: engine
 2018-08-03 22:05:06 +02:00
Sebastiaan van Stijn a972373b51 Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f 
Relevant changes;

- swarmkit #2593 agent: return error when failing to apply network key
- swarmkit #2645 Replace deprecated grpc functions
- swarmkit #2720 Test if error is nil before to log it
- swarmkit #2712 [orchestrator] Fix task sorting
- swarmkit #2677 [manager/orchestrator/reaper] Fix the condition used for skipping over running tasks

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 660fa129c0ea09c1aa1770b5f2d26ec762213484
Component: engine
 2018-08-03 18:55:53 +02:00
Harald Albers 73443cfafe Fix shellcheck warnings 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e587ec293b
Component: cli
 2018-08-03 15:28:09 +02:00
Ace-Tang 1dfbd7519a bash completion: fix uncorrect completion 
fix uncorrect completion for command
docker docker <tab>

Signed-off-by: Ace-Tang <aceapril@126.com>
Upstream-commit: 7b4e2f3145
Component: cli
 2018-08-03 21:27:27 +08:00
Harald Albers 13b26eee62 Add bash completion for cp --archive 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b9b3754ad3
Component: cli
 2018-08-03 14:30:30 +02:00
John Howard 295ddc5339 Don't invoke HCS shutdown if terminate called 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5cfededc7ca552260f8eb7319184437a816e480d
Component: engine
 2018-08-02 16:29:37 -07:00
GordonTheTurtle 851e1e2005 Merge component 'cli' from git@github.com:docker/cli master 2018-08-02 20:36:49 +00:00
Sebastiaan van Stijn f92453678a Merge pull request #1259 from adshmh/add-unit-test-to-cover-network-list-sort 
Add unit test to cover network list sort, refactor to table-driven tests
Upstream-commit: e902ae9f84
Component: cli
 2018-08-02 20:28:53 +02:00
Andrew Hsu 4658043fcf vndr buildkit to e57eed4 and fsutil to b19464c 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 67da8c84b66a79261032478637b26c5baa3908b4
Component: engine
 2018-08-02 18:19:13 +00:00
Arash Deshmeh 115f23480e refactor network list unit tests to table-driven style 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 021bf39d76
Component: cli
 2018-08-02 14:07:06 -04:00