Sebastiaan van Stijn
dbb90de813
Merge pull request #28922 from yuexiao-wang/fix-secret
...
Fix the inconsistency for secret ls and secrect rm
Upstream-commit: ebd8ec6c3f
Component: cli
2016-12-01 11:29:58 +01:00
yuexiao-wang
4919e4031c
Fix the use for secret create
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cd79095c81
Component: cli
2016-12-01 19:48:33 +08:00
Alexander Morozov
fa8e0595d1
Merge pull request #28885 from vdemeester/revert-service-ps-all
...
Revert "Add -a option to service/node ps"
Upstream-commit: d94d204f97
Component: cli
2016-11-30 12:02:34 -08:00
yuexiao-wang
85a1bbf9ec
Fix the inconsistency for docker secret
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 7a9e414988
Component: cli
2016-11-30 17:23:39 +08:00
Victor Vieux
030c2b38ea
Merge pull request #28876 from vdemeester/28835-better-handling-of-external-networks
...
stack deploy: handle external network when deploying
Upstream-commit: d3411b7a70
Component: cli
2016-11-29 15:00:35 -08:00
Vincent Demeester
1b0cf4eea1
Merge pull request #28919 from allencloud/change-secret-remove-in-cli
...
change secret remove logic in cli
Upstream-commit: 9ab6d420b9
Component: cli
2016-11-29 15:08:24 +01:00
Vincent Demeester
a712fa58db
Merge pull request #28874 from yuexiao-wang/fix-layer-typo
...
Fix some typos
Upstream-commit: b82f2ce501
Component: cli
2016-11-29 14:45:08 +01:00
yuexiao-wang
b3d1ee086f
Fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 5e2a13b971
Component: cli
2016-11-30 03:01:32 +08:00
Sebastiaan van Stijn
8e3ea3e667
Merge pull request #28904 from dnephin/add-volume-labels-to-deploy
...
Use namespace label on stack volumes
Upstream-commit: dea82af0ea
Component: cli
2016-11-29 14:39:26 +01:00
Akihiro Suda
77042515db
client: add accessor methods for client.customHTTPHeaders
...
Added two methods:
- *Client.CustomHTTPHeaders() map[string]string
- *Client.SetCustomHTTPHeaders(headers map[string]string)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 232944cc15
Component: cli
2016-11-29 09:02:52 +00:00
allencloud
9d0522f784
change secret remove logic in cli
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0227275b7f
Component: cli
2016-11-29 15:12:05 +08:00
Daniel Nephin
e387834219
Use namespace label on stack volumes.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 798c4a614e
Component: cli
2016-11-28 18:02:39 -05:00
Vincent Demeester
90f36d5983
Fixes ImageList to be retro-compatible with older API
...
Make sure current client code can talk for ImageList can still talk to
older daemon.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 32f410cd35
Component: cli
2016-11-28 22:15:50 +01:00
John Howard
6ff3c5f368
Align output of docker version again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a913891b7d
Component: cli
2016-11-28 11:38:58 -08:00
Vincent Demeester
668bff0dea
Revert "Add -a option to service/node ps"
...
This reverts commit 139fff2bf0ebe12b61871ba8ec8be8d51c2338db.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6ffb62368a
Component: cli
2016-11-28 18:08:45 +01:00
Vincent Demeester
21bda2fa99
Merge pull request #28822 from yuexiao-wang/modify-plugin
...
Modify repoName to PLUGIN for docker plugin create
Upstream-commit: a0ce75c25d
Component: cli
2016-11-28 17:52:04 +01:00
Vincent Demeester
535a0c8419
stack deploy: handle external network when deploying
...
If the network is marked as external, don't use the namespace on
it. Otherwise, it's not found.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8e63000bf3
Component: cli
2016-11-28 17:38:41 +01:00
Kei Ohmura
5c72df8bb5
fix description of 'docker swarm init'
...
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com >
Upstream-commit: 8feea86e0f
Component: cli
2016-11-28 13:24:02 +09:00
Antonio Murdaca
7cd5e53254
Merge pull request #28780 from vieux/accept_src_in_secret
...
support src in --secret
Upstream-commit: a0f447d124
Component: cli
2016-11-26 14:34:30 +01:00
Vincent Demeester
80335a35e2
Merge pull request #28815 from dnephin/add-short-option
...
Add a short flag for docker stack deploy
Upstream-commit: 60da1d9830
Component: cli
2016-11-25 21:18:09 +01:00
Daniel Nephin
2e594e381b
Add a short flag for docker stack deploy
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7b35599e2d
Component: cli
2016-11-25 13:23:36 -05:00
yuexiao-wang
eae5084f8a
Modify reponame to PLUGIN and fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 48537db849
Component: cli
2016-11-25 23:09:46 +08:00
Daniel Nephin
527b0ad302
Allow hostname to be updated on service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c40696023b
Component: cli
2016-11-24 15:44:35 -05:00
Yong Tang
3a6ac9f773
Update docs of docker network ls --filter
...
Currently the help output of `docker network ls --filter` is:
```
Options:
-f, --filter value Provide filter values (i.e. 'dangling=true') (default [])
...
```
This caused confusion as only the following filters are supported at the moment:
- `driver`
- `type`
- `name`
- `id`
- `label`
This fix update the help output of `docker network ls --filter` and `network_ls.md`.
The `dangling=true` description has been replace to:
```
Options:
-f, --filter filter Provide filter values (i.e. 'driver=bridge')
...
```
This fix fixes 28786.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 961046c5a8
Component: cli
2016-11-24 08:14:36 -08:00
yuexiao-wang
95a1a461c6
Add options for docker plugin enable and fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 7a89624bd5
Component: cli
2016-11-25 04:07:06 +08:00
Victor Vieux
2d8129362d
Merge pull request #28773 from dnephin/exit-status
...
exit with status 1 if help is called on an invalid command
Upstream-commit: 7c957db8d2
Component: cli
2016-11-23 15:13:29 -08:00
Victor Vieux
e2c24e804b
support src in --secret
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: dc5c8a7713
Component: cli
2016-11-23 14:30:57 -08:00
Vincent Demeester
f6cb3ad320
Merge pull request #28675 from dnephin/no-swarmmode-error-on-deploy
...
Better error message on stack deploy when not a swarm manager
Upstream-commit: 36c919d313
Component: cli
2016-11-23 22:47:13 +01:00
Daniel Nephin
c34c8c73ff
exit with status 1 if help is called on an invalid command.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 004fc6b9e4
Component: cli
2016-11-23 15:13:58 -05:00
Daniel Nephin
d54f25b0fd
exit with status 1 if help is called on an invalid command.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7604609bed
Component: cli
2016-11-23 15:13:58 -05:00
Daniel Nephin
6e1cc0ff7f
Better error message on stack deploy against not a swarm.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5ead1cc490
Component: cli
2016-11-23 12:15:11 -05:00
erxian
0b6a55655e
update secret command
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: 0171a79c56
Component: cli
2016-11-23 10:07:09 -05:00
Victor Vieux
334864b168
Merge pull request #28716 from ehazlett/fix-multi-secret-inspect
...
Update secret inspect to support IDs
Upstream-commit: d8787ecd81
Component: cli
2016-11-22 17:39:48 -08:00
cyli
0adbcb7fcf
Do not display the digest or size of swarm secrets
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 357cabef2d
Component: cli
2016-11-22 18:13:27 -05:00
Sebastiaan van Stijn
6508dc209e
Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
...
Prepare docs and Swagger definition for automatically generated API docs
Upstream-commit: 36a1664cd4
Component: cli
2016-11-22 22:47:38 +01:00
Evan Hazlett
fa382861cb
update secret inspect to support IDs
...
This updates secret inspect to support inspect by ID in addition to name
as well as inspecting multiple secrets. This also cleans up the
help text for consistency.
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 46cd1fa87b
Component: cli
2016-11-22 16:01:16 -05:00
Tibor Vass
4f19ac617e
Merge pull request #28595 from anusha-ragunathan/plugin_timeout
...
Allow HTTP client timeout to be configurable on plugin enable.
Upstream-commit: e0ad93a836
Component: cli
2016-11-22 10:17:10 -08:00
Tibor Vass
800e889b8c
Merge pull request #28595 from anusha-ragunathan/plugin_timeout
...
Allow HTTP client timeout to be configurable on plugin enable.
Upstream-commit: 7cc80114de
Component: cli
2016-11-22 10:17:10 -08:00
Victor Vieux
93af8ecaa8
Merge pull request #28529 from allencloud/update-secret-create-url
...
fix secret create url for consistency
Upstream-commit: 4d87ef4432
Component: cli
2016-11-22 09:55:17 -08:00
Vincent Demeester
2b3cea2450
Merge pull request #28445 from cpuguy83/28439_fix_client_rm_on_old_daemons
...
Handle `run --rm` against older daemons on the cli
Upstream-commit: 1318c8dcb4
Component: cli
2016-11-22 14:25:03 +01:00
Ben Firshman
8dd51982bd
Rename Remote API to Engine API
...
Implementation of https://github.com/docker/docker/issues/28319
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 9c9ae79e64
Component: cli
2016-11-22 12:49:38 +00:00
Vincent Demeester
4ded4ce547
Merge pull request #28651 from YuPengZTE/devMD002
...
First header should be a top level header
Upstream-commit: 2a9b8737a5
Component: cli
2016-11-22 13:11:37 +01:00
Vincent Demeester
5a845e573b
Merge pull request #28659 from xuzhenglun/master
...
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: 7d0f584f54
Component: cli
2016-11-22 13:01:05 +01:00
Vincent Demeester
88bc0e036b
Merge pull request #28659 from xuzhenglun/master
...
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: 800c0e20ce
Component: cli
2016-11-22 13:01:05 +01:00
Reficul
a08156a072
fix incorrect ErrConnectFailed comparison
...
Signed-off-by: Reficul <xuzhenglun@gmail.com >
Upstream-commit: 14770269e8
Component: cli
2016-11-22 10:42:55 +08:00
Reficul
d9eae8f9b0
fix incorrect ErrConnectFailed comparison
...
Signed-off-by: Reficul <xuzhenglun@gmail.com >
Upstream-commit: b35205ed12
Component: cli
2016-11-22 10:42:55 +08:00
Brian Goff
e727185cfe
Handle run --rm against older daemons on the cli
...
For previous versions of Docker, `--rm` was handled client side, as such
there was no support in the daemon for it.
Now it is handled daemon side, but we still need to handle the case of a
newer client talking to an older daemon.
Falls back to client-side removal when the daemon does not support it.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4632a029d9
Component: cli
2016-11-21 20:39:04 -05:00
yupeng
e3969c2cea
First header should be a top level header
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 4e4541540f
Component: cli
2016-11-22 09:33:21 +08:00
Victor Vieux
f85b33128a
Merge pull request #28677 from dnephin/remove-deploy-experimental
...
Move `docker stack` out of experimental
Upstream-commit: 23c399dd10
Component: cli
2016-11-21 14:33:35 -08:00
Victor Vieux
38b13e5bfa
Merge pull request #28328 from aaronlehmann/duration-opts
...
cli: Add valid suffixes for remaining duration options
Upstream-commit: 07c896b18e
Component: cli
2016-11-21 14:03:00 -08:00