63356b5588
Merge pull request #23718 from yongtang/23498-entrypoint-unset
...
Allow unset `--entrypoint` in `docker run` or `docker create`
Upstream-commit: 2684459ed433125257ffde5e95666ff785f26ec2
Component: engine
2016-08-08 14:38:01 +02:00
8b07fc75ff
Fix typo for docker swarm description
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: eb4b965ddbe0c351df45dfd81b32c08c7194d804
Component: engine
2016-08-08 14:47:15 +08:00
a9989e0c56
Merge pull request #25457 from sfsmithcha/add_force_remove_to_admin_guide
...
add force remove to admin guide, clean up usage of Raft, cluster -> s…
Upstream-commit: 59b03240b17d5c1fdd18e629e614dc5cffc6c536
Component: engine
2016-08-06 09:16:23 +02:00
7a49d47322
add force remove to admin guide, clean up usage of Raft, cluster -> swarm, fix some organization
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 6c38e6877aa4cfddee018a5bdfee6a9bbcbcc646
Component: engine
2016-08-05 17:27:10 -07:00
faec4a3727
fix typo, change sample cert expiry value
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 8e53390b5101ae30a13fc40f2c2a52019f8b4906
Component: engine
2016-08-05 16:51:07 -07:00
0c71c314fa
Update documentation for entrypoint unset with docker run/create
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 26c913cb6054236e2df5b4a1fcdc5708c4be8f4c
Component: engine
2016-08-05 16:35:25 -07:00
44fa57fb1b
Merge pull request #22770 from twistlock/22729_dynamic_authz_reload
...
Enable to dynamically reload authorization plugins via daemon.config
Upstream-commit: b2b3cb7be92b97150c9be96c606c0ab0a383d2ec
Component: engine
2016-08-05 19:38:40 +02:00
7ad5ac8d06
update D4M D4W advisory in swarm tutorial
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: bd15725519453b13802f1b94f2d61ec04b73d266
Component: engine
2016-08-05 09:13:39 -07:00
6a3509b302
Sync API docs
...
This synchronizes formatting changes to older
versions of the API
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5696c47470a3163d70b3518657f88534787e9fc3
Component: engine
2016-08-05 17:44:58 +02:00
0aa5d77457
Merge pull request #25405 from thaJeztah/fix-api-markdown
...
Fix Markdown formatting in API docs
Upstream-commit: 66671d4ec29d7ccbd991399b8b98705e57b6a3eb
Component: engine
2016-08-05 17:44:15 +02:00
d006708306
Merge pull request #23475 from vdemeester/add-format-flag-to-network-and-volume-ls
...
Add format flag to network and volume ls
Upstream-commit: 1ccd9d31372c41aaac5bc9972122348b1007ea14
Component: engine
2016-08-05 15:17:45 +02:00
fb8eea7ff0
Merge pull request #25096 from vieux/docker_plugin_remove_force
...
Add --force to docker plugin remove
Upstream-commit: 85428a1a53292684be55de9de3646e8c4745c72e
Component: engine
2016-08-05 14:45:05 +02:00
74f20fa606
Fix typo in run command documentation
...
Signed-off-by: Kevin Richardson <kevin@kevinrichardson.co >
Upstream-commit: b3913024e252e9cb1e7cba75e3f95cb23cedaf9b
Component: engine
2016-08-05 07:35:16 -04:00
7c2f803204
Remove git conflict markers
...
Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.com >
Upstream-commit: 34278b3301c0ca339d32a90264f0018e35a1e7e9
Component: engine
2016-08-05 09:41:45 +02:00
4183fa25d5
Remove "-rc" from documentation
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4f7b731a26bf43c03687fab35c2f30cfd827bade
Component: engine
2016-08-05 01:38:18 +02:00
d5f439ee89
Add --force to docker plugin remove
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 0016b331dac94661678fd7676c7b6ccc9ec2d147
Component: engine
2016-08-04 15:55:45 -07:00
5a0f28bcec
minor nit typo in opensl(openssl) genrsa -out delegation.key 2048
...
Signed-off-by: Avi Vaid <avaid1996@gmail.com >
Upstream-commit: 570bad1974e767525ef513e48a0df19fc8b49e0c
Component: engine
2016-08-04 15:07:20 -07:00
b837103bde
Add volume --format flag to ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a488ad1a090eb0b6069f79cd045badaaa8ec1bda
Component: engine
2016-08-04 14:59:55 +02:00
33375755ad
Add network --format flag to ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a8aaafc4a3fc716bdb2c4e571e34c66eb80bbab2
Component: engine
2016-08-04 14:59:51 +02:00
a86adb0e9c
Fix Markdown formatting in API docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 33bd963cfb9396b74387f6f17dc6e86b2ca5fa9d
Component: engine
2016-08-04 14:13:30 +02:00
e9fa1f29b7
Fix service ps output format in swarm tutorial
...
These changes update the example output for `docker service ps` in the
swarm tutorial's rolling update and node draining sections to match that
produced by 1.12.0: shutdown tasks are listed and the column order and
naming has changed.
Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io >
Upstream-commit: da56fa26990aa957c9bdc5497b9856f8aff58636
Component: engine
2016-08-04 13:01:22 +03:00
18e680ce9c
Merge pull request #24736 from johnharris85/fix-sinatra-tutorial
...
Fix broken gem instructions.
Upstream-commit: 29648795cd3709063c0f4309148708bbb5a3e7bc
Component: engine
2016-08-03 19:36:19 +02:00
8df6fc8b2c
add missing period
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 8bdb682205aa004cd4607945fdf48b41716eb6e1
Component: engine
2016-08-03 09:51:09 -07:00
c39cadbef0
Update /node/* api reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 63d65505b28046f23a3cce4374e458720b76bc80
Component: engine
2016-08-03 14:55:30 +02:00
e2da5928d4
Merge pull request #25358 from lixiaobing10051267/masterBe
...
Remove reduntant word in device-mapper-driver.md
Upstream-commit: 5c9bcaa9421699eb39df59cf12f9404bd4ebec82
Component: engine
2016-08-03 10:21:39 +02:00
8c12ea3017
Remove reduntant word in device-mapper-driver.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 96c959ec6b80ff11c8dc8f6d9105b19b9c80899a
Component: engine
2016-08-03 16:13:44 +08:00
8274d135c7
Merge pull request #25350 from thaJeztah/carry-24314-mongodb-example-update
...
[Carry 24314] Make MongoDB sample Dockerfile working again
Upstream-commit: 6e19e7b1d715ac5be4b1a7932b42c5a7eb99a9ad
Component: engine
2016-08-03 01:27:26 +02:00
90863c0a99
Make MongoDB sample Dockerfile working again
...
There were couple issues in the previous version of this Dockerfile
1. [MongoDB manual](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-ubuntu/ ) uses 3.2 repo version as of July'16.
2. Command `# lsb_release -sc` doesn't work out of box, because of `bash: lsb_release: command not found`.
Signed-off-by: Maxim Fedchyshyn <sevmax@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 60f4c7dac389ac2cd152e4de092fe40fe86dd5c7
Component: engine
2016-08-03 01:09:31 +02:00
b99556d80d
409 status code result to create service
...
Added example 409 status code result to the create service endpoint.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 397cc85643252b3882840d5df02189a166abf3a0
Component: engine
2016-08-03 00:46:04 +02:00
15ac980cd0
Merge pull request #25159 from diogomonica/adding-force-to-node-remove
...
Adding force to node rm
Upstream-commit: 10ae908bfa88bf128ce416067391ed125ad0f1be
Component: engine
2016-08-02 22:49:15 +02:00
8ea3665947
Merge pull request #25282 from clhlc/clhlc-patch-1
...
Update swarm-mode.md
Upstream-commit: 181f5ac6276fd47a81ea0931c4fd170ceb3508ed
Component: engine
2016-08-02 13:06:24 -07:00
b4ea667700
Merge pull request #25241 from jhorwit2/jah/ps-doc-fix
...
Added shutdown to desired-state docs for filter node/service ps
Upstream-commit: 1d8617a42b9e85f3098174234401d02595f84a79
Component: engine
2016-08-02 13:05:47 -07:00
d76a57b54d
Merge pull request #25308 from thaJeztah/join-token-refactor
...
Improve swarm join-token instructions
Upstream-commit: 3d28cdd2f5e91e042848321de4cc4dff6735d84d
Component: engine
2016-08-02 18:57:37 +02:00
13ecc55b8a
Merge pull request #25330 from yongtang/docs-service-create-update-user
...
Update docs in `docker service create/update` for flag `--user`
Upstream-commit: 50c08f0f0990740a574d22cfd95e0ae5b8b13958
Component: engine
2016-08-02 17:58:39 +02:00
6d26e235fc
Merge pull request #25105 from hqhq/fix_kmem_test
...
Fix TestUpdateKernelMemoryUninitialized on new kernel version
Upstream-commit: b47df1ddbe847bdffccb76239e3288d59b69cb3b
Component: engine
2016-08-02 17:15:53 +02:00
f03613aded
Improve swarm join-token instructions
...
this change improves the instructions for
swarm join-token and swarm init;
- only print the join-token command for workers
instead of for both managers and workers, to
prevent users from copying the wrong command.
An extra line is added to explain how to obtain
the manager token.
- print a message that a token was rotated
sucesfully if '--rotate' is used.
- add some extra white-space before / after
the join commands, to make copy/pasting
easier.
this change also does some refactoring of join-token;
- move flagname-constants together with other constants
- use variables for selected role ("worker" / "manager")
to prevent checking for them multiple times, and to
keep the "worker" / "manager" sting centralized
- add an extra blank line after "join-token" instructions
this makes it easier to copy, and cleans up the
code a tiny bit
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ebebd4176940bc907ba4e8f5fbe62f6a050f8ed4
Component: engine
2016-08-02 16:44:02 +02:00
96d8037700
Update docs in docker service create/update for flag --user
...
In `docker service create/update`, flag `--user` actually supports
`uid:gid` (same as `docker run`). However, this is not reflected
in the help and documentation yet.
This fix updates docs in `docker service create/update` to change
the description to `Username or UID (format: <name|uid>[:<group|gid>])`.
The help message output has also been updated.
This fix is related to 25304.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 80a3755a8f9eac577b65c3403bcbb23a120e6585
Component: engine
2016-08-02 07:01:16 -07:00
6ae69a861f
Merge pull request #25318 from lixiaobing10051267/masterParentheses
...
A parenthesis omitted in Seccomp.md
Upstream-commit: d7c9c85e3093cef9e014be12951d226ab45bbba6
Component: engine
2016-08-02 12:27:19 +02:00
919b659026
Fix kernel memory updating docs
...
Specify that kernel memory updating limitation only applies
on kernel version older than 4.6.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 59069ba29a9a16c7679bed4cbf2e9d477363aa79
Component: engine
2016-08-02 13:36:58 +08:00
d7f691cfe1
A parenthesis omitted in Seccomp.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 227cae6680d9c2ff8b1583ab4efdec54bdc36688
Component: engine
2016-08-02 12:24:15 +08:00
d3a8f088ac
Update swarm-mode.md
...
Signed-off-by: lichao <lichao@papayamobile.com >
Upstream-commit: 4f1a57a8e14a3ce7d572434020e231e072eb9e13
Component: engine
2016-08-02 11:36:32 +08:00
0e5400a423
Add --force to node removal
...
Signed-off-by: Diogo Monica <diogo.monica@gmail.com >
Upstream-commit: a327c231b5c68c13b7dcde2fdc83b8e4cec59c43
Component: engine
2016-08-01 18:55:58 -07:00
9027f05cc9
Merge pull request #25265 from adamwalz/docs_swarm_cluster_fault_tolerance
...
Fix swarm manager node fault tolerance table
Upstream-commit: ceb4126aa0cfcaf7842d22351876dc35dff915b3
Component: engine
2016-08-01 18:31:46 -07:00
fba16f2b3f
Merge pull request #25205 from lixiaobing10051267/masterPath
...
Give the correct link of docker swarm init
Upstream-commit: 93fea86d1da9088899481519412070e2207cfd40
Component: engine
2016-08-01 11:34:54 -07:00
9e26955cc7
Added shutdown to desired-state docs for filter node/service ps
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
$Updated http docs for /tasks filters
$Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: aae149bd525fb6f3e9a90e45f0d7ba28d568f17a
Component: engine
2016-08-01 09:41:54 -04:00
35c6396c21
add status code 409 in attach in docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b22a2919311fe0aaeb8802756f55486b8b020b2a
Component: engine
2016-08-01 01:21:50 +08:00
6b17dbd4f5
Merge pull request #25240 from allencloud/update-command-description-in-CLI
...
update command description in CLI
Upstream-commit: 849807d89a349db0f869a37c393203d812109d58
Component: engine
2016-07-31 12:56:23 +02:00
c5445bc4bb
Merge pull request #25239 from dlech/patch-1
...
Make it clear which parmeter is the user
Upstream-commit: c7fcf496af8f7f5a6f3ab5397857ecfe91cbc192
Component: engine
2016-07-31 08:54:53 +02:00
59a9a5fe59
Fix swarm manager node fault tolerance table
...
In a cluster of 4 nodes, with a majority being 3 nodes, the fault
tolerance should be 1 node.
Signed-off-by: Adam Walz <adam@adamwalz.net >
Upstream-commit: 18d0c3933bec7fc1dc5ee8d4d1bc15235d86eeca
Component: engine
2016-07-30 21:20:54 -06:00
b87e70e358
update command description in CLI
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 6c5988ed8c654527ee8dbae26d5618297f038cef
Component: engine
2016-07-31 00:06:18 +08:00
