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
09caa1ae97
Merge pull request #22641 from cpuguy83/build_finalization
...
Adds ability to flatten image after build
2016-11-01 14:30:18 -07:00
b90c048804
Adds ability to squash image after build
...
Allow built images to be squash to scratch.
Squashing does not destroy any images or layers, and preserves the
build cache.
Introduce a new CLI argument --squash to docker build
Introduce a new param to the build API endpoint `squash`
Once the build is complete, docker creates a new image loading the diffs
from each layer into a single new layer and references all the parent's
layers.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-01 13:41:59 -04:00
ac7d79389a
Update deprecation versions for "email" and colon in "security options"
...
These features were originally scheduled
for removal in docker 1.13, but we changed
our deprecation policy to keep features
for three releases instead of two.
This updates the deprecation version
to match the deprecation policy.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-01 09:12:27 -07:00
9eceaa926f
Replace all "Filter" field with "Filters" for consistency
...
In file `api/types/client.go`, some of the "*Options{}" structs own a
`Filters` field while some else have the name of `Filter`, this commit
will rename all `Filter` to `Filters` for consistency. Also `Filters`
is consistent with API with format `/xxx?filters=xxx`, that's why
`Filters` is the right name.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-11-01 23:09:30 +08:00
d121e14ccd
Replace all "Filter" field with "Filters" for consistency
...
In file `api/types/client.go`, some of the "*Options{}" structs own a
`Filters` field while some else have the name of `Filter`, this commit
will rename all `Filter` to `Filters` for consistency. Also `Filters`
is consistent with API with format `/xxx?filters=xxx`, that's why
`Filters` is the right name.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-11-01 23:09:30 +08:00
e7e5e6138f
Merge pull request #27930 from YuPengZTE/devLogout
...
Align with other cli descriptions
2016-11-01 08:39:04 -04:00
f1b1e55f7a
Align with other cli descriptions
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-01 13:41:49 +08:00
89db77511c
Align with other cli descriptions
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-01 13:41:49 +08:00
5f066ed250
Refactor client/request
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 17:36:49 -04:00
256b9c6011
Merge pull request #27901 from ripcurld00d/load_stdin_valid
...
Validate docker-load receives a tar file
2016-10-31 14:23:18 -07:00
36e66d54c9
Merge pull request #26683 from yuexiao-wang/update-inspect
...
Modify short and flags for docker inspect
2016-10-31 13:39:59 -07:00
85a0bd062d
Generate ContainerWait response from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:19:53 -04:00
ca7404a80a
generate AuthResponse type from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:16:03 -04:00
e7e0837702
Generate container create response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:16:02 -04:00
598e3a4874
Generate container update response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:16:02 -04:00
f8cdc5ae71
Use IDResponse for container create response.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:16:02 -04:00
d4d914bd52
Add an IDResponse type
...
Generated from a swagger spec and use it for container exec response
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:16:02 -04:00
e0f7f8d0dd
Generate container create response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:16:02 -04:00
010023c3c6
Use a config to generate swagger api types
...
Moves the resposne types to a package under api/types
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:13:41 -04:00
6dc945ab36
Use a config to generate swagger api types
...
Moves the resposne types to a package under api/types
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:13:41 -04:00
120c5f9964
Generate VolumesCreateRequest from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:13:41 -04:00
0325c474b8
Generate VolumesCreateRequest from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-31 11:13:41 -04:00
lixiaobing10051267
Vincent Demeester
Kunal Kushwaha
Victor Vieux
Sebastiaan van Stijn
Vincent Bernat
Drew Erny
yuexiao-wang
Nikolay Milovanov
yupeng
Akihiro Suda
milindchawre
Antonio Murdaca
allencloud
Michael Crosby
Brian Goff
Sebastiaan van Stijn
Zhang Wei
Doug Davis
Daniel Nephin