centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-28 06:49:00 +07:00
Code Issues Packages Projects Releases Wiki Activity
25,194 Commits 54 Branches 28 Tags
5199e3960ece00a13f888ceefb794aa59f2d15bc
Commit Graph

918 Commits

Author SHA1 Message Date
Aaron Lehmann
8a18eac752 Add documentation for external CA features in API/CLI 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit fa147591edfb5fe5d5fb8952cdb9bfec1b4ae6c4)
 2016-07-01 00:40:48 -07:00
allencloud
49981f8327 make cmd short short consistency and change docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 184afb92bf0bda1f47b5e1812ee1134328e272e2)
 2016-06-30 17:11:29 -07:00
Sebastiaan van Stijn
99cfbbc287 docs: add note that we no longer send container-id for exec 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 82876c0f5b41fe4e3ee33e0bc77f2560b1a6535f)
 2016-06-30 16:57:32 -07:00
Vincent Demeester
5c04eab617 Fixes /swarm/join endpoint documentation 
The JSON payload given in the API documentation is wrong, fixing it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 97c9491b0d395dc923e8b4e335839662c17aff46)
 2016-06-30 16:57:28 -07:00
Anton Tiurin
712cbdbe1f Remove extra comma in Image Pull API examples 
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
(cherry picked from commit 307c39c187f8785d8edae4bfd460e2dd0432626a)
 2016-06-30 16:57:08 -07:00
Harald Albers
4476697867 add documentation for desired_state filter 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 36f57f7d024e44b1db7f5cd0c24526f4cdfb7234)
 2016-06-30 16:47:53 -07:00
allencloud
a3b8c1a80e uppercase output in node inspect to keep consistency 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 89582e1a34a570c27232cd394d38f7fddf7e6520)
 2016-06-30 16:47:50 -07:00
Serhat Gülçiçek
f4de46d2ac 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>
(cherry picked from commit 7a30fa7af6f0bb3850ce6167850642420b4c0633)
 2016-06-30 16:47:46 -07:00
orkaa
d4cdc5172c For the lulz! (evalulate -> evaluate) 
Signed-off-by: orkaa <orkica@gmail.com>
(cherry picked from commit 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0)
 2016-06-30 16:47:45 -07:00
Shishir Mahajan
16274ba940 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>
(cherry picked from commit fe6416d04fb3ccd83fe4fb3a73f0364b88da730a)
 2016-06-30 16:47:41 -07:00
Sebastiaan van Stijn
1b053efb5a Sync API changes from 1.25 -> 1.24 
commit 79e1d3877a1b1697028399b8ce39c4ee27b60a96
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>
(cherry picked from commit 93095b1699eb11e1bd256dcf8f42f34f50ec2c78)
 2016-06-30 16:47:40 -07:00
Charles Smith
3f276b58a5 update docker swarm cli 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 78ebfaff1a426425573c440c24eb0f36ffed4d8c)
 2016-06-30 16:47:39 -07:00
Charles Chan
fe2a9bea38 Update help output to match Docker 1.11. 
* Also touch up headings.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
(cherry picked from commit 17ae6539f6bfc20792d0a25b3f98adfce96e7337)
 2016-06-18 20:58:25 -07:00
Sebastiaan van Stijn
d5c89ec65e Add initial "service" docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f565bc7ec964537a4e20bf5d4e497d15c0c9b5bf)
 2016-06-18 20:58:23 -07:00
Charles Smith
aa1f241894 update output for node commands, minor edits 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 3b2132c2c7f277750edfd9fc76d73dbb9142fde2)
 2016-06-16 23:36:59 -07:00
Tonis Tiigi
ab6abb799b Add cert-expiry to swarm update 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56)
 2016-06-16 23:36:58 -07:00
Sebastiaan van Stijn
fdb5324595 Update docker info output example 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42)
 2016-06-16 23:36:56 -07:00
Sebastiaan van Stijn
c73e56fd7f docs: move "advisory" to general metadata 
the advisory option should not be
below "menu"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit aadd88c306d43b401a18a29efafa714f64f87894)
 2016-06-16 23:36:55 -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