cfba442486
Merge pull request #25867 from lixiaobing10051267/masterScheduler
...
It is orchestrator not scheduler to create swarm task
Upstream-commit: ad37e303638dd37b3bf2eef8916e8e0376e2acce
Component: engine
2016-08-19 13:27:12 -07:00
e3afe81751
Merge pull request #23436 from yongtang/23367-out-of-band-volume-driver-deletion
...
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
Upstream-commit: 09b929083d34836a78ce8ee79b22aea082712072
Component: engine
2016-08-19 22:09:57 +02:00
034eb19e73
Merge pull request #25791 from lixiaobing10051267/masterSwarmJoinToken
...
Modify usage of docker swarm join-token command
Upstream-commit: 80798d28d36936f16fae4dd60af27cd08f54817c
Component: engine
2016-08-19 21:44:42 +02:00
5f54e81cc1
Merge pull request #25665 from vdemeester/remove-deprecated-run-flag-from-commit
...
Remove -run flag from commit command.
Upstream-commit: ec8f20cbf2edba00e645175675e8dca7c03b1350
Component: engine
2016-08-19 15:19:23 +02:00
ac9a57031e
Remove -run flag from commit command.
...
This flag has been deprecated in version below 1.10 so it's safe to
remove now, according to our deprecation policy.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 54ed156879352afb06ecb94fa7b6518a39eb5fd2
Component: engine
2016-08-19 13:14:03 +02:00
48a77b1711
It is orchestrator not scheduler to create swarm task
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: cb9dfd391ba4df5c34f83f5070e0b685c99bf591
Component: engine
2016-08-19 17:02:00 +08:00
715ba2d5b3
Modify usage of docker swarm join-token command
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 9123ca546a49f6738a918b89ba7a41963083be54
Component: engine
2016-08-19 09:44:22 +08:00
a603b90d7f
Add --force in docker volume rm to fix out-of-band volume driver deletion
...
This fix tries to address the issue in raised #23367 where an out-of-band
volume driver deletion leaves some data in docker. This prevent the
reuse of deleted volume names (by out-of-band volume driver like flocker).
This fix adds a `--force` field in `docker volume rm` to forcefully purge
the data of the volume that has already been deleted.
Related documentations have been updated.
This fix is tested manually with flocker, as is specified in #23367 .
An integration test has also been added for the scenario described.
This fix fixes #23367 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 6c5c34d50d377d1c5318a255240fb2dc9c23cf92
Component: engine
2016-08-18 18:01:25 -07:00
9ab2ca7546
Merge pull request #25708 from timfeirg/master
...
expose RemovalInProgress in StateString #25652
Upstream-commit: 426046db3a5c3c056f02bf3ad5efd1342ff79533
Component: engine
2016-08-18 21:54:48 +02:00
9ad4bec0bc
Merge pull request #25743 from lixiaobing10051267/masterInspect
...
Check the return message of docker service inspect
Upstream-commit: 6fa69d2d0610320cce61517eca6e4471f5381561
Component: engine
2016-08-18 19:25:08 +02:00
9c61498be3
Merge pull request #25726 from vieux/new_plugin_system_doc
...
adding some documentation about the new plugin system
Upstream-commit: 88a6a7763b789a35fff9df4e52e48ca99afd3c08
Component: engine
2016-08-18 17:20:09 +02:00
c48cb27659
Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave
...
Specify woker node for docker swarm leave command
Upstream-commit: 90308fd78315412c30da90217ee14515de4fbf8a
Component: engine
2016-08-18 17:08:41 +02:00
9ebd97c86d
Merge pull request #25812 from johananl/patch-1
...
Update device-mapper-driver.md
Upstream-commit: 840a1982803425d67d9c29acbed0d16ecaa6e4ed
Component: engine
2016-08-18 17:08:14 +02:00
c8732c07e1
expose RemovalInProgress in StateString #25652
...
Signed-off-by: timfeirg <kkcocogogo@gmail.com >
Upstream-commit: 37466cc8c85ccbdade57463ae2aacac638002f8a
Component: engine
2016-08-18 11:25:27 +08:00
a87ab137b8
Specify woker node for docker swarm leave command
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fd660e21bf6568c3f98424bdff3b9672cd2a3ef8
Component: engine
2016-08-18 09:35:11 +08:00
3a9b1e9ecd
Split list of capabilities into those added by default and those not
...
The documentation was a bit unhelpful as to what are the default
capabilities, so split.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: bf7a3f010443ecd614baf0450c3193b1f5e52bc2
Component: engine
2016-08-17 21:16:54 +01:00
3497960ec5
Update device-mapper-driver.md
...
Signed-off-by: Johanan Lieberman <johanan.lieberman@gmail.com >
Upstream-commit: 086542a687235b0c3c8a6985755b918e2e93fcbc
Component: engine
2016-08-17 21:58:30 +03:00
6c683fac48
Replace old oci specs import with runtime-specs
...
Fixes #25804
The upstream repo changed the import paths.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 041e5a21dc0a8856448e3a9ad91e8535b8a7d00d
Component: engine
2016-08-17 09:38:34 -07:00
703353742f
Add missing docs about binary remote contexts
...
This feature was added in docker 1.8, through
7491f9a9c11ad3fd3b587fa6f7e53b297b3b88c7.
However, the API docs ended up in the wrong
API version (1.19 instead of 1.20), so were
never included in future API docs.
Also, the CLI docs got lost during splitting
up the cli.md docs into separate files;
561bfb268de3c674b04d48895b7e46ae890ef795
This moves the API docs to the correct
versions, and restores the CLI documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a5ba032c7421ef7a429e780d12d0f604a045258a
Component: engine
2016-08-17 16:15:59 +02:00
e997af8b70
Merge pull request #25704 from thaJeztah/cleanup-api-markdown
...
Cleanup API docs Markdown formatting and wording
Upstream-commit: 45cb33e65ca5bb247e2e9f425b4441ad6a08aa51
Component: engine
2016-08-17 10:39:45 +02:00
2943f3420d
Merge pull request #25751 from yuexiao-wang/clean-docs
...
Remove mess words in installation doc
Upstream-commit: bbd5396955a8c36b9f208d64fe580b769c1686f5
Component: engine
2016-08-17 09:59:36 +02:00
f07d519e90
remove mess words in installation doc
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: f8d5b880722bcc87113a08cbb2069b6311b89f39
Component: engine
2016-08-17 15:43:52 +08:00
80c9d996e6
fix broken link
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 79aa2b9f6da802ee1380c22c3afc8c0be7c493ce
Component: engine
2016-08-16 21:26:07 -07:00
ec5f7ff759
edit plugin system doc, fix menu system
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: a7a70433cabe5eb210ef81ff61f953ab9d9e332d
Component: engine
2016-08-16 13:36:17 -07:00
a413b2d6cd
Merge pull request #25701 from WeiZhang555/update-conflict-rm-restart
...
Forbid update restart policy of container with AutoRemove flag
Upstream-commit: 9a3e7d9e343938218aac8217c4b8ba4c21b841c4
Component: engine
2016-08-16 10:37:45 -07:00
06f36cfa80
Merge pull request #25337 from jhorwit2/jah/25332
...
Add --no-trunc to service/node/stack ps output
Upstream-commit: 0c8b0faef8dfb2aa97575bae8afa152e54e63492
Component: engine
2016-08-16 09:25:45 -07:00
3e85f88396
Merge pull request #25757 from eskaaren/create_service_id
...
Capital D in "ID" returned when creating service
Upstream-commit: 641e1564cfeb3f94f68f3c43a353df10331afecf
Component: engine
2016-08-16 17:01:22 +02:00
b99343eade
Merge pull request #25758 from eskaaren/create_service_annotations
...
"Annotations" not a parameter
Upstream-commit: e48aeb118c088f63c0708f953d84cd9041920e0f
Component: engine
2016-08-16 16:51:15 +02:00
cff5a79975
Add --no-trunc to service/node/stack ps output
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: 204c4d39d3241cff1b44f438b99bd0d6484e7b48
Component: engine
2016-08-16 10:19:11 -04:00
5d91ad733a
Merge pull request #25756 from YuPengZTE/shuold-be--
...
“ should be "
Upstream-commit: 79c1cd87ec74aa5ca71ceb52e12ab2f15efd8b24
Component: engine
2016-08-16 09:31:07 -04:00
eefe7f0f5d
"Annotations" not a parameter
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: 69e481af4e1fec65629c6ea4eb74fc58f5abc932
Component: engine
2016-08-16 15:17:26 +02:00
4a7e8b4b54
Merge pull request #25720 from thaJeztah/add-missing-label-filter-docs
...
Add missing docs for volume ls filter=label
Upstream-commit: dcdf2b404ef1859500c169c0a2fdb1d78add3d58
Component: engine
2016-08-16 13:50:56 +02:00
cf3d39b364
Capital D in "ID" returned when creating service
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: 9eb2ec799eb37210dee5183ace375e480bbfd8aa
Component: engine
2016-08-16 13:43:23 +02:00
3b1b49d31b
Cleanup API docs Markdown formatting and wording
...
Synchronize formatting between versions, and
update wording to be consistent.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: eb24e9bbd312b0d7392e8012b757e7c9022c9add
Component: engine
2016-08-16 13:22:47 +02:00
c2797cb474
Merge pull request #25753 from eskaaren/swarm_inspect
...
Add doc for inspect swarm
Upstream-commit: 1f0a99e86f78f5c5f076c1dcd10ad329ea8ee737
Component: engine
2016-08-16 13:19:36 +02:00
20d4e38a31
Add doc for inspect swarm
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: c59bc537274aa7f4dc9702ea08c349c71a024b39
Component: engine
2016-08-16 12:49:33 +02:00
61ea39768c
“ should be "
...
Full width turn half-width character
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: fe081efa929bab70f72f47ec360cd91a65bd8d46
Component: engine
2016-08-16 18:41:34 +08:00
cd9750292a
Merge pull request #23808 from AkihiroSuda/formatinfo
...
add `--format` flag to `docker info`
Upstream-commit: 348f6529b71502b561aa493e250fd5be248da0d5
Component: engine
2016-08-16 12:04:26 +02:00
aab3a8354b
Merge pull request #25705 from AkihiroSuda/noteRenameCOW
...
Add a note about the open(2) and rename(2) on AUFS and OverlayFS
Upstream-commit: 7524a1d3f2fa3489d689b1973dfb84e13615d3de
Component: engine
2016-08-16 10:52:25 +02:00
d1bde01a82
Forbid update restart policy of container with AutoRemove flag
...
"--restart" and "--rm" are conflict options, if a container is started
with AutoRemove flag, we should forbid the update action for its Restart
Policy.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 4754c64ab5b5bf5ae6f8a3040606296910e6cb19
Component: engine
2016-08-16 15:36:13 +08:00
c4f46bb88f
Check the return message of docker service inspect
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 68ef2569842f8ca4dd09a85caca1970d95946547
Component: engine
2016-08-16 14:47:13 +08:00
1b140377f0
add --format flag to docker info
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: dc38c9a04705f0a9ad3e007f7869cfb6a8a3a8b8
Component: engine
2016-08-16 04:03:52 +00:00
871f085a91
Add a note about the open(2) and rename(2) on AUFS and OverlayFS
...
Close #25409
Update #10180
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: aab101a770a88cdbde5012dc7eb5b4439cf57192
Component: engine
2016-08-16 02:13:33 +00:00
9c0f9616a1
adding some documentation about the new plugin system
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 98901906523d43b537a3d6a2861ac831ded7df6a
Component: engine
2016-08-15 13:56:30 -07:00
fe5ecb2397
Merge pull request #25706 from thaJeztah/add-authorization-header-to-api-docs
...
Add X-Registry-Auth header to service API docs
Upstream-commit: 9079d5ccbb040363a89c87d87eac693575848c80
Component: engine
2016-08-15 21:54:06 +02:00
fba4d062dd
Merge pull request #25707 from thaJeztah/move-sysctls-to-correct-api-version
...
Move sysctls to correct API version
Upstream-commit: 4105cff4d8d5bb55661944286ceee03f9c5c36ee
Component: engine
2016-08-15 20:29:51 +02:00
763cc81465
Add missing docs for volume ls filter=label
...
This filter option was added in be045ee2da7c2c83e859d86cb496e86ec6de8566,
but didn't update the documentation and
man pages.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5171b8349578a89efca69942f81f7e3c560840b9
Component: engine
2016-08-15 17:42:16 +02:00
d3c1040e86
Merge pull request #25710 from thaJeztah/restore-missing-ps-example
...
Restore missing ps example for killed containers
Upstream-commit: 0f838cc5230c12f073095bf537ec896e95d1f631
Component: engine
2016-08-15 16:02:16 +02:00
fc75fb9bbd
Merge pull request #25700 from lixiaobing10051267/masterSwarmRmService
...
command "docker service remove" not consistent
Upstream-commit: bfc3f121f10f0dd17833ee1f2d8ccd8b7dcafa5f
Component: engine
2016-08-15 09:55:52 -04:00
bb8ea42967
Fix capitalization
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 75e60fbe09f6065ed095671f98713d862c466858
Component: engine
2016-08-15 14:14:41 +02:00
