Sebastiaan van Stijn
9d2d89ce6f
Merge pull request #26704 from clbn/patch-1
...
Fix typos in installation doc for Mac
2016-09-19 18:25:35 +02:00
Sebastiaan van Stijn
bb6fe56e88
Merge pull request #26268 from AkihiroSuda/eventsjsonl
...
add `docker events --format`
2016-09-19 17:30:27 +02:00
Alex Olshansky
f7af5cc780
Fix typos in installation doc for Mac
...
Signed-off-by: Alex Olshansky <i@creagenics.com >
2016-09-19 16:04:46 +02:00
Sebastiaan van Stijn
533b00da8b
Fix Markdown formatting and missing prompt in service create
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-09-19 13:57:39 +02:00
Sebastiaan van Stijn
b81d12e7a1
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 >
2016-09-19 12:52:13 +02:00
Misty Stanley-Jones
5880d62953
Misty's edits and additions
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
2016-09-19 12:12:54 +02:00
Sebastiaan van Stijn
eb3a01eb43
Add --mount syntax documentation to CLI reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-09-19 11:56:59 +02:00
Sebastiaan van Stijn
1ccd79e1a9
Merge pull request #26682 from yuexiao-wang/fix-typo
...
Fix typo for docs reference
2016-09-19 11:14:46 +02:00
Sebastiaan van Stijn
abd02a9ba0
Merge pull request #26691 from YuPengZTE/devSUSE
...
Add prompt of $
2016-09-19 10:45:23 +02:00
YuPengZTE
638546d120
Add prompt of $
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
2016-09-19 10:46:25 +08:00
Brian Goff
fcf77620d6
Merge pull request #26675 from pestophagous/fix-typo-understanding-docker
...
Fix typo in docs. s/methodoligies/methodologies/
2016-09-18 09:09:40 -04:00
Sebastiaan van Stijn
1444401b16
Merge pull request #26678 from YuPengZTE/devSUDO
...
Add bash symbol for sudo
2016-09-18 13:36:13 +02:00
yuexiao-wang
0f0b0db842
fix typo for docs reference
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
2016-09-18 11:00:19 +08:00
YuPengZTE
ced2729841
The hit is missed
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
2016-09-18 09:38:20 +08:00
pestophagous
191adcfb63
Fix typo in docs. s/methodoligies/methodologies/
...
Signed-off-by: K Heller <pestophagous@gmail.com >
2016-09-17 15:37:03 -07:00
John Howard
4a0419f536
Merge pull request #25737 from Microsoft/jjh-statistics
...
Windows: Add support for docker stats
2016-09-17 09:31:24 -07:00
Sebastiaan van Stijn
788a8a3cac
Merge pull request #26634 from thaJeztah/fix-api-docs-for-services
...
Fix service and tasks API documentation
2016-09-17 16:13:15 +02:00
Sebastiaan van Stijn
1fb556bb7e
Merge pull request #26654 from thaJeztah/sync-api-docs
...
Synchronize API docs
2016-09-17 16:11:42 +02:00
Sebastiaan van Stijn
2f5b379192
Merge pull request #26653 from thaJeztah/move-mounts-to-correct-api-version
...
Move HostConfig.Mounts to correct API version
2016-09-17 13:53:37 +02:00
Sebastiaan van Stijn
d93a62e9be
Merge pull request #26266 from YuPengZTE/dev
...
The etc and dot is seprated
2016-09-17 03:37:00 +02:00
Sebastiaan van Stijn
1c117aa8cc
Merge pull request #26289 from aboch/doc
...
Fix mtu option in documentation
2016-09-17 03:32:23 +02:00
Sebastiaan van Stijn
0bd281c7cb
Merge pull request #26558 from lixiaobing10051267/masterSymbol2
...
add bash symbol for docker network inspect
2016-09-17 03:26:55 +02:00
Sebastiaan van Stijn
53b1dcb25c
Synchronize API docs
...
This synchronizes changes between API versions, and:
- applies e0a552504e to
older versions of the documentation
- applies a2a0a03e2b to
API version 1.25
- syncs some minor differences
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-09-17 03:02:12 +02:00
Sebastiaan van Stijn
cd73ceffd8
Move HostConfig.Mounts to correct API version
...
This was added in fc7b904dce ,
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 >
2016-09-17 02:36:07 +02:00
Sebastiaan van Stijn
d69409fd43
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 >
2016-09-17 02:29:38 +02:00
Josh Bodah
484fbe236d
Remove extra paren in run --link docs
...
Signed-off-by: Josh Bodah <jb3689@yahoo.com >
2016-09-16 15:32:12 -04:00
John Howard
340e5233b2
Windows: stats support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-09-16 11:56:15 -07:00
Vincent Demeester
8a7006ff8e
Merge pull request #26620 from runcom/fix-docs
...
docs: reference: api: clarify pull all tags
2016-09-16 20:56:04 +02:00
Michael Crosby
efe4e914ef
Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
...
Splunk Logging Driver performance improvements
2016-09-16 10:22:09 -07:00
Vincent Demeester
d05e34ca9b
Merge pull request #26637 from thaJeztah/fix-cli-prompt
...
Use "sudo" for dockerd examples
2016-09-16 17:44:07 +02:00
Sebastiaan van Stijn
87b174080b
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 >
2016-09-16 17:22:58 +02:00
Kenfe-Mickaël Laventure
07b5311147
Merge pull request #26618 from AkihiroSuda/fix-apparmor
...
apparmor: prohibit /sys/firmware/** from being accessed
2016-09-16 07:41:36 -07:00
Antonio Murdaca
03a8b6798d
docs: reference: api: clarify pull all tags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-09-16 16:35:15 +02:00
Sebastiaan van Stijn
7ca02f86de
Add link to logging drivers reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-09-16 15:29:28 +02:00
Akihiro Suda
693b4ac67a
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 >
2016-09-16 02:21:31 +00:00
Sebastiaan van Stijn
dddea689ab
Synchronize push reference with man page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-09-15 18:53:46 +02:00
Sebastiaan van Stijn
51a981fd5f
Merge pull request #26581 from yongtang/09142016-docs-getstarted-step-four
...
Fix a couple of issues in Get Started docs
2016-09-15 16:51:49 +02:00
Sebastiaan van Stijn
edbb8fb86d
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 >
2016-09-15 16:09:24 +02:00
Akihiro Suda
5af5a1be62
add docker events --format
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
2016-09-15 09:55:29 +00:00
Sven Dowideit
37869b237c
Merge pull request #25774 from ddgenome/cmd-entrypoint-table
...
Update ENTRYPOINT/CMD table to agree with docs
2016-09-15 09:35:13 +10:00
Anusha Ragunathan
e482d4ee71
Merge pull request #26575 from anusha-ragunathan/update_plugin_docs
...
Update plugin install docs with registry specifics.
2016-09-14 14:43:41 -07:00
Sebastiaan van Stijn
cfa868f098
Merge pull request #26582 from thaJeztah/add-full-image-link
...
Add direct link to event chart image
2016-09-14 23:24:34 +02:00
Sebastiaan van Stijn
86de72fef2
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 >
2016-09-14 23:16:32 +02:00
Yong Tang
1cd06fdd1a
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 >
2016-09-14 13:40:15 -07:00
Anusha Ragunathan
81d5abf334
Update plugin install docs with registry specifics.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
2016-09-14 10:21:31 -07:00
Sebastiaan van Stijn
9b8b6aa224
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 >
2016-09-14 18:10:25 +02:00
Sebastiaan van Stijn
9e9ba1e1c1
Merge pull request #26526 from lixiaobing10051267/masterSymble
...
fix some incorrect symbols before executing command
2016-09-14 17:48:43 +02:00
lixiaobing10051267
7b73b5fd6a
fix some incorrect symbols before executing command
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
2016-09-14 22:28:09 +08:00
Sebastiaan van Stijn
8ac2000f50
Merge pull request #25540 from estesp/ro-plus-userns
...
Remove --read-only restriction when user ns enabled
2016-09-14 13:53:58 +02:00
lixiaobing10051267
7c3a26db16
add bash symbol for docker network inspect
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
2016-09-14 17:36:48 +08:00