Vincent Demeester
2584223dc2
Merge pull request #27857 from vasil-yordanov/docker-service-hostname-2
...
Adding the hostname option to docker service command
Upstream-commit: 38a582f54c
2016-11-04 15:22:55 +01:00
lixiaobing10051267
792c7e5a54
add error information to distinguish different test scene
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: a98c89b310
2016-11-04 17:16:11 +08:00
Vincent Demeester
b55edf2aaf
Merge pull request #28045 from vincentbernat/fix/inspect-short-description
...
cli: shorten description of "inspect" subcommand
Upstream-commit: 36e659c019
2016-11-04 08:15:49 +01:00
Kunal Kushwaha
3e2986789f
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 >
Upstream-commit: b8cf9a880e
2016-11-04 10:15:18 +09:00
Victor Vieux
0fef0ef25c
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 73d63ec5a6
2016-11-03 17:31:12 -07:00
Victor Vieux
25608ce8d4
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eb522dac24
2016-11-03 17:31:12 -07:00
Sebastiaan van Stijn
2d55d48a71
Merge pull request #28021 from YuPengZTE/devString
...
Add “” for String
Upstream-commit: 284e11ba2b
2016-11-03 17:03:56 -07:00
Vincent Bernat
40f9852dd3
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 >
Upstream-commit: 0e6f4e7cda
2016-11-03 20:46:28 +01:00
Victor Vieux
a3d3423005
fix double [y/N] in container prune
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 3014d36cd9
2016-11-03 10:33:17 -07:00
Sebastiaan van Stijn
7e77a4eb36
Merge pull request #27910 from dperny/node_ip_in_raft
...
Auto-detect node IP address
Upstream-commit: 938d24ab51
2016-11-03 10:30:55 -07:00
Drew Erny
4e0dd7ba31
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 >
Upstream-commit: 2cd4028024
2016-11-03 08:10:14 -07:00
Vincent Demeester
4a8233909f
Merge pull request #27934 from yuexiao-wang/volume-create
...
Update descriptions for the docker volume sub-command, such as create，list and inspect
Upstream-commit: ee42b42f3c
2016-11-03 03:12:10 -07:00
yuexiao-wang
f4a9cbc8ae
Update for docker volume create
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 816560ffe9
2016-11-03 22:40:04 +08:00
Nikolay Milovanov
2cef813aa2
Adding the hostname option to docker service command
...
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net >
Upstream-commit: 19b7bc1739
2016-11-03 10:02:14 +00:00
yupeng
9e5c08ce2b
Add for String
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: cd46f06934
2016-11-03 16:15:26 +08:00
Akihiro Suda
01e1a7306e
cli: add --mount to docker run
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 51cb4aa7b8
2016-11-03 07:08:59 +00:00
milindchawre
1e7ea7f047
Fixes #27798 : Update help for --blkio-weight parameter
...
Signed-off-by: milindchawre <milindchawre@gmail.com >
Upstream-commit: ec7d9291b8
2016-11-03 06:42:15 +00:00
Vincent Demeester
b5f18791bf
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 >
Upstream-commit: 07f77b78ea
2016-11-03 07:20:46 +01:00
Sebastiaan van Stijn
a513733757
Merge pull request #27979 from allencloud/more-specific-in-service-scale-description
...
add replicated in service scale command description
Upstream-commit: e279ecacc5
2016-11-02 18:01:59 -07:00
Antonio Murdaca
f70d6e5d9c
daemon: add a flag to override the default seccomp profile
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 485bb69238
2016-11-02 21:41:29 +01:00
Antonio Murdaca
e35c329385
daemon: add a flag to override the default seccomp profile
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 557db1ea68
2016-11-02 21:41:29 +01:00
allencloud
5da8376ad1
node rm can be applied on not only active node
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 503053819e
2016-11-02 17:22:04 +08:00
allencloud
ba2bdb1e37
add replicated in service scale command description
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 39e34ed1a3
2016-11-02 16:15:57 +08:00
Sebastiaan van Stijn
7caa97e5c7
Merge pull request #27948 from WeiZhang555/consistent-filters
...
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: 81e6e5e36d
2016-11-02 00:53:15 -07:00
Sebastiaan van Stijn
5d177d55f0
Merge pull request #27948 from WeiZhang555/consistent-filters
...
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: 732006e113
2016-11-02 00:53:15 -07:00
Sebastiaan van Stijn
59572d8cbb
Merge pull request #27942 from yuexiao-wang/remove-const
...
Remove some redundant consts
Upstream-commit: d4f4ad0ee4
2016-11-01 20:43:50 -07:00
yuexiao-wang
cf21756a82
Remove some redundant consts
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 3acdab83fb
2016-11-02 16:42:42 +08:00
Sebastiaan van Stijn
bee99c14d9
Merge pull request #27864 from vdemeester/add-statsformat-to-configfile
...
Add StatsFormat to the config.json file
Upstream-commit: 63719e1a24
2016-11-01 20:32:13 -07:00
Michael Crosby
bb91eece7d
Merge pull request #27953 from thaJeztah/fix-deprecation-version
...
Update deprecation versions for "email" and colon in "security options"
Upstream-commit: 3a5d54290d
2016-11-01 14:31:32 -07:00
Michael Crosby
951b0a97af
Merge pull request #22641 from cpuguy83/build_finalization
...
Adds ability to flatten image after build
Upstream-commit: 09caa1ae97
2016-11-01 14:30:18 -07:00
Brian Goff
fad42b5770
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 >
Upstream-commit: b90c048804
2016-11-01 13:41:59 -04:00
Sebastiaan van Stijn
6edad79979
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 >
Upstream-commit: ac7d79389a
2016-11-01 09:12:27 -07:00
Zhang Wei
ca8b6d0b28
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 >
Upstream-commit: 9eceaa926f
2016-11-01 23:09:30 +08:00
Zhang Wei
c7196b3968
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 >
Upstream-commit: d121e14ccd
2016-11-01 23:09:30 +08:00
Doug Davis
3f0d4ebbb3
Merge pull request #27930 from YuPengZTE/devLogout
...
Align with other cli descriptions
Upstream-commit: e7e5e6138f
2016-11-01 08:39:04 -04:00
yupeng
a70e23cbcd
Align with other cli descriptions
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: f1b1e55f7a
2016-11-01 13:41:49 +08:00
yupeng
1b6c8e9cf6
Align with other cli descriptions
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 89db77511c
2016-11-01 13:41:49 +08:00
Daniel Nephin
7d5d39c4f3
Refactor client/request
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5f066ed250
2016-10-31 17:36:49 -04:00
Sebastiaan van Stijn
ee6accd430
Merge pull request #27901 from ripcurld00d/load_stdin_valid
...
Validate docker-load receives a tar file
Upstream-commit: 256b9c6011
2016-10-31 14:23:18 -07:00
Sebastiaan van Stijn
44be9bdb95
Merge pull request #26683 from yuexiao-wang/update-inspect
...
Modify short and flags for docker inspect
Upstream-commit: 36e66d54c9
2016-10-31 13:39:59 -07:00
Daniel Nephin
fe94d78afa
Generate ContainerWait response from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 85a0bd062d
2016-10-31 11:19:53 -04:00
Daniel Nephin
e10d258b88
generate AuthResponse type from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ca7404a80a
2016-10-31 11:16:03 -04:00
Daniel Nephin
5175d100a2
Generate container create response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e7e0837702
2016-10-31 11:16:02 -04:00
Daniel Nephin
4a62b2cc8e
Generate container update response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 598e3a4874
2016-10-31 11:16:02 -04:00
Daniel Nephin
bc55ba3a44
Use IDResponse for container create response.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f8cdc5ae71
2016-10-31 11:16:02 -04:00
Daniel Nephin
71efaf6beb
Add an IDResponse type
...
Generated from a swagger spec and use it for container exec response
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d4d914bd52
2016-10-31 11:16:02 -04:00
Daniel Nephin
9557c883f5
Generate container create response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e0f7f8d0dd
2016-10-31 11:16:02 -04:00
Daniel Nephin
1dc49df012
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 >
Upstream-commit: 010023c3c6
2016-10-31 11:13:41 -04:00
Daniel Nephin
d817915a4e
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 >
Upstream-commit: 6dc945ab36
2016-10-31 11:13:41 -04:00
Daniel Nephin
f382f98092
Generate VolumesCreateRequest from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 120c5f9964
2016-10-31 11:13:41 -04:00
Vincent Demeester
lixiaobing10051267
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