7891d349b3
support show numbers of global service in service ls command
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-08 16:17:15 +08:00
7113bbf2c6
context.Context should be the first parameter of a function
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-08 14:51:17 +08:00
41513e3051
support settings in docker plugins install
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-07 22:49:22 -08:00
3f7264473d
support settings in docker plugins install
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-07 22:49:22 -08:00
089b33edd8
Adds minimum API version to version
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-07 21:20:00 -08:00
3baa727ed1
Add `--tty` to `docker service create/update`
...
This fix tries to add `--tty` to `docker service create/update`. As was
specified in 25644, `TTY` flag has been added to SwarmKit and is
already vendored.
This fix add `--tty` to `docker service create/update`.
Related document has been updated.
Additional integration tests has been added.
This fix fixes 25644.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-07 16:42:32 -08:00
713c7cd81e
modify to improve code readability
...
Signed-off-by: WangPing <present.wp@icloud.com>
align
Signed-off-by: WangPing <present.wp@icloud.com>
align
Signed-off-by: WangPing <present.wp@icloud.com>
2016-11-08 08:37:44 +08:00
6780c318a3
Merge pull request #28029 from tealtail/27994-add-service-ls-truncate-opt
...
remove COMMAND column from `service ls` output. closes #27994
2016-11-07 14:39:16 -08:00
7a50218855
Merge pull request #25974 from kunalkushwaha/mount-add
...
correct handling of volumes while service update.
2016-11-07 10:34:22 -08:00
dd33c288ec
Merge pull request #25983 from jhorwit2/jah/ps-refactor
...
Add -a option to service/node ps
2016-11-07 17:33:10 +01:00
58c2d938dd
client: bump default version to v1.25
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-07 10:01:28 +01:00
c910d3825b
Merge pull request #28065 from lixiaobing10051267/masterServerEror
...
add error information to distinguish different test scene
2016-11-07 09:16:16 +01:00
1491ae50e0
remove COMMAND column from service ls output. closes #27994
...
Signed-off-by: Alicia Lauerman <alicia@eta.im>
2016-11-06 13:32:44 -05:00
21096cfc05
Add -a option to service/node ps
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
2016-11-06 07:40:39 -05:00
46418414a2
Align arg with other cli
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-05 13:47:02 +08:00
db706f3c38
Merge pull request #28010 from vieux/fix_experimental_client
...
always add but hide experimental cmds and flags
2016-11-04 13:49:19 -07:00
2ee5bbcbfa
update cobra and use Tags
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-04 12:04:14 -07:00
1e10649f55
update cobra and use Tags
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-04 12:04:14 -07:00
b338ab7c41
cli/info: fix seccomp warning
...
also reword seccomp warning around default seccomp profile
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-04 19:25:51 +01:00
1cab3b32a6
Add `--cpus` flag to control cpu resources
...
This fix tries to address the proposal raised in 27921 and add
`--cpus` flag for `docker run/create`.
Basically, `--cpus` will allow user to specify a number (possibly partial)
about how many CPUs the container will use. For example, on a 2-CPU system
`--cpus 1.5` means the container will take 75% (1.5/2) of the CPU share.
This fix adds a `NanoCPUs` field to `HostConfig` since swarmkit alreay
have a concept of NanoCPUs for tasks. The `--cpus` flag will translate
the number into reused `NanoCPUs` to be consistent.
This fix adds integration tests to cover the changes.
Related docs (`docker run` and Remote APIs) have been updated.
This fix fixes 27921.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-04 09:43:10 -07:00
4758d72fa3
Merge pull request #26276 from runcom/seccomp-conf
...
daemon: add a flag to override the default seccomp profile
2016-11-04 15:45:30 +00:00
38a582f54c
Merge pull request #27857 from vasil-yordanov/docker-service-hostname-2
...
Adding the hostname option to docker service command
2016-11-04 15:22:55 +01:00
a98c89b310
add error information to distinguish different test scene
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-04 17:16:11 +08:00
36e659c019
Merge pull request #28045 from vincentbernat/fix/inspect-short-description
...
cli: shorten description of "inspect" subcommand
2016-11-04 08:15:49 +01:00
b8cf9a880e
correct handling of volumes while service update.
...
Updating a service to replace a volume is handled properly now.
Fixes bug#25772
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2016-11-04 10:15:18 +09:00
73d63ec5a6
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-03 17:31:12 -07:00
eb522dac24
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-03 17:31:12 -07:00
284e11ba2b
Merge pull request #28021 from YuPengZTE/devString
...
Add “” for String
2016-11-03 17:03:56 -07:00
0e6f4e7cda
cli: shorten description of "inspect" subcommand
...
The short description should be kept short. Spanning on several lines is
a bit ugly. A user can still get more information in the manual or we
can expand the long description instead if we want (there is currently
none).
This reverts a bit of #26683 .
Signed-off-by: Vincent Bernat <vincent@bernat.im>
2016-11-03 20:46:28 +01:00
3014d36cd9
fix double [y/N] in container prune
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-03 10:33:17 -07:00
938d24ab51
Merge pull request #27910 from dperny/node_ip_in_raft
...
Auto-detect node IP address
2016-11-03 10:30:55 -07:00
2cd4028024
added node ip autodetection
...
Manager now auto-detects the address that an agent connects to the cluster
from and stores it. This is useful for many kinds of internal cluster
management tools.
Signed-off-by: Drew Erny <drew.erny@docker.com>
2016-11-03 08:10:14 -07:00
ee42b42f3c
Merge pull request #27934 from yuexiao-wang/volume-create
...
Update descriptions for the docker volume sub-command, such as create，list and inspect
2016-11-03 03:12:10 -07:00
816560ffe9
Update for docker volume create
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-03 22:40:04 +08:00
19b7bc1739
Adding the hostname option to docker service command
...
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net>
2016-11-03 10:02:14 +00:00
cd46f06934
Add for String
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-03 16:15:26 +08:00
51cb4aa7b8
cli: add `--mount` to `docker run`
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-11-03 07:08:59 +00:00
ec7d9291b8
Fixes #27798 : Update help for --blkio-weight parameter
...
Signed-off-by: milindchawre <milindchawre@gmail.com>
2016-11-03 06:42:15 +00:00
07f77b78ea
Add support for Names and ID in stats format
...
This adds support to display names or id of container instead of what
was provided in the request.
This keeps the default behavior (`docker stats byname` will display
`byname` in the `CONTAINER` colmun and `docker stats byid` will display
the id in the `CONTAINER` column) but adds two new format directive.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-03 07:20:46 +01:00
e279ecacc5
Merge pull request #27979 from allencloud/more-specific-in-service-scale-description
...
add replicated in service scale command description
2016-11-02 18:01:59 -07:00
485bb69238
daemon: add a flag to override the default seccomp profile
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-02 21:41:29 +01:00
557db1ea68
daemon: add a flag to override the default seccomp profile
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-02 21:41:29 +01:00
503053819e
node rm can be applied on not only active node
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-02 17:22:04 +08:00
39e34ed1a3
add replicated in service scale command description
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-02 16:15:57 +08:00
81e6e5e36d
Merge pull request #27948 from WeiZhang555/consistent-filters
...
Replace all "Filter" field with "Filters" for consistency
2016-11-02 00:53:15 -07:00
732006e113
Merge pull request #27948 from WeiZhang555/consistent-filters
...
Replace all "Filter" field with "Filters" for consistency
2016-11-02 00:53:15 -07:00
d4f4ad0ee4
Merge pull request #27942 from yuexiao-wang/remove-const
...
Remove some redundant consts
2016-11-01 20:43:50 -07:00
3acdab83fb
Remove some redundant consts
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-02 16:42:42 +08:00
63719e1a24
Merge pull request #27864 from vdemeester/add-statsformat-to-configfile
...
Add StatsFormat to the config.json file
2016-11-01 20:32:13 -07:00
3a5d54290d
Merge pull request #27953 from thaJeztah/fix-deprecation-version
...
Update deprecation versions for "email" and colon in "security options"
2016-11-01 14:31:32 -07:00
allencloud
yupeng
Victor Vieux
John Howard
Yong Tang
WangPing
Misty Stanley-Jones
Aaron Lehmann
Vincent Demeester
Antonio Murdaca
Alicia Lauerman
Josh Horwitz
Victor Vieux
Justin Cormack
lixiaobing10051267
Kunal Kushwaha
Sebastiaan van Stijn
Vincent Bernat
Drew Erny
yuexiao-wang
Nikolay Milovanov
Akihiro Suda
milindchawre
Michael Crosby