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
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
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
60c51154d7
no more 'docker node reject' in docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c21f8613275ca546b1310999d8714ff2609f33e3
Component: engine
2016-06-14 14:55:25 -07:00
6c19b5ff61
Allow user to specify container's link-local addresses
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 1c4efb6aa05026efce99a7a5bb7e710c0f1b3002
Component: engine
2016-06-14 14:28:33 -07:00
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
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
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
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
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
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
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
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
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
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
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
