starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-24 07:25:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
25,586 Commits 14 Branches 323 Tags
4aeaa2fa8d30bce41f6906c8a7f421cc42d20121
Commit Graph
23976 Commits
Author SHA1 Message Date
allencloud 939b820305 make cmd short short consistency and change docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
 2016-06-30 21:17:51 +08:00
Antonio Murdaca 169947bdeb fix warn message typos 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: a4143e6756d697323d560396dff6b90168a1e56c
Component: engine
 2016-06-30 15:17:37 +02:00
Antonio Murdaca cfcc34db47 Merge pull request #24164 from coolljt0725/remove_no_warn 
Remove dm.no_warn_on_loop_devices in info warning
Upstream-commit: e275865a61c2c776bb2b1673d05bc2f6a8d72042
Component: engine
 2016-06-30 15:16:05 +02:00
Vincent Demeester a50f4824a7 Allow service and node filter to be name… 
… on `docker node tasks` and `docker service tasks` commands.
This changes is mainly server-side (between engine api and
swarmkit). There is just a check in `api/client/service/tasks.go` to
handle the special *self* meaning.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0fc5a21f1138f48e0431a550c936e8908d72840
Component: engine
 2016-06-30 15:09:03 +02:00
Vincent Demeester 660ae2c902 Merge pull request #24149 from mavenugo/kn 
Added missing flags for swarm-mode networks
Upstream-commit: cc024095c99edfec556bb2f5840279490fff4218
Component: engine
 2016-06-30 12:23:45 +02:00
Wen Cheng Ma 2191f675ed Fix docker stack link 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 93ed4b35fa6b35a24a79e3e4f9cfaea29982e7a4
Component: engine
 2016-06-30 17:22:42 +08:00
Sebastiaan van Stijn d4be296b2a Merge pull request #24080 from dmcgowan/atomic-writer-mode 
Set permission on atomic file write
Upstream-commit: cbf785c45a8cca061028ec341320bcbd655cf1fd
Component: engine
 2016-06-30 01:00:08 -07:00
Lei Jitang ac805da5d2 Remove dm.no_warn_on_loop_devices in info warning 
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7
Component: engine
 2016-06-30 14:57:46 +08:00
yuzou e667b026a1 Add detail error logs when 'Unknown Device' error happens if devicemapper storage is used. 
Signed-off-by: yuzou <zouyu7@huawei.com>
Upstream-commit: d4a2bcc9ac49d07c71822ce72b97861d5844b46d
Component: engine
 2016-06-30 13:06:14 +08:00
Yong Tang 8038d9fddd Use HOSTNAME in the output of docker node ls 
This fix tries to address an issue raised in #24090 where
the title field of `docker node ls` use NAME instead of
HOSTNAME. Yet the content of this field is actually
hostname.

The fix makes needed changes for the output of
`docker node ls`.

An additional test has been added to cover the change in
this fix.

This fix fixes #24090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4bc91ceeb750db6a6270b2f1821cb0b2f30117fc
Component: engine
 2016-06-29 19:54:16 -07:00
Madhu Venugopal 3b186ee015 Fixed a few network UI issues in swarm-mode 
* Detect name conflicts on network creation
* Detect and prevent network connect/disconnect for managed containers

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5
Component: engine
 2016-06-29 18:08:55 -07:00
Tonis Tiigi b9ac815dbd Fix duplicate layers in exported tar 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 41bf7de73be5d35f40aca9eb68064aa3e8bb9a54
Component: engine
 2016-06-29 18:06:42 -07:00
John Howard 37fb9cfa09 Windows: Ensure VolumePath is not set for Hyper-V containers 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: fd4f5c23650799a7e76e193614bf82454b375fe3
Component: engine
 2016-06-29 16:49:09 -07:00
Madhu Venugopal bd38c4db96 Added missing flags for swarm-mode networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: cf78863e9dc4e3480a7d1059ed306bdfd81cd3dc
Component: engine
 2016-06-29 15:30:57 -07:00
Sebastiaan van Stijn 5113884470 Merge pull request #24144 from thaJeztah/update-api-docs 
docs: add note that we no longer send container-id for exec
Upstream-commit: e904f58e199836fa43ee1c6736e689ef58e4fe10
Component: engine
 2016-06-29 15:25:43 -07:00
Brian Goff cadc295e94 Merge pull request #24135 from dnephin/fix_error_message 
Fix mount opts error message
Upstream-commit: 55d9c49f920b4752337cee959cbc24b5d1b7ee5a
Component: engine
 2016-06-29 17:19:00 -04:00
Alexander Morozov 29d2889a79 Merge pull request #23789 from tonistiigi/swarm-integration-tests 
Update swarm integration tests and shutdown synchronization
Upstream-commit: 9162011680efa714788377651e51872bb852e2e3
Component: engine
 2016-06-29 14:09:57 -07:00
Sebastiaan van Stijn 967277989f Merge pull request #23949 from jstarks/fix_progress_on_load_compressed_layer 
image: Report load progress on compressed layer size
Upstream-commit: a1fff2ca5afa15ae092668a06b55ae2dc4e039d7
Component: engine
 2016-06-29 13:37:12 -07:00
Sebastiaan van Stijn d648d9a308 docs: add note that we no longer send container-id for exec 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 82876c0f5b41fe4e3ee33e0bc77f2560b1a6535f
Component: engine
 2016-06-29 13:30:09 -07:00
Nishant Totla cddb6e635c Updating header name and executor 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: af5df117a805c8df661c7efa58c57680019b5752
Component: engine
 2016-06-29 13:26:19 -07:00
Sebastiaan van Stijn 429f89b0c8 Add Charles to docs maintainers 
Charles is part of the docs team, so
adding him to the list here.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b4163c1189c7389ddda32d9c4ec57708690434c8
Component: engine
 2016-06-29 13:13:57 -07:00
Derek McGowan 6e93db8e82 Set permission on atomic file write 
Perform chmod before rename with the atomic file writer.
Ensure writeErr is set on short write and file is removed on write error.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 1cd74902810b0eefddd173239cd95b506b34e678
Component: engine
 2016-06-29 13:09:13 -07:00
Daniel Nephin beffe0658c Fix mount opts error message. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c8659d3cc501449a69a7e0b79994b42799750f29
Component: engine
 2016-06-29 15:14:55 -04:00
Sebastiaan van Stijn d4e14be148 Merge pull request #23955 from yongtang/23768-cpu-count 
Fix wrong CPU count after CPU hot-plugging
Upstream-commit: 50a173e3d5ca8ed3b52c53fde6729188fc02e9e7
Component: engine
 2016-06-29 12:00:13 -07:00
Vincent Demeester 8a1b995558 Merge pull request #23946 from dnephin/service-update-args 
Fixes for `service update` of Args
Upstream-commit: 1e7ba55494eff0f38aa503b81576519b7b383644
Component: engine
 2016-06-29 20:24:07 +02:00
Sebastiaan van Stijn 1535d36be1 Merge pull request #24071 from vdemeester/24063-empty-filtered-network-list 
Return an empty network list if nothing matches filter
Upstream-commit: 27ceac2d74df385119fea2606a287d91a4123d82
Component: engine
 2016-06-29 11:14:30 -07:00
Sebastiaan van Stijn ec650aece5 Merge pull request #24028 from hqhq/fix_comments_in_aarch64 
Fix comments in Dockerfile.aarch64
Upstream-commit: ccab57620e9b007a6fa4d462790fad004b62f9b2
Component: engine
 2016-06-29 11:06:29 -07:00
Adam Kunk 5bc8520da4 updates to fix install script for RHEL 
fixing install script for rhel7

fixing install script for rhel7

Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org>

updates to fix install script for RHEL

fixing install script for rhel7

fixing install script for rhel7

Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org>
Upstream-commit: 485c27e18680f5eaeefe5de7f7916ba23f66c8f0
Component: engine
 2016-06-29 13:51:27 -04:00
Sebastiaan van Stijn defc31809a Merge pull request #24105 from vdemeester/24094-fix-swarm-join-doc 
Fixes /swarm/join endpoint documentation
Upstream-commit: d68415a949f4ba62d0929ebc53825fbab6ff1e36
Component: engine
 2016-06-29 10:48:41 -07:00
Vincent Demeester 7dfc0b0c86 Merge pull request #24050 from ncoolz/issue-cluster-store-config 
Fix check code for --cluster-store and --cluster-advertise in config_…
Upstream-commit: 2f9d20288c7b1ebf6f0a9888e6af9b5262d49484
Component: engine
 2016-06-29 19:15:23 +02:00
Daniel Nephin 943b955f19 Fix service update of Args 
add a unit test

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 07b59ef210490df19f65da950d7d41176d104a31
Component: engine
 2016-06-29 12:41:57 -04:00
Vincent Demeester 596823812f Merge pull request #24126 from noxiouz/fix_doc_api 
Remove extra comma in Image Pull API examples
Upstream-commit: e51fc722388431eeb2a94ab224d9d8636df85a97
Component: engine
 2016-06-29 18:16:04 +02:00
Anton Tiurin d906df91ca Remove extra comma in Image Pull API examples 
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
Upstream-commit: 307c39c187f8785d8edae4bfd460e2dd0432626a
Component: engine
 2016-06-29 19:04:42 +03:00
Vincent Demeester a758d1d64d Fix --filter=desired_state behaviour 
Just like `docker service tasks`, we should add `desired_state` filters
only in case there is no provided filters.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3c194bd2a4fb4693deba366b3400c2efeeb90369
Component: engine
 2016-06-29 17:40:34 +02:00
Harald Albers e14d2bc523 add documentation for desired_state filter 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 36f57f7d024e44b1db7f5cd0c24526f4cdfb7234
Component: engine
 2016-06-29 08:27:25 -07:00
Vincent Demeester edd4ca39cd Fixes /swarm/join endpoint documentation 
The JSON payload given in the API documentation is wrong, fixing it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 97c9491b0d395dc923e8b4e335839662c17aff46
Component: engine
 2016-06-29 11:27:22 +02:00
Stefan Scherer c6d459baa5 Revert tasksmax workaround to avoid unsupported bins 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 6509cc4e63f50661f6563f45153b23599cc6665c
Component: engine
 2016-06-29 08:10:10 +02:00
Vincent Demeester f1627bde25 Merge pull request #24072 from anusha-ragunathan/fix-tests 
Fix daemon tests.
Upstream-commit: 3d231c78e8c57acc31ca4294c73c0d02c9a5ca12
Component: engine
 2016-06-29 07:52:21 +02:00
Charles Smith 0e7c9136da remove margin from bottom of swarm mode docs 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 0d6f59e85a2728008aad154d366cc8c92888e871
Component: engine
 2016-06-28 19:46:39 -07:00
Akihiro Suda ed5060064e zfs: call mount.MakePrivate 
Fix #24008

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5ec8441bb55ecbf83da6407a4135ce83b1fe01c7
Component: engine
 2016-06-29 01:55:45 +00:00
Anusha Ragunathan c760355112 Fix daemon tests. 
Fix two test issues:
- pidof is not available in PATH on some Jenkins systems (rhel, centos)
  Use kill -0 instead.
- Cleanup after plugin test. This is a stop gap fix. The right way to
  fix this, is to shutdown the plugin on daemon shutdown path (except
  for the live-restore case). This will be done in a follow up PR.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 6d36431e2395867d7bb101dbfd4340e132fd5438
Component: engine
 2016-06-28 15:29:49 -07:00
Vincent Demeester 4850c6643f Return an empty network list if nothing matches filter 
Initializing the network list struct in order to return an empty list
instead of a nil object.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a7043ac5c423cf68d4f92024e694887099640d91
Component: engine
 2016-06-29 00:06:44 +02:00
Alexander Morozov 217e2bc779 Merge pull request #24061 from dmcgowan/close-reader-after-mount-exec 
overlay2: close read end of pipe on mount exec
Upstream-commit: 57977fb1273337db0e5da46faf4068c4073aa0bb
Component: engine
 2016-06-28 14:58:56 -07:00
Wonjun Kim 23c9812d15 Merge branch 'master' into issue-cluster-store-config 
Upstream-commit: 679fe7e36a07ff0058b780b99fb9432cd2fb68f4
Component: engine
 2016-06-29 06:25:34 +09:00
Wonjun Kim 0660142527 Add integration tests for swarm incompatible 
Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com>
Upstream-commit: d71789828f5c8d2e0f5757f1c003325c4b8a871d
Component: engine
 2016-06-29 06:21:02 +09:00
Nishant Totla 966b245d6f Update engine-api vendored version 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: e13a14340dde563fa799fb95090940c74636e398
Component: engine
 2016-06-28 13:53:01 -07:00
Nishant Totla b75c9d3100 Passing registry auth token for service create and update 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 93ec5cda55e78dbb683b59bde244a7984b323574
Component: engine
 2016-06-28 13:53:01 -07:00
Derek McGowan 860c6cce0c overlay2: close read end of pipe on mount exec 
Use StdinPipe to ensure pipe is properly closed after startup

Fixes #23686

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: ad4b3e11fe41080d66ac1780b455246ae18bdc35
Component: engine
 2016-06-28 13:23:00 -07:00
John Howard e89f357b69 Windows: Skip RunCidFileCleanupIfEmpty on RS1 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 20424fccdd1ba874277eca7d9644b1ef98ac4b2e
Component: engine
 2016-06-28 13:04:42 -07:00
John Howard cf2790c1e0 Windows: Skip TestBuildEmptyCmd on RS1 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 45da1274421ba7484dcf2bf1a398f9e3683600d1
Component: engine
 2016-06-28 12:22:16 -07:00