Fix menu position of the labels-custom-metadata.md topic
(cherry picked from commit a3286783bcfbfd6e58d16e1b189138580b08facc)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Revert "Add direct link to event chart image"
(cherry picked from commit 6f07a4a69b17d6a1bf902a5ec30ad046645e9c23)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 0a76a4cb5bdb83c1c62832d084ae47a0c50646bc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The "user" feature was added in docker 1.7.0, and
"privileged" feature was added in docker 1.9.0
only contained CLI docs.
This adds the missing API docs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c53efdf4c1f0b2e7f1fe04294d9d64401b8b09b8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Hans Kristian Flaatten <hans.flaatten@evry.com>
(cherry picked from commit 838fe65e5332dd79f5cf8551d70906d9801f79fb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Jeff Silberman <jsilberm@gmail.com>
(cherry picked from commit da2159ea1c366ac64b0f498a8aca0ee595dae558)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
A few points of work:
- Took the topic out of the left-hand nav and made it
reachable from the User guide intro
- Condensed the topic's contents, presenting only conceptual
info and pointing instead to the command-line references
for each type of object
- Added brief information about the `LABELS` keyword to the
Dockerfile reference
A big part of the point is to establish a pattern of
thinking and use around how Docker uses labels and what they
mean in different contexts.
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 5c4c062ffcdb8d7b8c104fd667571279c51d2ffd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This renames `MaximumIOps` to `IOMaximumBandwidth`,
and `MaximumIOBps` to `IOMaximumIOps` to match
the actual code.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 36a25bdbe4d973aef308fa11b450264dae1bc0b4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 708892c4037e9eef6f6c25b5a3551f7779fb8868)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The regex used to describe the max-file and max-size logging options for
the json-file logger were incorrect. The regexes would only match a
single character (a digit or a literal +). Instead the regexes should
match 1 or more digits.
The character class for the units of the max-size also included a pipe
which meant that the regex would match 1| instead of only matching 1m,
1k, and 1g.
Signed-off-by: Steven Erenst <stevenerenst@gmail.com>
(cherry picked from commit e9a9015e38fc0996a3dae61393885414b092103f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
These installation procedures are very similar, so
synchronized these docs and removed some differences.
Also;
- updated markdown, added language-hints where possible
- replaced "service docker start" with "systemctl start"
- replaced "chkconfig docker on" with "systemctl enable"
- added "systemctl enable" to the list of steps for
installation, because most people want to have docker
started automatically (and overlooked this step).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b2bb4e11aa656947e45b752aa4f5d5b5cdc693cd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Alex Olshansky <i@creagenics.com>
(cherry picked from commit f7af5cc780cb49b6115c726687dec5ef361ca5fb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 533b00da8bed8336debf99a03f2fd2a0692fac6e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Although the example is just for illustrational
purposes, many users are now switching to
Ubuntu 16.04 as the "default" version for Ubuntu,
so updating the example for those that use
this example as a starting point.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b81d12e7a10abfb55f164105365ff175a95ae9e9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit eb3a01eb432473beae968a0c9f3817af8b7a7d53)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: K Heller <pestophagous@gmail.com>
(cherry picked from commit 191adcfb637ea1b52d2da9a75e4e1e4938d9550c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This synchronizes changes between API versions, and:
- applies e0a552504e64192946c86d3bdd517ae7b3af348f to
older versions of the documentation
- applies a2a0a03e2b801545b2e3fb9e8476c76370da9175 to
API version 1.25
- syncs some minor differences
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 53b1dcb25ca937c61bd47a29ba7be6e68abc25a5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The documentation contained some outdated information
on these endpoints.
This change fixes those parts of the documentation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d69409fd43e73829209315de79abf79000c4c720)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 87b174080bd8b1b9ea2bbfad8ef35a4c0dfe8ad4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7ca02f86de2ceef980cad98faefc15cbc628c91a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 03a8b6798d030a952e85f15208aeea1215e3f801)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dddea689ab45ce146e6ac3a1199235e1f36ffe29)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
John Mulhausen
Misty Stanley-Jones
Misty Stanley-Jones
Sebastiaan van Stijn
Victoria Bialas
Sebastiaan van Stijn
allencloud
yuexiao-wang
lixiaobing10051267
Hans Kristian Flaatten
Jeff Silberman
Steven Erenst
Alex Olshansky
YuPengZTE
pestophagous
Alessandro Boch
Josh Bodah
Antonio Murdaca