Daniel Nephin
41d72e28c3
Change SCALE to REPLICAS.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 4df0349948
)
2016-06-16 23:36:52 -07:00
Victoria Bialas
38305cb676
fixing links and merge conflicts
...
updated link to faqs/troubleshoot to point to new location /toolbox
fixed docker-for-mac link error
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 1d80f8ca19
)
2016-06-16 23:36:52 -07:00
Shoubhik Bose
2b36087597
Fixes #23376 Broken URL for Centos yum repo for docker changed to now have a hardcoded centos version 7
...
Signed-off-by: Shoubhik Bose <sbose78@gmail.com>
(cherry picked from commit d3fad80cc7
)
2016-06-16 23:36:52 -07:00
Sven Dowideit
7af9b80f23
fix links for #23505
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit fa94eb4604
)
2016-06-16 23:36:52 -07:00
Victoria Bialas
92ff142da2
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
WIP: merging 3 getting started tutorials into one to cover all platforms, added new files
fixing broken images and links in 3-in-1 getting started, re-wrote story flow, linked to Toolbox, d4mac,d4win
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 0254c12e1e
)
2016-06-16 23:36: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
93daa10e3e
Merge pull request #23546 from sfsmithcha/formatting_updates_and_revisions
...
update formatting for variables, clarify text in certain topics
2016-06-14 17:04:59 -07: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
Charles Smith
7b0c3066e3
update formatting for variables, clarify text in certain topics
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-14 16:35:40 -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
Charles Smith
ea4fef2d87
add tutorial
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-13 22:17:15 -07: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
Michael Crosby
3020081e94
Merge pull request #23213 from crosbymichael/restore-option
...
Add --live-restore flag
2016-06-13 20:57:19 -07:00
Michael Crosby
d705dab1b1
Add --live-restore flag
...
This flags enables full support of daemonless containers in docker. It
ensures that docker does not stop containers on shutdown or restore and
properly reconnects to the container when restarted.
This is not the default because of backwards compat but should be the
desired outcome for people running containers in prod.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-13 19:16:26 -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
Sebastiaan van Stijn
1842077541
Merge pull request #23195 from cyli/update-content-trust-docs
...
Update content trust docs to reflect latest notary compose file changes
2016-06-13 22:11:32 +02:00
cyli
ba115b0a91
Update content trust docs to reflect latest notary compose file changes, and to simplify
...
the instructions by providing a single compose file that runs the notary server, registry,
and a docker-in-docker trust sandbox.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-06-13 12:57:06 -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
Brian Goff
edd80498d5
Note about mountpoint being optional
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-12 16:34:09 -04: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
949f8d0d11
Merge pull request #23419 from ahmetalpbalkan/docs/azure-vol-plugin
...
docs: Add Azure File Storage Volume Driver plugin
2016-06-10 00:36:13 +02:00
Ahmet Alp Balkan
b91269c5ed
docs: Add Azure File Storage Volume Driver plugin
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-06-09 15:28:38 -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
Andrew Po
55e9976316
Fixing man page link
...
Signed-off-by: Andrew Po <absourd.noise@gmail.com>
2016-06-09 16:39:50 +03: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
Sebastiaan van Stijn
5b1060c775
Merge pull request #23354 from riyazdf/notary-delegation-env
...
Add link to notary environment vars from docker trust automation section
2016-06-09 00:09:28 +02:00
Kirill Kolyshkin
e3d31d794b
docs/extend/plugins.md: add docker-volume-ploop
...
Added docker-volume-ploop driver to the list of available volume plugins.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
2016-06-08 11:24:56 -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
Riyaz Faizullabhoy
8d72ff3f5e
Add link to notary environment vars from docker trust automation section
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-06-07 14:03:56 -07:00