Commit Graph

41836 Commits

Author SHA1 Message Date
b04c87dc5b Merge component 'engine' from git@github.com:docker/engine master 2018-08-13 05:01:54 +00:00
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
af7228d929 Merge component 'cli' from git@github.com:docker/cli master 2018-08-10 12:36:59 +00:00
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
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
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
f68f53a53c Merge component 'cli' from git@github.com:docker/cli master 2018-08-09 16:36:51 +00:00
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
ea9e6f1a60 Merge component 'engine' from git@github.com:docker/engine master 2018-08-09 01:03:02 +00:00
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
2cb7dab3fc Merge component 'engine' from git@github.com:docker/engine master 2018-08-08 21:00:38 +00:00
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
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
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
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
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
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
5f75afe983 Merge branch 'master' of github.com:docker/docker-ce 2018-08-07 17:03:38 +00:00
53e0010b72 Merge component 'cli' from git@github.com:docker/cli master 2018-08-07 16:37:00 +00:00
ad843ef36b Merge component 'cli' from git@github.com:docker/cli master 2018-08-07 16:32:36 +00:00
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
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
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
77d0975ce7 Merge component 'engine' from git@github.com:docker/engine master 2018-08-05 17:02:36 +00:00
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
7e95203d7f Merge component 'engine' from git@github.com:docker/engine master 2018-08-04 01:01:42 +00:00
4706b6f33a Merge component 'cli' from git@github.com:docker/cli master 2018-08-04 00:36:35 +00:00
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
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
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
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
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
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
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
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
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
851e1e2005 Merge component 'cli' from git@github.com:docker/cli master 2018-08-02 20:36:49 +00:00
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
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
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
d4fe2b6044 add unit test to cover the sort order of network list command
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 4f388ffca3
Component: cli
2018-08-02 14:07:06 -04:00
cd93f23d9c Merge component 'engine' from git@github.com:docker/engine master 2018-08-02 17:02:15 +00:00
1ae49cf365 Merge component 'cli' from git@github.com:docker/cli master 2018-08-02 16:36:50 +00:00
a727cc8ee8 Merge pull request #1262 from vdemeester/allow-custom-pattern
Allow custom pattern when extracting variable…
Upstream-commit: ff1a34d9a9
Component: cli
2018-08-02 18:00:38 +02:00
c1168064aa Merge pull request #1254 from albers/completion-kubernetes
Add bash completion for kubernetes orchestrator
Upstream-commit: 731b4f1fb4
Component: cli
2018-08-02 17:30:31 +02:00
4cbdb398d7 Allow custom pattern when extracting variable…
… as it is possible to do it when interpolating. It also fixes when
there is 2 variables on the same *value* (in the composefile, on the
same line)

Finaly, renaming the default, used in cli, pattern to `defaultPattern`
to not be shadowed unintentionally.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4c87725c35
Component: cli
2018-08-02 16:50:40 +02:00
e08a81b044 Merge pull request #37541 from yongtang/07282018-ipc-container
Migrate some ipc container test from integration-cli to integration
Upstream-commit: 75fe41444009947d319f76e68b5e1f2124c79b4d
Component: engine
2018-08-02 15:51:25 +02:00
f2b2ca3774 Merge component 'cli' from git@github.com:docker/cli master 2018-08-02 12:36:56 +00:00
841a592280 Add bash completion for kubernetes orchestrator
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 08f8ee1320
Component: cli
2018-08-02 13:54:31 +02:00
907c1bdfa8 Only complete swarm specific options with orchestrator=swarm
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8ef01e869e
Component: cli
2018-08-02 13:54:31 +02:00