0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
26332 commits 14 branches 412 tags 338 MiB
Commit graph

5704 commits

Author SHA1 Message Date
Charles Smith
bd15725519 update D4M D4W advisory in swarm tutorial 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-05 09:13:39 -07:00
Sebastiaan van Stijn
5696c47470 Sync API docs 
This synchronizes formatting changes to older
versions of the API

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-05 17:44:58 +02:00
Sebastiaan van Stijn
66671d4ec2 Merge pull request #25405 from thaJeztah/fix-api-markdown 
Fix Markdown formatting in API docs
 2016-08-05 17:44:15 +02:00
Vincent Demeester
1ccd9d3137 Merge pull request #23475 from vdemeester/add-format-flag-to-network-and-volume-ls 
Add format flag to network and volume ls
 2016-08-05 15:17:45 +02:00
Vincent Demeester
85428a1a53 Merge pull request #25096 from vieux/docker_plugin_remove_force 
Add --force to docker plugin remove
 2016-08-05 14:45:05 +02:00
Kevin Richardson
b3913024e2 Fix typo in run command documentation 
Signed-off-by: Kevin Richardson <kevin@kevinrichardson.co>
 2016-08-05 07:35:16 -04:00
Patrick Böänziger
34278b3301 Remove git conflict markers 
Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.com>
 2016-08-05 09:41:45 +02:00
Sebastiaan van Stijn
4f7b731a26 Remove "-rc" from documentation 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-05 01:38:18 +02:00
Victor Vieux
0016b331da Add --force to docker plugin remove 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-04 15:55:45 -07:00
Avi Vaid
570bad1974 minor nit typo in opensl(openssl) genrsa -out delegation.key 2048 
Signed-off-by: Avi Vaid <avaid1996@gmail.com>
 2016-08-04 15:07:20 -07:00
Vincent Demeester
a488ad1a09
Add volume --format flag to ls 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-04 14:59:55 +02:00
Vincent Demeester
a8aaafc4a3
Add network --format flag to ls 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-04 14:59:51 +02:00
Sebastiaan van Stijn
33bd963cfb
Fix Markdown formatting in API docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-04 14:13:30 +02:00
Ilkka Laukkanen
da56fa2699 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>
 2016-08-04 13:01:22 +03:00
Sebastiaan van Stijn
29648795cd Merge pull request #24736 from johnharris85/fix-sinatra-tutorial 
Fix broken gem instructions.
 2016-08-03 19:36:19 +02:00
Charles Smith
8bdb682205 add missing period 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-03 09:51:09 -07:00
Vincent Demeester
63d65505b2 Update /node/* api reference documentation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-03 14:55:30 +02:00
Sebastiaan van Stijn
5c9bcaa942 Merge pull request #25358 from lixiaobing10051267/masterBe 
Remove reduntant word in device-mapper-driver.md
 2016-08-03 10:21:39 +02:00
lixiaobing10051267
96c959ec6b Remove reduntant word in device-mapper-driver.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-03 16:13:44 +08:00
Sebastiaan van Stijn
6e19e7b1d7 Merge pull request #25350 from thaJeztah/carry-24314-mongodb-example-update 
[Carry 24314] Make MongoDB sample Dockerfile working again
 2016-08-03 01:27:26 +02:00
Maxim Fedchyshyn
60f4c7dac3
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>
 2016-08-03 01:09:31 +02:00
Daniel X Moore
397cc85643
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>
 2016-08-03 00:46:04 +02:00
Sebastiaan van Stijn
10ae908bfa Merge pull request #25159 from diogomonica/adding-force-to-node-remove 
Adding force to node rm
 2016-08-02 22:49:15 +02:00
Sven Dowideit
181f5ac627 Merge pull request #25282 from clhlc/clhlc-patch-1 
Update swarm-mode.md
 2016-08-02 13:06:24 -07:00
Sven Dowideit
1d8617a42b Merge pull request #25241 from jhorwit2/jah/ps-doc-fix 
Added shutdown to desired-state docs for filter node/service ps
 2016-08-02 13:05:47 -07:00
Vincent Demeester
3d28cdd2f5 Merge pull request #25308 from thaJeztah/join-token-refactor 
Improve swarm join-token instructions
 2016-08-02 18:57:37 +02:00
Vincent Demeester
50c08f0f09 Merge pull request #25330 from yongtang/docs-service-create-update-user 
Update docs in `docker service create/update` for flag `--user`
 2016-08-02 17:58:39 +02:00
Sebastiaan van Stijn
b47df1ddbe Merge pull request #25105 from hqhq/fix_kmem_test 
Fix TestUpdateKernelMemoryUninitialized on new kernel version
 2016-08-02 17:15:53 +02:00
Sebastiaan van Stijn
ebebd41769
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>
 2016-08-02 16:44:02 +02:00
Yong Tang
80a3755a8f 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>
 2016-08-02 07:01:16 -07:00
Sebastiaan van Stijn
d7c9c85e30 Merge pull request #25318 from lixiaobing10051267/masterParentheses 
A parenthesis omitted in Seccomp.md
 2016-08-02 12:27:19 +02:00
Qiang Huang
59069ba29a 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>
 2016-08-02 13:36:58 +08:00
lixiaobing10051267
227cae6680 A parenthesis omitted in Seccomp.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-02 12:24:15 +08:00
Lee Chao
4f1a57a8e1 Update swarm-mode.md 
Signed-off-by: lichao <lichao@papayamobile.com>
 2016-08-02 11:36:32 +08:00
Diogo Monica
a327c231b5 Add --force to node removal 
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
 2016-08-01 18:55:58 -07:00
Tõnis Tiigi
ceb4126aa0 Merge pull request #25265 from adamwalz/docs_swarm_cluster_fault_tolerance 
Fix swarm manager node fault tolerance table
 2016-08-01 18:31:46 -07:00
Charles Smith
93fea86d1d Merge pull request #25205 from lixiaobing10051267/masterPath 
Give the correct link of docker swarm init
 2016-08-01 11:34:54 -07:00
Josh Horwitz
aae149bd52 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>
 2016-08-01 09:41:54 -04:00
allencloud
b22a291931 add status code 409 in attach in docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-01 01:21:50 +08:00
Vincent Demeester
849807d89a Merge pull request #25240 from allencloud/update-command-description-in-CLI 
update command description in CLI
 2016-07-31 12:56:23 +02:00
Vincent Demeester
c7fcf496af Merge pull request #25239 from dlech/patch-1 
Make it clear which parmeter is the user
 2016-07-31 08:54:53 +02:00
Adam Walz
18d0c3933b 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>
 2016-07-30 21:20:54 -06:00
allencloud
6c5988ed8c update command description in CLI 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-31 00:06:18 +08:00
lixiaobing10051267
e8279afb1a Give the correct link of docker swarm init 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-07-30 16:33:43 +08:00
David Lechner
e10ba68bfd Make it clear which parmeter is the user 
Using the environment variable here also has the advantage that it can be copied and pasted directly in a terminal and it will work.

Signed-off-by: David Lechner <david@lechnology.com>
 2016-07-29 19:08:20 -05:00
Charles Smith
ee355e017d Merge pull request #25182 from sfsmithcha/clarify_join_token 
Author Merge add advertise address, clarify join token

CI errors expected.
 2016-07-29 16:10:20 -07:00
Charles Smith
1e7219d40f add advertise address, clarify join token 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-29 15:45:34 -07:00
Charles Smith
8b69d50c79 Merge pull request #25197 from sfsmithcha/add_services_guide 
author merge: add services guide to manage a swarm
 2016-07-29 15:33:34 -07:00
Charles Smith
861d4dc989 add services guide to manage a swarm 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-29 15:01:52 -07:00
Sebastiaan van Stijn
498cd17427 Merge pull request #24535 from thaJeztah/minor-docs-fixup 
docs: cleanup docker update docs
 2016-07-29 02:53:01 +02:00