Commit Graph

5352 Commits

Author SHA1 Message Date
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
f3176ba51f Merge pull request #23489 from thaJeztah/fix-indentation
API docs cleanup
Upstream-commit: c913dd5f575c877b93a812c8f57dcc212d566b87
Component: engine
2016-06-14 21:49:48 +10:00
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
2f81321106 add tutorial
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: ea4fef2d875de39044ca7570c35365b75086e8a5
Component: engine
2016-06-13 22:17:15 -07:00
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
429bf7a983 Add swarm api reference docs
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: d4abe1d84a58461fea54d2046c24ae5d869fa41e
Component: engine
2016-06-13 22:16:18 -07:00
9ada0cfc5f Merge pull request #23213 from crosbymichael/restore-option
Add --live-restore flag
Upstream-commit: 3020081e94277410984c62d12f88de3d4f258681
Component: engine
2016-06-13 20:57:19 -07:00
7af900395b 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>
Upstream-commit: d705dab1b1bd0a946d647374325d61fac57736db
Component: engine
2016-06-13 19:16:26 -07:00
384a0525c9 Merge pull request #23447 from Microsoft/RemoveQosValidation
Removed QoS validation on Windows
Upstream-commit: bfed05be0b9bfc04bf922d79dd8dc420e1e579e2
Component: engine
2016-06-13 14:47:06 -07:00
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
7bec8a2e7d Merge pull request #22126 from dmcgowan/overlay-native-diff
Overlay multiple lower directory support
Upstream-commit: 8a2f9a249c28c0a80bac4b41eb318dfe68f63f0d
Component: engine
2016-06-13 13:15:39 -07:00
2fe8f9bbb3 Merge pull request #23195 from cyli/update-content-trust-docs
Update content trust docs to reflect latest notary compose file changes
Upstream-commit: 1842077541d1679c20932ed66c07081759c36c7f
Component: engine
2016-06-13 22:11:32 +02:00
b0a6df1b32 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>
Upstream-commit: ba115b0a91970f434e41e9f72caccc01493a9729
Component: engine
2016-06-13 12:57:06 -07:00
f7c1d79a55 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)
Upstream-commit: a546042b91f655c7cf53484cdb0c5c8b3cf12d33
Component: engine
2016-06-13 11:06:47 -07:00
a8d0a6bea4 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>
Upstream-commit: e6e8c4d700c4510e463eb16fedba51b6e8a3ccd6
Component: engine
2016-06-13 18:00:41 +00:00
8efd4f5028 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>
Upstream-commit: a4438ca606223f7c8ae5edb4101ff5eaae39fb05
Component: engine
2016-06-13 16:37:24 +02:00
6103097f27 Note about mountpoint being optional
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: edd80498d5b1b7686f2179dc5c6602093295a21e
Component: engine
2016-06-12 16:34:09 -04:00
517b0cb220 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>
Upstream-commit: 0c3a4a1fcdbb4b7e14292a871dec4bf6828ae57c
Component: engine
2016-06-11 14:31:53 -07:00
82e00cd535 typo in builder.md: its => it's
Signed-off-by: Kevin Burke <kev@inburke.com>
Upstream-commit: c9a68ffb2ae7b2ac13a2febab82b3d7a824eb97f
Component: engine
2016-06-11 12:33:58 -07:00
8cfafa6bc0 Removed QoS validation on Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: ea3a7899f50f623df58d0ef7e0c5318bddaf1877
Component: engine
2016-06-10 16:30:54 -07:00
610cddde7b Merge pull request #23419 from ahmetalpbalkan/docs/azure-vol-plugin
docs: Add Azure File Storage Volume Driver plugin
Upstream-commit: 949f8d0d11eb7dbc2fbdf91210c5564da19de8e7
Component: engine
2016-06-10 00:36:13 +02:00
988a32ccaf docs: Add Azure File Storage Volume Driver plugin
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: b91269c5edf0b62bcc91d18b23b58e66f7a4f52b
Component: engine
2016-06-09 15:28:38 -07:00
a68e300e2a Merge pull request #23359 from londoncalling/docker-engine-overview
re-doing Docker Engine overview topics for v.1.12
Upstream-commit: 1164f917faa46e0178dd5050a524a635ea849386
Component: engine
2016-06-10 00:02:56 +02:00
c88ebc1c56 Fixing man page link
Signed-off-by: Andrew Po <absourd.noise@gmail.com>
Upstream-commit: 55e99763160018c610718890468c0f7ef300b1d9
Component: engine
2016-06-09 16:39:50 +03:00
abee2dc945 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>
Upstream-commit: 8bd33b430b950ca5355f950d4b79a04ba0363c3c
Component: engine
2016-06-08 17:35:28 -07:00
c7bd96a413 Merge pull request #23354 from riyazdf/notary-delegation-env
Add link to notary environment vars from docker trust automation section
Upstream-commit: 5b1060c7758aa6bfd2210515a3e24fb287322ed9
Component: engine
2016-06-09 00:09:28 +02:00
9194f25b8a 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>
Upstream-commit: e3d31d794b64d93174e17dd98249033e623adbe6
Component: engine
2016-06-08 11:24:56 -07:00
41181cb2ee Merge pull request #23377 from vdemeester/carry-pr-23007
Carry #23007 :  Say something useful during docker load
Upstream-commit: 9db33b7646854ed994b74d0e71bced087e617291
Component: engine
2016-06-08 13:42:22 -04:00
5988d92124 Update docker-load documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9b5e0ea7dedac3c1cbbaf6770aa6834c8e7b7774
Component: engine
2016-06-08 17:40:37 +02:00
1f1966583b Merge pull request #23305 from thaJeztah/fix-network-examples
network docs cleanup
Upstream-commit: 430950e2d17c25b5df65d61a53f50528510509ac
Component: engine
2016-06-08 17:32:00 +02:00
ecda48bde7 Return remote API errors as JSON
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 322e2a7d059a81617b593cf6ece2cfd9f6d4ea03
Component: engine
2016-06-07 18:45:27 -07:00
3e62c84c55 Add link to notary environment vars from docker trust automation section
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 8d72ff3f5e5d3a3a0fb3645ef41ad72713c8298b
Component: engine
2016-06-07 14:03:56 -07:00
94abb34940 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>
Upstream-commit: 7c46ba02e694ae540866b29ebf0dab76e556cc13
Component: engine
2016-06-07 16:50:31 +02:00
4e024e3e7d Adding network filter to docker ps command
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Upstream-commit: 912af1ae8f22c4d9d7e478d0985a40b41ded2027
Component: engine
2016-06-07 16:43:11 +02:00
54aa4a7bec Merge pull request #22149 from vdemeester/deprecated-copy-endpoint
Deprecate /containers/(id or name)/copy endpoint
Upstream-commit: 148d2b8e4a7e4f669ba9e8db2adc2413fde27a07
Component: engine
2016-06-07 12:50:04 +02:00
45b2203529 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>
Upstream-commit: 2e506039ff9f6502670d42570f835c0d51fcda20
Component: engine
2016-06-06 19:06:50 -07:00
a49a6cbc00 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>
Upstream-commit: feabf71dc1cd5757093c5887b463a6cbcdd83cc2
Component: engine
2016-06-06 14:20:41 +02:00
977029fee5 Merge pull request #23293 from mountkin/network-docs
docs: correct network create command
Upstream-commit: ac14aa11b6f9172c744affa9823d05fde721c5e0
Component: engine
2016-06-06 12:07:23 +02:00
fd0727c3a3 Merge pull request #22077 from cpuguy83/remote_volplugin_caps
Add support for volume scopes
Upstream-commit: 28dde09cdf2a48dcdb6ce665cd2b912175dfb871
Component: engine
2016-06-06 10:15:43 +02:00
f0fedf722a docs: correct network create command
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 041aad6d7200a5b53204d95e9cc5505bf4d201cf
Component: engine
2016-06-06 13:50:29 +08:00
87e4691d16 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>
Upstream-commit: 5667365ed1cddb57267f7c11fc1f9d92209e5aed
Component: engine
2016-06-05 14:03:23 -07:00
da4d783e80 Add support for volume scopes
This is similar to network scopes where a volume can either be `local`
or `global`. A `global` volume is one that exists across the entire
cluster where as a `local` volume exists on a single engine.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2f40b1b281a3be8f34d82a5170988ee46ea1f442
Component: engine
2016-06-05 15:37:15 -04:00
6f99fdfc2a Merge pull request #23273 from vdemeester/deprecated-import-3-args
Deprecated the old 3-args form of `docker import`
Upstream-commit: 3cec9002714ee9227f75beeeccea7788a81d1fc1
Component: engine
2016-06-05 20:02:33 +02:00
696ad0d43f Deprecated the old 3-args form of docker import
It's been deprecated since November 2013 and v0.6.7. Removing the cli
side of it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 372063ce1bd0e36e3523360b88e74a1cef55b841
Component: engine
2016-06-05 18:07:34 +02:00
86b04a6a8a Merge pull request #22489 from Microsoft/jjh/shell
Builder shell configuration
Upstream-commit: df1dd1322d5c9527be7187038ca3480404b1282b
Component: engine
2016-06-05 17:43:12 +02:00
f88056a4aa Merge pull request #23232 from thaJeztah/update-default-retries
Healthcheck: set default retries to 3
Upstream-commit: 3db23a4eaf19d347c486f0f0ae764ea1b84491c0
Component: engine
2016-06-04 07:50:04 +02:00
97d902eb5e Merge pull request #23244 from LK4D4/no_interface
attach: replace interface with simple type
Upstream-commit: ad8d0c9a8bd93a23c745efe1aac0a0692aeefa91
Component: engine
2016-06-03 22:03:11 -04:00
0b0f7c4ee5 attach: replace interface with simple type
Also add docs to detach events

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3accde6dee079fbde42f1928002bce43cb15833d
Component: engine
2016-06-03 16:40:43 -07:00
f36b50a0ec docs validation fixes
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 0cddc783cff152a383a109f70a9f7bc943dbb5ba
Component: engine
2016-06-03 21:43:45 +00:00
d5ece41dcd Builder default shell
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b18ae8c9ccc2eb6cf8aa947f25eb6f1d20089776
Component: engine
2016-06-03 13:54:31 -07:00