Sebastiaan van Stijn
508c55b4c2
Merge pull request #24330 from avsm/endpoint-cli-typo
...
make `docker service --help` text for `--endpoint-mode` more consistent
Upstream-commit: f85a231c5fc4159a5639228f6e13090637dfb6aa
Component: engine
2016-07-07 00:24:03 -07:00
Yong Tang
3bc3d3b9a0
Change NAME to HOSTNAME in docs for docker node ls
...
In #24159 , the title field of `docker node ls` has been
changed from NAME to HOSTNAME. However, in the docs the
NAMEs are still used for the output of `docker node ls`.
This fix updates docs so that NAME field is changed to
HOSTNAME for all `docker node ls`.
This fix is related to #24159 and #24090 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 668b8a998f5ebbe66c7376c432a5fd87208add73
Component: engine
2016-07-06 20:23:53 -07:00
Anil Madhavapeddy
b214ee32d9
make docker service --help text for --endpoint-mode more consistent
...
Previously:
```
--constraint value Placement constraints (default [])
--endpoint-mode string Endpoint mode(Valid values: vip, dnsrr)
<snip>
--restart-condition string Restart when condition is met (none, on_failure, or any)
```
Now:
```
--constraint value Placement constraints (default [])
--endpoint-mode string Endpoint mode (vip or dnsrr)
<snip>
--restart-condition string Restart when condition is met (none, on_failure, or any)
```
Signed-off-by: Anil Madhavapeddy <anil@docker.com >
Upstream-commit: 2de9585f5ea798cbff23045d9d19ba239d5e5431
Component: engine
2016-07-06 12:10:28 +01:00
Vincent Demeester
730f2d8b64
Merge pull request #24287 from ottok/fix-spelling
...
Fix spelling in comments, strings and documentation
Upstream-commit: 1763474a84770e8af96a065551bc328124222f13
Component: engine
2016-07-03 22:34:00 +02:00
Otto Kekäläinen
0bdbf282f3
Fix spelling in comments, strings and documentation
...
Signed-off-by: Otto Kekäläinen <otto@seravo.fi >
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
2016-07-03 20:58:11 +03:00
Sebastiaan van Stijn
aa1ae84c39
Merge pull request #24264 from runcom/mandokerd8
...
man: add missing --add-runtime
Upstream-commit: afce0f594688b51038bff8d697e3c3eeca323e12
Component: engine
2016-07-03 10:13:28 -07:00
Adolfo Ochagavía
be820b6010
Fix typo
...
Signed-off-by: Adolfo Ochagavía <aochagavia92@gmail.com >
Upstream-commit: 76b09be69683d19c8a9c8cb6c8b693941f62b2ec
Component: engine
2016-07-03 15:20:27 +02:00
Antonio Murdaca
9ccd52b87e
man: add missing --add-runtime
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 585332dfe0b4b38f428deb680086b6d69275100d
Component: engine
2016-07-03 11:57:44 +02:00
Sebastiaan van Stijn
e73e440019
Merge pull request #24251 from thaJeztah/fix-readonly-flag
...
fix typo in "readonly" flag in documentation
Upstream-commit: 3b6bd66cc9f2dcc09f5d4c057770cc28e29dd614
Component: engine
2016-07-02 08:38:16 -07:00
Vincent Demeester
54e6f114f3
Merge pull request #24245 from cloojure/patch-4
...
Update network_create.md
Upstream-commit: 534753663161334baba06f13b8efa4cad22b5bc5
Component: engine
2016-07-02 11:32:40 +02:00
Sebastiaan van Stijn
7308735be9
fix typo in "readonly" flag in documentation
...
the flag is named '--read-only', not '--readonly'
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ac12696ff48aeb115e3d9ce3b13cfa54342b5aee
Component: engine
2016-07-01 17:08:59 -07:00
Aaron Lehmann
49ffacf76b
Fix --auto-accept documentation
...
The --auto-accept documentation currently says that both worker and
manager nodes are automatically accepted by default. Correct it.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 9aed7d1a3dd7677cbba6b92952a9d28801cf1ceb
Component: engine
2016-07-01 16:54:30 -07:00
Alan Thompson
c3e3e8c836
Update network_create.md
...
minor typos and punctuation.
Signed-off-by: Alan Thompson <cloojure@gmail.com >
Upstream-commit: 68b8cc9735e9f966dd0e7b3b2d56835310100c2a
Component: engine
2016-07-01 16:16:53 -07:00
Sebastiaan van Stijn
9da2bc7d4c
Merge pull request #24059 from sfsmithcha/fix_cli_ref_menu
...
add menu.md, make index.md command line reference, update typos/minor…
Upstream-commit: 691bbeaf4411c56b9f5f19efb54db01c533ab8fc
Component: engine
2016-07-01 10:00:54 -07:00
Vincent Demeester
db7f1cc524
Merge pull request #24128 from thaJeztah/rename-desired_state-filter
...
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
2016-07-01 18:34:02 +02:00
Vincent Demeester
3b1a7d7ee7
Merge pull request #24179 from nicolaka/master
...
[Docs] added nfs docs
Upstream-commit: 75923481d71e53637b6f889b0aab6e47342b7c86
Component: engine
2016-07-01 12:38:57 +02:00
Aaron Lehmann
b4d6f25674
Add documentation for external CA features in API/CLI
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: fa147591edfb5fe5d5fb8952cdb9bfec1b4ae6c4
Component: engine
2016-06-30 18:08:57 -07:00
Sebastiaan van Stijn
6b4b42d73a
rename desired_state filter to desired-state
...
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Component: engine
2016-06-30 14:49:46 -07:00
Charles Smith
14e8a9a9a9
add menu.md, make index.md command line reference, update typos/minor errors in cli docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: f98f596c19cb589569ec89bd12d562d8ddd03843
Component: engine
2016-06-30 14:30:11 -07:00
Nicola Kabar
624acb6899
[Docs] clarified local volume driver docs
...
Signed-off-by: Nico <nicolaka@gmail.com >
Upstream-commit: 841f9859944250585b2adf2c9bf2ad5332ccc0bd
Component: engine
2016-06-30 14:15:44 -07:00
allencloud
939b820305
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
2016-06-30 21:17:51 +08:00
Harald Albers
e14d2bc523
add documentation for desired_state filter
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 36f57f7d024e44b1db7f5cd0c24526f4cdfb7234
Component: engine
2016-06-29 08:27:25 -07:00
allencloud
aba19163d1
uppercase output in node inspect to keep consistency
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 89582e1a34a570c27232cd394d38f7fddf7e6520
Component: engine
2016-06-27 18:29:27 +08:00
orkaa
59b0cca4d4
For the lulz! (evalulate -> evaluate)
...
Signed-off-by: orkaa <orkica@gmail.com >
Upstream-commit: 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0
Component: engine
2016-06-23 16:26:43 +02:00
Sven Dowideit
91c796ca73
Merge pull request #23657 from neilpeterson/nepeters-docs-configfile
...
Added daemon.json Windows example
Upstream-commit: d82e82a827e3292b90156008edfb86912047dd1d
Component: engine
2016-06-21 21:07:19 +10:00
Shishir Mahajan
73a81242ef
PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: fe6416d04fb3ccd83fe4fb3a73f0364b88da730a
Component: engine
2016-06-20 22:27:02 -04:00
Vincent Demeester
b6c8db0026
Merge pull request #23696 from sfsmithcha/check_swarm_cli
...
update docker swarm cli
Upstream-commit: bfff4cce676f12fb092e82b61cc626dfa3944405
Component: engine
2016-06-20 15:40:06 +02:00
Sven Dowideit
aeecaae19f
Add the advisory=rc metadata
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: daedbc60d61387cb284b871145b672006da1b6de
Component: engine
2016-06-20 11:54:53 +00:00
Sebastiaan van Stijn
122239bbc3
remove "RC" warning from Markdown files
...
A site-wide banner is going to be used, so we don't need this warning
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 37ee14a99894c78396b51b62f5e979f1d000d321
Component: engine
2016-06-20 00:24:37 -07:00
Charles Chan
69d60f8bcb
Update help output to match Docker 1.11.
...
* Also touch up headings.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 17ae6539f6bfc20792d0a25b3f98adfce96e7337
Component: engine
2016-06-18 13:47:12 -07:00
Sebastiaan van Stijn
6200f441cd
Add initial "service" docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f565bc7ec964537a4e20bf5d4e497d15c0c9b5bf
Component: engine
2016-06-17 17:28:24 -07:00
Charles Smith
e82e1cb033
update docker swarm cli
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 78ebfaff1a426425573c440c24eb0f36ffed4d8c
Component: engine
2016-06-17 15:40:43 -07:00
Charles Smith
913871096c
update output for node commands, minor edits
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 3b2132c2c7f277750edfd9fc76d73dbb9142fde2
Component: engine
2016-06-16 21:44:07 -07:00
Neil Peterson
4977b39f5b
Added daemon.json Windows example
...
Signed-off-by: Neil Peterson <neilpeterson@outlook.com >
Upstream-commit: 8352089e8c78cdf71ac9eec0c125a35f9bf36ebc
Component: engine
2016-06-16 21:41:58 -07:00
Arnaud Porterie
bfa982122e
Merge pull request #23651 from tonistiigi/cert-expiry
...
Add cert-expiry to swarm update
Upstream-commit: f52c807650beb3bb0afe67bafd546792d7fa1422
Component: engine
2016-06-17 02:50:58 +00:00
Tonis Tiigi
1c57d98347
Add cert-expiry to swarm update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56
Component: engine
2016-06-16 18:06:02 -07:00
Sebastiaan van Stijn
d74065d7d9
Update docker info output example
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42
Component: engine
2016-06-16 16:29:23 -07:00
Sebastiaan van Stijn
bcf7be1ed0
docs: move "advisory" to general metadata
...
the advisory option should not be
below "menu"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: aadd88c306d43b401a18a29efafa714f64f87894
Component: engine
2016-06-16 11:52:34 -07:00
Arnaud Porterie
09430f24ff
Merge pull request #23553 from icecrime/heartbeat_as_duration
...
Make `--dispatcher-heartbeat-period` a duration
Upstream-commit: 2e9aac59e20ee376da32c5c85e1b392fc555f9c9
Component: engine
2016-06-15 02:36:17 +00:00
Arnaud Porterie (icecrime)
0b871ed824
Make --dispatcher-heartbeat-period a duration
...
Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: e6e1fd5d0657c3ab5b15c2984403e4a4e62ca2bb
Component: engine
2016-06-14 18:10:49 -07:00
Arnaud Porterie
a1a5b6649c
Merge pull request #23548 from vieux/no_more_reject
...
no more 'docker node reject' in docs
Upstream-commit: e087ba4633c948f00ca3d92c9906fc4cc5db06db
Component: engine
2016-06-15 00:43:58 +00:00
Brian Goff
3c08c9d8dd
Merge pull request #23446 from tiborvass/plugins-experimental
...
Plugins: experimental support for new plugin management
Upstream-commit: 6ed921dc38be582939966f71a01ec10f03ed531f
Component: engine
2016-06-14 20:32:14 -04:00
Sebastiaan van Stijn
ac4f3c4188
docker plugin commandline reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e79873c27c2b3f404db02682bb4f11b5a046602e
Component: engine
2016-06-14 15:50:00 -07:00
Michael Crosby
d3cd4d14aa
Merge pull request #23415 from aboch/ll
...
Allow user to specify container's link-local addresses
Upstream-commit: c97fdbe3c5954b2685a8b140f595f06b09191956
Component: engine
2016-06-14 15:47:54 -07:00
Victor Vieux
60c51154d7
no more 'docker node reject' in docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c21f8613275ca546b1310999d8714ff2609f33e3
Component: engine
2016-06-14 14:55:25 -07:00
Alessandro Boch
6c19b5ff61
Allow user to specify container's link-local addresses
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 1c4efb6aa05026efce99a7a5bb7e710c0f1b3002
Component: engine
2016-06-14 14:28:33 -07:00
Kenfe-Mickael Laventure
811cef6ca3
Add support for multiples runtimes
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7b2e5216b89b4c454d67473f1fa06c52a4624680
Component: engine
2016-06-14 07:47:31 -07:00
Sven Dowideit
b2d3f0c2e7
Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12
...
surfacing Learn by example topics to top level of Docker Engine docs
Upstream-commit: 2a96ac66ea41d206161a6ef022e10d53f99e86ec
Component: engine
2016-06-14 21:10:17 +10:00
Amit Shukla
69f307bc8b
CLI docs
...
Signed-off-by: Amit Shukla <amit.shukla@docker.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9acf97b72a4d5ff7b1bcad36fb19b53775f01596
Component: engine
2016-06-13 22:17:15 -07:00
Victoria Bialas
ce19593c15
surfacing Learn by example topics to top level of Docker Engine docs
...
fixing links after moving surfacing tutorials
fixing more links for the newly located tutorials
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 8eca8089fa35f652060e86906166dabc42e556f8
Component: engine
2016-06-13 13:32:30 -07:00