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
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
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
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
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
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
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
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
d648d9a308
docs: add note that we no longer send container-id for exec
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 82876c0f5b41fe4e3ee33e0bc77f2560b1a6535f
Component: engine
2016-06-29 13:30:09 -07:00
defc31809a
Merge pull request #24105 from vdemeester/24094-fix-swarm-join-doc
...
Fixes /swarm/join endpoint documentation
Upstream-commit: d68415a949f4ba62d0929ebc53825fbab6ff1e36
Component: engine
2016-06-29 10:48:41 -07:00
596823812f
Merge pull request #24126 from noxiouz/fix_doc_api
...
Remove extra comma in Image Pull API examples
Upstream-commit: e51fc722388431eeb2a94ab224d9d8636df85a97
Component: engine
2016-06-29 18:16:04 +02:00
d906df91ca
Remove extra comma in Image Pull API examples
...
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: 307c39c187f8785d8edae4bfd460e2dd0432626a
Component: engine
2016-06-29 19:04:42 +03:00
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
edd4ca39cd
Fixes /swarm/join endpoint documentation
...
The JSON payload given in the API documentation is wrong, fixing it.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 97c9491b0d395dc923e8b4e335839662c17aff46
Component: engine
2016-06-29 11:27:22 +02:00
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
826b691215
Merge pull request #23760 from SerhatG/docker_doc_cmd_shell_comment
...
Docker reference error CMD with ENV variables
Upstream-commit: 86d5c7e759e099b2662770be82cf9248ab0df5ba
Component: engine
2016-06-23 13:34:14 -07:00
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
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
d20da36e24
Merge pull request #23780 from shishir-a412ed/doc_update_PR19367
...
PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
Upstream-commit: 097d1a2b6186dcf1df8ae6135470871aca309a31
Component: engine
2016-06-21 12:09:47 +02:00
ae46554957
Merge pull request #23778 from thaJeztah/sync_api-1.24-1.25
...
Sync API changes from 1.25 -> 1.24
Upstream-commit: d25cc581f7783a1664394df2506e246c99920ce8
Component: engine
2016-06-21 00:41:17 -07:00
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
169d2f0c62
Sync API changes from 1.25 -> 1.24
...
commit 79e1d3877a1b1697028399b8ce39c4ee27b60a96
updated the v1.25 API with changes in SwarmKit,
but these changes should apply to v1.24.
This updates the 1.24 API with the same changes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 93095b1699eb11e1bd256dcf8f42f34f50ec2c78
Component: engine
2016-06-20 14:07:11 -07:00
acc2e881b3
Temporarily disable API v1.25 docs
...
The docs are currently published from "master" for the RC,
so hiding v1.25 API, which is for docker 1.13
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 59bdd4e56986c09a998f41bfec23a30df14444cc
Component: engine
2016-06-20 13:50:00 -07:00
67d1984a09
Merge pull request #23737 from cpuguy83/cleanup_some_service_api_docs
...
Fix a bunch of issues with service API docs
Upstream-commit: e070503511c5cebbb0ee0f1737dcf2f590ce6853
Component: engine
2016-06-20 07:03:37 -07:00
b9bedcbcb2
Fix a bunch of issues with service API docs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 79e1d3877a1b1697028399b8ce39c4ee27b60a96
Component: engine
2016-06-20 06:40:31 -07:00
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
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
bea7ea0ca9
Fix error for env variables example in docker reference - 2
...
The reason why the issue occurs is because sh parses the first argument after -c as the whole script to execute.
Everything after isn't executed as one might expect.
When working on the 'fix' I found out the same fix is also done in commit 2af7c5cfe24b4c8e931f751979b5e69e20ba77e2, except only for one occurrence.
Signed-off-by: Serhat Gülçiçek <serhat+signoff@equil.nl >
Upstream-commit: 7a30fa7af6f0bb3850ce6167850642420b4c0633
Component: engine
2016-06-20 13:09:44 +02:00
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
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
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
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
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
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
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
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
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
1e8aef0b45
Merge pull request #23633 from thaJeztah/fix-advisory-meta
...
docs: move "advisory" to general metadata
Upstream-commit: ef9c058b67b181fc5084ead0bafcca410863726c
Component: engine
2016-06-16 14:55:11 -07:00
c0b4786bbf
Fix API 1.25 order in menu
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6891fead3675a31a9a98a0f19a80c96ebc393afd
Component: engine
2016-06-16 12:07:29 -07:00
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
1de46d8dd4
Bump API Version to v1.25
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 04292192e023372453983cf6318f772922928c4e
Component: engine
2016-06-14 20:03:50 -07:00
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
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
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
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
b431a2061e
Merge pull request #23547 from icecrime/update_api_reference
...
Update API reference
Upstream-commit: 381a15279374b482a8257ee277488ae562cf61a1
Component: engine
2016-06-14 17:04:34 -07:00
954ba685a5
Update API reference
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 98880d8b3938a5cb1b5d7970cbb8efb849a9f97d
Component: engine
2016-06-14 16:41:10 -07:00
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
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
896826cadf
docs: move sysctls docs to current API version
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: de22669377d074a2594de33be01ae4d9723283a8
Component: engine
2016-06-14 15:14:16 -07:00
