3f00f70bbf
field NAMES ommitted after docker ps in commit.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: f34ccd70c8c55946fe9d3b83b44bdac770858176
Component: engine
2016-12-20 20:34:09 +08:00
ad939616ff
Merge pull request #29541 from tim-zju/spellError
...
spell error: in other parts, they are lower-case
Upstream-commit: 8a41c1d548835afcc5f6021f15e0c885ed99ef7c
Component: engine
2016-12-19 14:48:31 +01:00
55338a0e87
Merge pull request #29510 from albers/docs-remove-node-ps--all
...
Remove `--all|-a` from `docker node ps` reference
Upstream-commit: 309df6a59217852a8f1b14504ba064bbefb4727d
Component: engine
2016-12-19 09:31:43 +01:00
490fa1ab01
spell error: in other parts, they are lower-case
...
Signed-off-by: tim-zju <21651152@zju.edu.cn >
Upstream-commit: 4bf9e7caaa31035904529ee6305921821b5aa207
Component: engine
2016-12-19 13:05:11 +08:00
0fa3af8470
[docs,man] Fixed typo ( #29516 )
...
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de >
Upstream-commit: e85bb788de950090c66e8501d294bd8b5e4e4723
Component: engine
2016-12-18 19:55:09 -05:00
46f764687c
Remove --all|-a from docker node ps reference
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 364e9002375fca1799180dd76e8074d922dd4044
Component: engine
2016-12-18 06:47:54 -08:00
2b846c8a06
Merge pull request #28629 from yongtang/28581-secret-create-input
...
Add `--file` flag for `docker secret create` command
Upstream-commit: 4436a5946d1cc20efb3af5a3d0c56894c02f1a29
Component: engine
2016-12-18 03:04:10 +01:00
9691034423
Merge pull request #29482 from thaJeztah/not-for-workers-only
...
swarm leave is not only for workers
Upstream-commit: 87e8828dffb29c351486e1e286c597cef238c5d1
Component: engine
2016-12-16 09:48:35 -08:00
588ffd020c
Merge pull request #29434 from yuexiao-wang/pause-and-unpause
...
Fix inconsistency for pause and unpause
Upstream-commit: ba76c9214dbbc5d6276a20136eb3c454a1aa0969
Component: engine
2016-12-16 16:42:04 +01:00
148f65373a
swarm leave is not only for workers
...
the "docker swarm leave" command description
mentioned that the command can only be used
for workers, however, the command can also
be used for managers (using the `-f` / `--force`
option).
this patch removes the "(workers only)" part
of the command description.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f89eee5d9d3c01bc6d498fcb1163ec199e6c3078
Component: engine
2016-12-16 15:10:20 +01:00
668e4bdf14
Add the whole related information for node
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b67b0949ed4b528fef6c3dc059a4bd16d5f2a929
Component: engine
2016-12-16 22:21:52 +08:00
b689c13fe1
Fix inconsistency for pause and unpause
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 082f4919cac55f32674874d96d82a310f6b1522d
Component: engine
2016-12-16 17:27:28 +08:00
fd62091f94
Merge pull request #29383 from yuexiao-wang/add-logs-link
...
Add the link for service logs
Upstream-commit: e9a69316b8245413eec9ac4fb8b2267883855b74
Component: engine
2016-12-15 13:23:18 +01:00
3baf7d2e75
Add the link for service logs
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 54d38fe115e0183af7d862e54ba6e58c347e2a8d
Component: engine
2016-12-15 17:43:51 +08:00
15f4ce0b26
Merge pull request #29419 from trapier/reference_service_create_typo
...
fix typo in reference for service create
Upstream-commit: 31eea90f523e6033951176719594b7a477a17e74
Component: engine
2016-12-15 09:45:17 +01:00
91cbeaba53
fix typo in reference for service create
...
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com >
Upstream-commit: 90c680ad259057d0065662a1a6fdad779bde6082
Component: engine
2016-12-14 14:56:55 -05:00
e1cfecec53
Add docs for docker network create --attachable
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7433d3acf61142bb1abbf7928ff0e20acf3eda56
Component: engine
2016-12-14 08:39:10 -08:00
c3c5d1b1fc
Add --file flag for docker secret create command
...
This fix tries to address the issue raised in 28581 and 28927
where it is not possible to create a secret from a file (only
through STDIN).
This fix add a flag `--file` to `docker secret create` so that
it is possible to create a secret from a file with:
```
docker secret create --file secret.in secret.name
```
or
```
echo TEST | docker secret create --file - secret.name
```
Related docs has been updated.
An integration test has been added to cover the changes.
This fix fixes 28581.
This fix is related to 28927.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: c6f0b7f448fac4d037d00f944a7908c60c04dff2
Component: engine
2016-12-13 07:35:45 -08:00
30be95cf13
Update reference docs for service ps
...
commit bbd2018ee19eff5594ae3986bf56fbcd0044699d
changed the output format of `docker service ps`.
this patch updates the reference docs
to match the updated output format.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5902fa33840507706e6e9b189fec0adeb20affa5
Component: engine
2016-12-13 13:30:58 +01:00
252ac47c97
Merge pull request #29216 from allencloud/add-status-code-403-for-services-create
...
add missing status code 403 for services/create in docs
Upstream-commit: 1bc942597d4a4cfb16493f416eb1c4c36029819b
Component: engine
2016-12-13 12:27:56 +01:00
1bef3cf8f2
stack_config.md not exist and delete it
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: afaff51a8b59630f880493679906acc3acc3005a
Component: engine
2016-12-13 18:06:18 +08:00
d26a2271f7
Merge pull request #28437 from thaJeztah/deprecate-default-network-inspect
...
deprecate "top-level" network information in NetworkSettings
Upstream-commit: 7f44e09797351d5a62eb044d1832bab9a40c1b98
Component: engine
2016-12-13 08:58:57 +01:00
90bc3ba4b5
Merge pull request #29267 from yuexiao-wang/fix-bulid-para
...
Update the option for docker build
Upstream-commit: 3d52c86d4c8405372445502b2592e8f63132ce99
Component: engine
2016-12-13 08:55:20 +01:00
d619a55e45
Update the option 'network' for docker build
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cd317282c9b7d4dc68dce8df1d2f84e7a5654e72
Component: engine
2016-12-13 18:18:53 +08:00
e31c4556e5
Merge pull request #29230 from vieux/remove_old_media_type_plugin
...
remove old media type compat for plugins
Upstream-commit: 8de2336f078af8467900e0c6591e5732755733bc
Component: engine
2016-12-12 12:43:32 -08:00
6cb48646d9
fix some broken contents links
...
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn >
fix-contents-links
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn >
Upstream-commit: bac792c1634724def05c5ebc93891ecd5b353a53
Component: engine
2016-12-12 21:34:37 +08:00
9c4a02201b
Merge pull request #29309 from ohmk/fix-description-of-docker-swarm-command
...
Fix description of docker swarm command
Upstream-commit: cc85b14d9c7b4d91e9dd1e6660c358cf66d181cf
Component: engine
2016-12-12 10:34:35 +01:00
fc7e504006
replace env description with args in extend config
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: abdc031aeaa757546735da0075868b87dd99ef7a
Component: engine
2016-12-12 17:24:12 +08:00
ea1061f290
docs: fix description of docker swarm update --help
...
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com >
Upstream-commit: 2f0e00f58723cb3e063b49f564173b3768476c99
Component: engine
2016-12-11 21:25:40 +09:00
aebf5fe759
docs: fix description of docker swarm join --help
...
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com >
Upstream-commit: 77dd8474a7b4447d7c5b1d257afe1bb2f6443172
Component: engine
2016-12-11 21:21:48 +09:00
6b1a2692bb
Merge pull request #26398 from tiborvass/plugin-fixes
...
plugins: container-rootfs-relative paths
Upstream-commit: 0a072e93df6ad10e37bbf0b1f540fff7b7581a75
Component: engine
2016-12-09 12:48:59 -08:00
656f60dc73
plugins: container-rootfs-relative paths
...
Legacy plugins expect host-relative paths (such as for Volume.Mount).
However, a containerized plugin cannot respond with a host-relative
path. Therefore, this commit modifies new volume plugins' paths in Mount
and List to prepend the container's rootfs path.
This introduces a new PropagatedMount field in the Plugin Config.
When it is set for volume plugins, RootfsPropagation is set to rshared
and the path specified by PropagatedMount is bind-mounted with rshared
prior to launching the container. This is so that the daemon code can
access the paths returned by the plugin from the host mount namespace.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: c54b717caf1a55e525ce180bfcb42addd59c6633
Component: engine
2016-12-09 10:16:24 -08:00
1201f538ea
add missing status code 403 for services/create in docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 19654fd71ec5b9b075863f4623fdb80a955f5187
Component: engine
2016-12-10 01:54:51 +08:00
7272f6fdfe
Merge pull request #29245 from pengqinglan/doc-deprecated
...
fix some version information
Upstream-commit: 98e4a7edb6d8a9a60a510327d4cb1e0da1edebcc
Component: engine
2016-12-09 10:25:50 +01:00
dfc806e15a
Merge pull request #29092 from KingEmet/master
...
Add credential helper documentation
Upstream-commit: 4bc3b4d6aa9f41460bc02f4245ba94e0041ed141
Component: engine
2016-12-08 15:29:35 +01:00
7ae5702e91
fix some version information
...
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn >
Upstream-commit: aa26364ce1de66b23e51864682cbdadb4a272fa4
Component: engine
2016-12-08 19:03:46 +08:00
c7b83e6391
add SCOPE field content for docker network ls
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 170fcead7ecd0dbe323d727a2afd3e2694e6af29
Component: engine
2016-12-08 17:13:38 +08:00
c7e69feeb2
remove old media type compat for plugins
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: f644e758bd58f7b045a52b29038ae0043b0c9e3d
Component: engine
2016-12-07 17:35:09 -08:00
2a1f61f581
Merge pull request #29062 from erxian/refine-api-swagger.yaml-towards-image-create-status-code
...
refine api swagger.yaml towards image create status code
Upstream-commit: 9468d687ac924db8df95fd8d2bcbe7facafb8c2d
Component: engine
2016-12-07 22:03:54 +01:00
405972988b
Add credential helper documentation
...
Signed-off-by: Jake Sanders <jsand@google.com >
Upstream-commit: 68211f4cb45baca957fef625ba3bb0c422dd20ec
Component: engine
2016-12-07 10:14:28 -08:00
e148b77b83
modify URLs for bind docker in docs/api
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 9c76fb253ecc53cc54d196a4460d8e1d91c1683d
Component: engine
2016-12-07 15:06:16 +08:00
afe61e5090
refine api swagger.yaml towards image create status code
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: 15be050fb307d0da1521767a6f53d9b95429396b
Component: engine
2016-12-07 10:27:40 +08:00
13d5eb7768
add 403 for endpoint network create
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0d21e24b9fb90ea804ba37af303de7547743ba2b
Component: engine
2016-12-06 14:36:50 +08:00
9c58790379
Fix a spelling mistake in the docs.
...
Signed-off-by: Chris Gavin <chris@chrisgavin.me >
Upstream-commit: 35c82f422d5db64baec6739490900f7f8fa7d7fd
Component: engine
2016-12-04 12:55:00 +00:00
30839117e7
Merge pull request #28735 from yongtang/28708-plugin-list-id
...
Add `ID` field for `docker plugin ls`
Upstream-commit: 51c5718aa357d3319f579caa39d313e4d55ff794
Component: engine
2016-12-03 02:37:09 +01:00
095013e19b
Merge pull request #28349 from allencloud/add-missing-code-in-api-docs
...
add missing status code of swarm cluster in api 1.24
Upstream-commit: 535db46be508d38a6f9f304a4e57e0c3d1c94af1
Component: engine
2016-12-03 02:04:05 +01:00
eaac95defc
Add ID field for docker plugin ls
...
This fix tries to address the enhancement proposed in 28708 to display
ID field for the output of `docker plugin ls`.
This fix add `ID` field to the output of `docker plugin ls`
Related docs has been updated.
This fix fixes 28708.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 8a226ed6432a0614b25298fef872c98794f65ba9
Component: engine
2016-12-02 13:42:50 -08:00
25a255f4fc
add missing status code in api docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9a1f7b6b0bba7bd28c5ae1fabef7ef267e5fbfbd
Component: engine
2016-12-02 11:24:45 +08:00
2ac57c6dcf
Allow docker plugin inspect to search based on ID or name
...
This fix tries to address the issue raised in discussion of
PR 28735 where it was not possible to manage plugin based on
plugin ID. Previously it was not possible to invoke
`docker plugin inspect` with a plugin ID (or ID prefix).
This fix updates the implementation of `docker plugin inspect`
so that it is possbile to search based on a plugin name, or a
plugin ID. A short format of plugin ID (prefix) is also possible,
as long as there is no ambiguity.
Previously the check of `docker plugin inspect` was mostly done
on the client side. This could potentially cause inconsistency
between API and CMD. This fix move all the checks to daemon side
so that API and CMD will be consistent.
An integration test has been added to cover the changes.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 0ce6e070f7d1e4b1b478d52b4464f8480dbfd9b7
Component: engine
2016-12-01 10:44:17 -08:00
77750af0f0
Merge pull request #28922 from yuexiao-wang/fix-secret
...
Fix the inconsistency for secret ls and secrect rm
Upstream-commit: a3be176f139e8fd54b985c5876eb677250890805
Component: engine
2016-12-01 11:29:58 +01:00
