Sebastiaan van Stijn
14f9dd10a3
Merge pull request #26268 from AkihiroSuda/eventsjsonl
...
add `docker events --format`
Upstream-commit: bb6fe56e8847112e55429309bf3ac004753ae3a8
Component: engine
2016-09-19 17:30:27 +02:00
Alex Olshansky
388c6920f1
Fix typos in installation doc for Mac
...
Signed-off-by: Alex Olshansky <i@creagenics.com >
Upstream-commit: f7af5cc780cb49b6115c726687dec5ef361ca5fb
Component: engine
2016-09-19 16:04:46 +02:00
Sebastiaan van Stijn
4d3a9b605f
Fix Markdown formatting and missing prompt in service create
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 533b00da8bed8336debf99a03f2fd2a0692fac6e
Component: engine
2016-09-19 13:57:39 +02:00
Sebastiaan van Stijn
91a19ec9c5
Update sshd example to use ubuntu 16.04
...
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 >
Upstream-commit: b81d12e7a10abfb55f164105365ff175a95ae9e9
Component: engine
2016-09-19 12:52:13 +02:00
Misty Stanley-Jones
dd0606cd40
Misty's edits and additions
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
Upstream-commit: 5880d629533d9b8ad9889500fe841cb2e31a71c8
Component: engine
2016-09-19 12:12:54 +02:00
Sebastiaan van Stijn
e605090acb
Add --mount syntax documentation to CLI reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: eb3a01eb432473beae968a0c9f3817af8b7a7d53
Component: engine
2016-09-19 11:56:59 +02:00
Sebastiaan van Stijn
306c301f92
Merge pull request #26682 from yuexiao-wang/fix-typo
...
Fix typo for docs reference
Upstream-commit: 1ccd79e1a920f9120090f0355cd7b557f8d57631
Component: engine
2016-09-19 11:14:46 +02:00
Sebastiaan van Stijn
744afc226e
Merge pull request #26691 from YuPengZTE/devSUSE
...
Add prompt of $
Upstream-commit: abd02a9ba0aea79e0b77b8dfb65c8d77614f3ecf
Component: engine
2016-09-19 10:45:23 +02:00
YuPengZTE
1ea61b91e9
Add prompt of $
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 638546d1206dd229c5e00df0725de6966725b2e0
Component: engine
2016-09-19 10:46:25 +08:00
Brian Goff
41b6bee4d9
Merge pull request #26675 from pestophagous/fix-typo-understanding-docker
...
Fix typo in docs. s/methodoligies/methodologies/
Upstream-commit: fcf77620d632457910507db47f8b7380c7276962
Component: engine
2016-09-18 09:09:40 -04:00
Sebastiaan van Stijn
8c00a65ba2
Merge pull request #26678 from YuPengZTE/devSUDO
...
Add bash symbol for sudo
Upstream-commit: 1444401b164006cb13c23208dc8aeebcf980f629
Component: engine
2016-09-18 13:36:13 +02:00
yuexiao-wang
c4eabb777e
fix typo for docs reference
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 0f0b0db842e53c81191385395d6d040574eeb0d9
Component: engine
2016-09-18 11:00:19 +08:00
YuPengZTE
215a6916ca
The hit is missed
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: ced272984157e277523a942505435aa392913ac4
Component: engine
2016-09-18 09:38:20 +08:00
pestophagous
bc5d705612
Fix typo in docs. s/methodoligies/methodologies/
...
Signed-off-by: K Heller <pestophagous@gmail.com >
Upstream-commit: 191adcfb637ea1b52d2da9a75e4e1e4938d9550c
Component: engine
2016-09-17 15:37:03 -07:00
John Howard
5049c43226
Merge pull request #25737 from Microsoft/jjh-statistics
...
Windows: Add support for docker stats
Upstream-commit: 4a0419f536ce3a7b1eade67440cfc84d6e486caf
Component: engine
2016-09-17 09:31:24 -07:00
Sebastiaan van Stijn
029442b3b0
Merge pull request #26634 from thaJeztah/fix-api-docs-for-services
...
Fix service and tasks API documentation
Upstream-commit: 788a8a3cac67b72d3c52bd3bc8b09fcc0ee438a8
Component: engine
2016-09-17 16:13:15 +02:00
Sebastiaan van Stijn
613c0e8111
Merge pull request #26654 from thaJeztah/sync-api-docs
...
Synchronize API docs
Upstream-commit: 1fb556bb7ebed206ebacf13148f912f7347d5489
Component: engine
2016-09-17 16:11:42 +02:00
Sebastiaan van Stijn
665d5fc5bb
Merge pull request #26653 from thaJeztah/move-mounts-to-correct-api-version
...
Move HostConfig.Mounts to correct API version
Upstream-commit: 2f5b37919286f272b591ab428fee13cb6b5d0014
Component: engine
2016-09-17 13:53:37 +02:00
Sebastiaan van Stijn
32dd641688
Merge pull request #26266 from YuPengZTE/dev
...
The etc and dot is seprated
Upstream-commit: d93a62e9bef374ff501f155583e707c1ae77926b
Component: engine
2016-09-17 03:37:00 +02:00
Sebastiaan van Stijn
6c1fbaf344
Merge pull request #26289 from aboch/doc
...
Fix mtu option in documentation
Upstream-commit: 1c117aa8cccd895645e6fb5245bfb4cd11b93ba8
Component: engine
2016-09-17 03:32:23 +02:00
Sebastiaan van Stijn
8cdc29bdf2
Merge pull request #26558 from lixiaobing10051267/masterSymbol2
...
add bash symbol for docker network inspect
Upstream-commit: 0bd281c7cb610baa2b906d7eb42062eeb209b1a9
Component: engine
2016-09-17 03:26:55 +02:00
Sebastiaan van Stijn
0a2b85a132
Synchronize API docs
...
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 >
Upstream-commit: 53b1dcb25ca937c61bd47a29ba7be6e68abc25a5
Component: engine
2016-09-17 03:02:12 +02:00
Sebastiaan van Stijn
7bce42c737
Move HostConfig.Mounts to correct API version
...
This was added in fc7b904dced4d18d49c8a6c47ae3f415d16d0c43,
but some parts of the documentation ended up in the
wrong API version, and was overlooked during
review :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cd73ceffd84d6d3af695a70485ca0d7899d0475a
Component: engine
2016-09-17 02:36:07 +02:00
Sebastiaan van Stijn
a3575ae5f7
Fix service and tasks API documentation
...
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 >
Upstream-commit: d69409fd43e73829209315de79abf79000c4c720
Component: engine
2016-09-17 02:29:38 +02:00
Josh Bodah
3e89d9cc8d
Remove extra paren in run --link docs
...
Signed-off-by: Josh Bodah <jb3689@yahoo.com >
Upstream-commit: 484fbe236dcab9fb5b8d48844a8cdc9d614e32e9
Component: engine
2016-09-16 15:32:12 -04:00
John Howard
7342ae40e2
Windows: stats support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
2016-09-16 11:56:15 -07:00
Vincent Demeester
4f3981c6de
Merge pull request #26620 from runcom/fix-docs
...
docs: reference: api: clarify pull all tags
Upstream-commit: 8a7006ff8e74477c4ad85bde2e2094f7b40244da
Component: engine
2016-09-16 20:56:04 +02:00
Michael Crosby
fc3c6766ab
Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
...
Splunk Logging Driver performance improvements
Upstream-commit: efe4e914efe5f42a5b5e424ed519fda71343f7de
Component: engine
2016-09-16 10:22:09 -07:00
Vincent Demeester
3a3e6ec157
Merge pull request #26637 from thaJeztah/fix-cli-prompt
...
Use "sudo" for dockerd examples
Upstream-commit: d05e34ca9bcfdcf954ea5793721c20133eed9277
Component: engine
2016-09-16 17:44:07 +02:00
Sebastiaan van Stijn
15e6354e7d
Use "sudo" for dockerd examples
...
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 >
Upstream-commit: 87b174080bd8b1b9ea2bbfad8ef35a4c0dfe8ad4
Component: engine
2016-09-16 17:22:58 +02:00
Kenfe-Mickaël Laventure
a7caeb2743
Merge pull request #26618 from AkihiroSuda/fix-apparmor
...
apparmor: prohibit /sys/firmware/** from being accessed
Upstream-commit: 07b5311147c319a003324e8f26ceb829ed5cc240
Component: engine
2016-09-16 07:41:36 -07:00
Antonio Murdaca
db61cfcc59
docs: reference: api: clarify pull all tags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 03a8b6798d030a952e85f15208aeea1215e3f801
Component: engine
2016-09-16 16:35:15 +02:00
Sebastiaan van Stijn
6f7161dac7
Add link to logging drivers reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7ca02f86de2ceef980cad98faefc15cbc628c91a
Component: engine
2016-09-16 15:29:28 +02:00
Akihiro Suda
23bac4b64f
apparmor: prohibit /sys/firmware/** from being accessed
...
Some firmware information including SMBIOS and ACPI tables were unexpectedly exposed
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 693b4ac67ad0638be9defbae771f62d860380f31
Component: engine
2016-09-16 02:21:31 +00:00
Sebastiaan van Stijn
00c4e8a77c
Synchronize push reference with man page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dddea689ab45ce146e6ac3a1199235e1f36ffe29
Component: engine
2016-09-15 18:53:46 +02:00
Sebastiaan van Stijn
c86634e4ea
Merge pull request #26581 from yongtang/09142016-docs-getstarted-step-four
...
Fix a couple of issues in Get Started docs
Upstream-commit: 51a981fd5fa01d827854ff5afbb78029e4e94e7b
Component: engine
2016-09-15 16:51:49 +02:00
Sebastiaan van Stijn
78d01f16b4
Restore missing "format" example
...
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: edbb8fb86d7d0b715adc15415f0cb187433092a5
Component: engine
2016-09-15 16:09:24 +02:00
Akihiro Suda
e6635a948e
add docker events --format
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 5af5a1be6209bde3f05b5f9ed4e0db0037dfe0ff
Component: engine
2016-09-15 09:55:29 +00:00
Sven Dowideit
2a2af20475
Merge pull request #25774 from ddgenome/cmd-entrypoint-table
...
Update ENTRYPOINT/CMD table to agree with docs
Upstream-commit: 37869b237ccd6c8f48132d9372111acdf9533d1b
Component: engine
2016-09-15 09:35:13 +10:00
Anusha Ragunathan
470e277786
Merge pull request #26575 from anusha-ragunathan/update_plugin_docs
...
Update plugin install docs with registry specifics.
Upstream-commit: e482d4ee71b00bb3ea1a71381cef9771b14eff6c
Component: engine
2016-09-14 14:43:41 -07:00
Sebastiaan van Stijn
33227c1a20
Merge pull request #26582 from thaJeztah/add-full-image-link
...
Add direct link to event chart image
Upstream-commit: cfa868f098ae7725373bd28f5e5c7ea166a8cbf5
Component: engine
2016-09-14 23:24:34 +02:00
Sebastiaan van Stijn
69bead6193
Add direct link to event chart image
...
This adds a direct link to the event chart image
so that the full-resolution image can be "zoomed"
in to.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 86de72fef244b3fe209e5793deb40fb26f5b318e
Component: engine
2016-09-14 23:16:32 +02:00
Yong Tang
273536b8fb
Fix a couple of issues in Get Started docs
...
This fix fixes a couple of issues in Get Started docs' Step Four:
1. `Sending build context to Docker daemon 158.8 MB` should be
`Sending build context to Docker daemon 2.048 kB` as there is only
one Dockerfile for context.
2. There are only 3 steps altogether in stead of 4 steps as
`RUN apt-get -y update && apt-get install -y fortunes` is one step.
So `Step 3 : RUN apt-get install -y fortunes` should be removed and
`Step 4 : CMD /usr/games/fortune -a | cowsay` should be changed to
`Step 3 : CMD /usr/games/fortune -a | cowsay`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 1cd06fdd1ac5ce1f91291330d9f89679468ce393
Component: engine
2016-09-14 13:40:15 -07:00
Anusha Ragunathan
5ed47d0d43
Update plugin install docs with registry specifics.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 81d5abf33460264ad627e506a2563ec335faa131
Component: engine
2016-09-14 10:21:31 -07:00
Sebastiaan van Stijn
454d1d388e
Remove Frugalware installation docs
...
These docs were outdated, and not actively
maintained. Also, there are no official packages
available for this distribution, so better to
remove it from the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9b8b6aa224d0e88bdd27e322ae1c922e3dfcbe12
Component: engine
2016-09-14 18:10:25 +02:00
Sebastiaan van Stijn
b3b358d207
Merge pull request #26526 from lixiaobing10051267/masterSymble
...
fix some incorrect symbols before executing command
Upstream-commit: 9e9ba1e1c1235c3bdb7a70a0a9d0c5932d5afe9e
Component: engine
2016-09-14 17:48:43 +02:00
lixiaobing10051267
849847f7b2
fix some incorrect symbols before executing command
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 7b73b5fd6acf7a8fc3e9cee3437221794879b7c6
Component: engine
2016-09-14 22:28:09 +08:00
Sebastiaan van Stijn
422892f89b
Merge pull request #25540 from estesp/ro-plus-userns
...
Remove --read-only restriction when user ns enabled
Upstream-commit: 8ac2000f5065b887753ffe32d2b793bb4bbd84c5
Component: engine
2016-09-14 13:53:58 +02:00
lixiaobing10051267
c6ac7292a4
add bash symbol for docker network inspect
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 7c3a26db166bf4d618ae414470f6bed7160f1371
Component: engine
2016-09-14 17:36:48 +08:00
Victoria Bialas
04ccb628a7
fixed on-page links
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: c073404af855b172febf7fbd8cf0cd17968a0b59
Component: engine
2016-09-13 16:20:05 -07:00