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
docker-unir[bot]
ae672e2b0e
Merge pull request #135 from jose-bigio/top_level_make
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 0b376627615b15ea2a17b5c97bd7b975b910ea10
Component: packaging
2018-08-07 21:52:06 +00:00
Jose Bigio
7c303cf2e5
Add top level make target
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 9bb08342efcf1d9e69cbeca9b820309c9622bef5
Component: packaging
2018-08-07 14:28:11 -07:00
Eli Uriegas
2f9ebb742f
Merge pull request #134 from jose-bigio/make_image_tars
...
Add tar targets for engine image
Upstream-commit: d645291be026da9e2aab9906e0d0918d0799c3f3
Component: packaging
2018-08-07 13:47:31 -07:00
Jose Bigio
13fe238674
Add extra dollar in Makefile/image
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 65a9bb677ebffccb2d5d1002c3e1bdd4dd46d76c
Component: packaging
2018-08-07 13:22:53 -07:00
Jose Bigio
3570421f62
Remove shell directive so target will work
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 93fcc8443b504c94beaef697ec6f27748b40d656
Component: packaging
2018-08-07 13:21:18 -07:00
Jose Bigio
d72fa21d55
Add tar targets for engine image
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 2ffde00d61af1074e100ca0c725dbd4f685299a1
Component: packaging
2018-08-07 13:06:47 -07:00
Tibor Vass
9e965fad85
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
...
This changes the experimental --console flag to --progress following
feedback indicating avoidable confusion.
In addition to naming changes, the help output now has an additional
clarification, specifically: container output during builds are only
shown when progress output is set to plain. Not mentioning this was also
a big cause of confusion.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: faeb8bb571
Component: cli
2018-08-07 18:18:13 +00:00
docker-unir[bot]
0510b8b031
Merge pull request #133 from jose-bigio/fix_clean
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 35f96bda01dd7df034a42f606f6aa46a7352e9fc
Component: packaging
2018-08-07 18:07:14 +00:00
Jose Bigio
5c8dc24b07
Don't delete the engine when cleaning
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 16e6737bf2976e83c4c140c95ae69d04905d150f
Component: packaging
2018-08-07 10:22:58 -07: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
Ximo Guanter Gonzálbez
a18736f217
Fix #28814
...
Signed-off-by: Ximo Guanter Gonzálbez <joaquin.guantergonzalbez@telefonica.com >
Upstream-commit: ea65a0b1349b532e9d10d63835c751d291a7c0f4
Component: engine
2018-08-07 10:20: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
docker-unir[bot]
7133d76b99
Merge pull request #130 from dhiltgen/revamp_packages
...
Merged with https://github.com/seemethere/unir
Upstream-commit: a3231d16bd2b7f7a21f9686514617e76bb65cf41
Component: packaging
2018-08-06 18:28:39 +00:00
Derek McGowan
084e7423dc
libcontainerd: split client and supervisor
...
Adds a supervisor package for starting and monitoring containerd.
Separates grpc connection allowing access from daemon.
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: dd2e19ebd58cd8896d79b4b8db61144b93717b33
Component: engine
2018-08-06 10:23:04 -07:00
docker-unir[bot]
426d022fb6
Merge pull request #129 from jose-bigio/build_manifest_images
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 840f3a247d472ce692f1652da60d380613b0298f
Component: packaging
2018-08-06 16:51:23 +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
Jose Bigio
46906a5687
Build docker image with engine binary on multiple arches
...
Signed-off-by: Jose Bigio <jose.bigio@docker.com >
Upstream-commit: 2dfaf0dd0fa7b7a7aef76d1254b2b48dc04d0211
Component: packaging
2018-08-03 16:32:19 -07: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
Daniel Hiltgen
d2ad7723be
Address review comments on PR #128
...
Upstream-commit: 0cd6b38d6dbf77a661030303e5cfeb7b26f60d82
Component: packaging
2018-08-02 16:53:29 -07: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
docker-unir[bot]
0185509c33
Merge pull request #128 from dhiltgen/revamp_packages
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 8756f9830c465471b449ec6b2096d069409a2947
Component: packaging
2018-08-02 22:57:00 +00:00