allencloud
89582e1a34
uppercase output in node inspect to keep consistency
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-27 18:29:27 +08:00
Doug Davis
86d5c7e759
Merge pull request #23760 from SerhatG/docker_doc_cmd_shell_comment
...
Docker reference error CMD with ENV variables
2016-06-23 13:34:14 -07:00
orkaa
1bdbfa5770
For the lulz! (evalulate -> evaluate)
...
Signed-off-by: orkaa <orkica@gmail.com>
2016-06-23 16:26:43 +02:00
Sven Dowideit
d82e82a827
Merge pull request #23657 from neilpeterson/nepeters-docs-configfile
...
Added daemon.json Windows example
2016-06-21 21:07:19 +10:00
Vincent Demeester
097d1a2b61
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.
2016-06-21 12:09:47 +02:00
Sebastiaan van Stijn
d25cc581f7
Merge pull request #23778 from thaJeztah/sync_api-1.24-1.25
...
Sync API changes from 1.25 -> 1.24
2016-06-21 00:41:17 -07:00
Shishir Mahajan
fe6416d04f
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>
2016-06-20 22:27:02 -04:00
Sebastiaan van Stijn
93095b1699
Sync API changes from 1.25 -> 1.24
...
commit 79e1d3877a
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>
2016-06-20 14:07:11 -07:00
Sebastiaan van Stijn
59bdd4e569
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>
2016-06-20 13:50:00 -07:00
Sebastiaan van Stijn
e070503511
Merge pull request #23737 from cpuguy83/cleanup_some_service_api_docs
...
Fix a bunch of issues with service API docs
2016-06-20 07:03:37 -07:00
Brian Goff
79e1d3877a
Fix a bunch of issues with service API docs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-20 06:40:31 -07:00
Vincent Demeester
bfff4cce67
Merge pull request #23696 from sfsmithcha/check_swarm_cli
...
update docker swarm cli
2016-06-20 15:40:06 +02:00
Sven Dowideit
daedbc60d6
Add the advisory=rc metadata
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-20 11:54:53 +00:00
Serhat Gülçiçek
7a30fa7af6
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 2af7c5cfe2
, except only for one occurrence.
Signed-off-by: Serhat Gülçiçek <serhat+signoff@equil.nl>
2016-06-20 13:09:44 +02:00
Sebastiaan van Stijn
37ee14a998
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>
2016-06-20 00:24:37 -07:00
Charles Chan
17ae6539f6
Update help output to match Docker 1.11.
...
* Also touch up headings.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2016-06-18 13:47:12 -07:00
Sebastiaan van Stijn
f565bc7ec9
Add initial "service" docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-17 17:28:24 -07:00
Charles Smith
78ebfaff1a
update docker swarm cli
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-17 15:40:43 -07:00
Charles Smith
3b2132c2c7
update output for node commands, minor edits
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-16 21:44:07 -07:00
Neil Peterson
8352089e8c
Added daemon.json Windows example
...
Signed-off-by: Neil Peterson <neilpeterson@outlook.com>
2016-06-16 21:41:58 -07:00
Arnaud Porterie
f52c807650
Merge pull request #23651 from tonistiigi/cert-expiry
...
Add cert-expiry to swarm update
2016-06-17 02:50:58 +00:00
Tonis Tiigi
7d8d51aa9d
Add cert-expiry to swarm update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 18:06:02 -07:00
Sebastiaan van Stijn
07e1c62bf4
Update docker info output example
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-16 16:29:23 -07:00
Sebastiaan van Stijn
ef9c058b67
Merge pull request #23633 from thaJeztah/fix-advisory-meta
...
docs: move "advisory" to general metadata
2016-06-16 14:55:11 -07:00
Sebastiaan van Stijn
6891fead36
Fix API 1.25 order in menu
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-16 12:07:29 -07:00
Sebastiaan van Stijn
aadd88c306
docs: move "advisory" to general metadata
...
the advisory option should not be
below "menu"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-16 11:52:34 -07:00
Tibor Vass
04292192e0
Bump API Version to v1.25
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-14 20:03:50 -07:00
Arnaud Porterie
2e9aac59e2
Merge pull request #23553 from icecrime/heartbeat_as_duration
...
Make `--dispatcher-heartbeat-period` a duration
2016-06-15 02:36:17 +00:00
Arnaud Porterie (icecrime)
e6e1fd5d06
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>
2016-06-14 18:10:49 -07:00
Arnaud Porterie
e087ba4633
Merge pull request #23548 from vieux/no_more_reject
...
no more 'docker node reject' in docs
2016-06-15 00:43:58 +00:00
Brian Goff
6ed921dc38
Merge pull request #23446 from tiborvass/plugins-experimental
...
Plugins: experimental support for new plugin management
2016-06-14 20:32:14 -04:00
Tibor Vass
381a152793
Merge pull request #23547 from icecrime/update_api_reference
...
Update API reference
2016-06-14 17:04:34 -07:00
Arnaud Porterie (icecrime)
98880d8b39
Update API reference
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-14 16:41:10 -07:00
Sebastiaan van Stijn
e79873c27c
docker plugin commandline reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-14 15:50:00 -07:00
Michael Crosby
c97fdbe3c5
Merge pull request #23415 from aboch/ll
...
Allow user to specify container's link-local addresses
2016-06-14 15:47:54 -07:00
Alexander Morozov
de22669377
docs: move sysctls docs to current API version
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-06-14 15:14:16 -07:00
Victor Vieux
c21f861327
no more 'docker node reject' in docs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-14 14:55:25 -07:00
Alessandro Boch
1c4efb6aa0
Allow user to specify container's link-local addresses
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-14 14:28:33 -07:00
Kenfe-Mickael Laventure
7b2e5216b8
Add support for multiples runtimes
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-14 07:47:31 -07:00
Sven Dowideit
c913dd5f57
Merge pull request #23489 from thaJeztah/fix-indentation
...
API docs cleanup
2016-06-14 21:49:48 +10:00
Sven Dowideit
2a96ac66ea
Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12
...
surfacing Learn by example topics to top level of Docker Engine docs
2016-06-14 21:10:17 +10:00
Amit Shukla
9acf97b72a
CLI docs
...
Signed-off-by: Amit Shukla <amit.shukla@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-13 22:17:15 -07:00
Arnaud Porterie (icecrime)
d4abe1d84a
Add swarm api reference docs
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-13 22:16:18 -07:00
John Howard
bfed05be0b
Merge pull request #23447 from Microsoft/RemoveQosValidation
...
Removed QoS validation on Windows
2016-06-13 14:47:06 -07:00
Victoria Bialas
8eca8089fa
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>
2016-06-13 13:32:30 -07:00
Michael Crosby
8a2f9a249c
Merge pull request #22126 from dmcgowan/overlay-native-diff
...
Overlay multiple lower directory support
2016-06-13 13:15:39 -07:00
Derek McGowan
a546042b91
Add documentation for using overlay2
...
Add mention in dockerd command line and storage driver selection documentation.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-06-13 11:06:47 -07:00
Shoubhik Bose
e6e8c4d700
Added example for using image digest in the docker run command
...
Signed-off-by: Shoubhik Bose <sbose78@gmail.com>
Added explanation for the example with image's digest ( as per @thaJeztah 's comment
Signed-off-by: Shoubhik Bose <sbose78@gmail.com>
Wrapped to ~80 chars
Signed-off-by: Shoubhik Bose <sbose78@gmail.com>
2016-06-13 18:00:41 +00:00
Sebastiaan van Stijn
a4438ca606
API docs cleanup
...
fix some formatting issues and consistency;
- Change capitalization (Query Parameters -> Query parameters, Json -> JSON)
- Make Query/JSON parameters and Status codes headings bold
- Fix indentation of some code blocks
- Fix headings (H2 -> H1), although all headings should be shifted the other way
round ;-)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-13 16:37:24 +02:00
Charles Chan
0c3a4a1fcd
Add link to Docker Hub.
...
* To make it consistent with similar references in other parts of document.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2016-06-11 14:31:53 -07:00