Sebastiaan van Stijn
81964ca555
Merge pull request #14275 from ankushagarwal/runtime-metrics-docs-stats
...
Add Docker stats to runtime metrics article
2015-07-07 08:21:31 +02:00
Sebastiaan van Stijn
a25ee91f1c
Merge pull request #14095 from timwraight/master
...
Clarify .dockerignore example for Markdown files
2015-07-07 07:59:39 +02:00
moxiegirl
6ffce0131c
Merge pull request #14154 from chrismckinnel/master
...
Fix a broken link to .dockerignore
2015-07-06 15:48:25 -07:00
Ankush Agarwal
274c838ced
Add Docker stats to runtime metrics article
...
Fixes #13170
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-06 15:40:26 -07:00
Doug Davis
4bb3c253e8
Add some missing events to the API docs
...
Closes #14407
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-06 11:39:37 -07:00
Mary Anthony
2c5e044b59
Carries and closes 13361
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-04 18:12:52 -07:00
moxiegirl
7aa554c444
Merge pull request #14392 from moxiegirl/fix-fedora-table
...
Table formatting was broken
2015-07-04 16:30:17 -07:00
Sebastiaan van Stijn
57286aad25
Merge pull request #14235 from mlarcher/mlarcher-patch-2
...
Add workaround in docs for git bash usage issue
2015-07-04 21:00:53 +02:00
James Turnbull
f240bb5e94
Merge pull request #14309 from Tenk42/14287-wheezy-link-broken-on-debian-page
...
Fixing Wheezy link on debian installation page
2015-07-04 14:57:00 -04:00
Mary Anthony
762214ccc8
Table formatting was broken
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-04 07:32:58 -07:00
Sebastiaan van Stijn
a89f4e36ab
Merge pull request #14159 from tristan0x/patch-1
...
docker-hub Admin right gives access to build logs
2015-07-03 16:56:04 +02:00
Tristan Carel
515df52f19
Rewrite DockerHub group permissions documentation
...
On behalf of @moxiegirl
https://gist.github.com/moxiegirl/1c34957b9edc0f6d528c#file-gistfile1-md
Signed-off-by: Tristan Carel <tristan.carel@gmail.com >
2015-07-03 16:29:30 +02:00
mlarcher
33be2c5d2e
Add workaround in docs for git bash usage issue
...
When using boot2docker through git bash, there is a nasty issue when trying to share a folder, due to how git bash parses the URIs. The issue is explained in [issue #12751 ](https://github.com/docker/docker/issues/12751 ) but needs more visibility in the docs.
Signed-off-by: Matthieu Larcher <github@ringabell.org >
2015-07-03 09:07:44 +02:00
ayoshitake
0ed7fd46b6
Edit "Working with Containers" page for readability
...
Signed-off-by: ayoshitake <airandfingers@gmail.com >
2015-07-02 23:10:36 -07:00
Arnaud Porterie
f0ed68f852
Merge pull request #14292 from calavera/fix_driver_detection
...
Fix implicit DeviceMapper selection
2015-07-02 11:33:55 -07:00
David Calavera
0a376291b2
Fix implicit DeviceMapper selection
...
DeviceMapper must be explicitly selected because the Docker binary might not be linked to the right devmapper library.
With this change, Docker fails fast if the driver detection finds the devicemapper directory but the driver is not the default option.
The option `override_udev_sync_check` doesn't make sense anymore, since the user must be explicit to select devicemapper, so it's being removed.
Docker fails to use devicemapper only if Docker has been built statically unless the option was explicit.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-02 09:21:27 -07:00
Sebastiaan van Stijn
9300eb6684
Merge pull request #13825 from Mashimiao/unify-help-message
...
Unify docker commands' usage in man and help
2015-07-02 15:31:57 +02:00
Ma Shimiao
f38232b475
Unify docker commands' usage in man and help
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-07-02 10:33:26 +08:00
Ankush Agarwal
942a0f994f
Fix missing newline
...
Fixes #14340
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-01 18:16:22 -07:00
Sebastiaan van Stijn
98f988f62c
Merge pull request #13187 from shishir-a412ed/docker_inspect_issue
...
Flag Addition: --type flag added for docker inspect command
2015-07-02 01:31:15 +02:00
Sebastiaan van Stijn
f51d77f86e
Merge pull request #12548 from camallen/docker_host_docs
...
add note in docs about DOCKER_HOST env var overriding unix socket config
2015-07-02 01:27:47 +02:00
Shishir Mahajan
2cb74e6915
Flag Addition: --type flag added for docker inspect command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2015-07-01 12:14:01 -04:00
Quentin Tayssier
82b444e3fa
Fixing Wheezy link
...
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com >
2015-07-01 13:01:00 +09:00
Sebastiaan van Stijn
a453da2114
Merge pull request #13962 from unclejack/shrink_docs_images
...
docs: shrink some big images
2015-06-30 21:55:44 +02:00
Ankush Agarwal
e7e48bcfdd
Typo in memory-swap flag
...
Fixes #14253
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-06-29 13:12:08 -07:00
Fred Lifton
0aea0e4072
Merge pull request #14261 from jeremyprice/basics-doc-typo-fix
...
fix(docs): removed extra quote character in heading
2015-06-29 11:05:54 -07:00
Jeremy Price
d612782023
fix(docs): removed extra quote character in heading
...
Signed-off-by: Jeremy Price <jprice.rhit@gmail.com >
2015-06-29 09:46:50 -05:00
Mary Anthony
078b23a37d
Closes #13323 and carries
...
Entering comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-29 06:18:41 -07:00
moxiegirl
31ae9d876a
Merge pull request #14126 from laijs/fix-file-permission
...
docs: fix file's permissions
2015-06-26 10:08:06 -07:00
Alexander Morozov
b96f109344
Merge pull request #12876 from tagomoris/logger-driver-fluentd
...
Add new Logging driver "fluentd"
2015-06-26 08:41:10 -07:00
Mary Anthony
d5de3ed09e
Adding installation index
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-26 02:12:27 -07:00
Chris McKinnel
3c5b17cf7e
Fix a broken anchor tag on the CLI builder page
...
Signed-off-by: Chris McKinnel <chrismckinnel@gmail.com >
2015-06-26 09:43:30 +01:00
TAGOMORI Satoshi
78f4a9dad4
Update English expressions by review comments
...
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com >
2015-06-26 11:04:26 +09:00
TAGOMORI Satoshi
361a582ba0
Add new logging driver: fluentd
...
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com >
2015-06-26 11:03:11 +09:00
John Howard
857e0ba32e
Fix docs for #14047
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-25 13:39:12 -07:00
moxiegirl
de9c5473f7
Merge pull request #14178 from csarrazi/patch-1
...
[Easy-Pick] [Documentation] Fix broken links for Fedora
2015-06-25 13:15:26 -07:00
moxiegirl
8c8e8d624f
Merge pull request #14156 from HuKeping/master
...
Docs: fix wrong example of API Exec
2015-06-25 13:09:36 -07:00
Mary Anthony
561bfb268d
Splitting out the cli command into parts.
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-25 12:02:41 -07:00
Phil Estes
e8b87cfce1
Merge pull request #13907 from chenchun/exitcode
...
Set exit code of old running container as 137
2015-06-25 10:57:48 -07:00
Chun Chen
b0b2f979c7
Set exit code of old running container as 137
...
Signed-off-by: Chun Chen <chenchun.feed@gmail.com >
2015-06-25 22:30:09 +08:00
Mary Anthony
31dd97f4ad
Breaking logging driver material out of run
...
- creating index which is overview of configuring logs
- linking to individual journald/fluent material
- leaving behind table and link to index in run
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-25 05:00:49 -07:00
Charles Sarrazin
62213219dc
Fix broken fedora documentation
...
The documentation is currently broken for the fedora page. This PR fixes missing the markup.
Signed-off-by: Charles Sarrazin <charles@sarraz.in >
2015-06-25 10:16:46 +02:00
moxiegirl
4ab8b88286
Merge pull request #13973 from calavera/fix_zfs_options_doc_location
...
Move zfs options doc to the storage section.
2015-06-24 15:52:13 -07:00
Hu Keping
221fa4c3d1
Docs: fix wrong example of API Exec
...
The last "," should not shown up, otherwise you will get the error
back as below:
- invalid character '}' looking for beginning of object key string.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-06-25 02:03:27 +08:00
Sebastiaan van Stijn
afd4d544cf
Merge pull request #14119 from moxiegirl/fix-heading-blanks
...
Fix heading blanks
2015-06-24 08:35:42 -07:00
Alexander Morozov
4dd1d1bfa5
Merge pull request #13810 from d23/syslog-facility
...
Add syslog-facility option
2015-06-23 12:05:15 -07:00
Lai Jiangshan
f23698bb14
docs: fix file's permissions
...
The README.md and the *.png should not have the executable
permissions, remove them.
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com >
2015-06-24 00:09:27 +08:00
Mary Anthony
960cbd2c8d
Fixes #14117
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-23 05:17:20 -07:00
Mary Anthony
e81861ea54
Closes #14055 for anchal
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-23 05:14:53 -07:00
Dennis Docter
609e7b0a55
Add --log-opt to specify facility for syslog driver
...
Signed-off-by: Dennis Docter <dennis@d23.nl >
2015-06-23 14:04:25 +02:00