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
Kevin Burke
c9a68ffb2a
typo in builder.md: its => it's
...
Signed-off-by: Kevin Burke <kev@inburke.com>
2016-06-11 12:33:58 -07:00
Darren Stahl
ea3a7899f5
Removed QoS validation on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-10 16:30:54 -07:00
Sebastiaan van Stijn
1164f917fa
Merge pull request #23359 from londoncalling/docker-engine-overview
...
re-doing Docker Engine overview topics for v.1.12
2016-06-10 00:02:56 +02:00
Victoria Bialas
8bd33b430b
re-doing Docker Engine overview topics for v.1.12
...
fixed broken links created from Engine Overview update by adding missing topic to daemon reference page and updating the hrefs in the api pages
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-06-08 17:35:28 -07:00
Brian Goff
9db33b7646
Merge pull request #23377 from vdemeester/carry-pr-23007
...
Carry #23007 : Say something useful during docker load
2016-06-08 13:42:22 -04:00
Vincent Demeester
9b5e0ea7de
Update docker-load documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-08 17:40:37 +02:00
Vincent Demeester
430950e2d1
Merge pull request #23305 from thaJeztah/fix-network-examples
...
network docs cleanup
2016-06-08 17:32:00 +02:00
Ben Firshman
322e2a7d05
Return remote API errors as JSON
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-06-07 18:45:27 -07:00
Sebastiaan van Stijn
7c46ba02e6
add support for filtering by network ID
...
This adds support for filtering by network ID, to be
consistent with other filter options.
Note that only *full* matches are returned; this is
consistent with other filters (e.g. volume), that
also return full matches only.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-07 16:50:31 +02:00
Sainath Grandhi
912af1ae8f
Adding network filter to docker ps command
...
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
2016-06-07 16:43:11 +02:00
Vincent Demeester
148d2b8e4a
Merge pull request #22149 from vdemeester/deprecated-copy-endpoint
...
Deprecate /containers/(id or name)/copy endpoint
2016-06-07 12:50:04 +02:00
Yong Tang
2e506039ff
Fix a couple of typos in the docs of docker attach
...
This fix fixed a couple of typos in the docs of `docker attach`:
docs/reference/commandline/attach.md
man/docker-attach.1.md
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-06 19:06:50 -07:00
Sebastiaan van Stijn
feabf71dc1
network docs cleanup
...
This fixes some Markup and formatting
issues in the network documentation;
- wrap text to 80 chars
- add missing language hints for code examples
- add missing line continuations (\)
- update USAGE output for Cobra
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-06 14:20:41 +02:00
Sebastiaan van Stijn
ac14aa11b6
Merge pull request #23293 from mountkin/network-docs
...
docs: correct network create command
2016-06-06 12:07:23 +02:00
Shijiang Wei
041aad6d72
docs: correct network create command
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-06-06 13:50:29 +08:00
Yong Tang
5667365ed1
Fix a couple of typos in docker attach docs.
...
This fix fixes a couple of typos in docker attach docs:
docs/reference/commandline/attach.md
man/docker-attach.1.md
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-05 14:03:23 -07:00
Vincent Demeester
df1dd1322d
Merge pull request #22489 from Microsoft/jjh/shell
...
Builder shell configuration
2016-06-05 17:43:12 +02:00
Vincent Demeester
3db23a4eaf
Merge pull request #23232 from thaJeztah/update-default-retries
...
Healthcheck: set default retries to 3
2016-06-04 07:50:04 +02:00
Brian Goff
ad8d0c9a8b
Merge pull request #23244 from LK4D4/no_interface
...
attach: replace interface with simple type
2016-06-03 22:03:11 -04:00
Alexander Morozov
3accde6dee
attach: replace interface with simple type
...
Also add docs to detach events
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-06-03 16:40:43 -07:00
Sven Dowideit
0cddc783cf
docs validation fixes
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-03 21:43:45 +00:00
John Howard
b18ae8c9cc
Builder default shell
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-06-03 13:54:31 -07:00