fb50eb6afa
Merge pull request #14315 from Pensu/14176-fix-run-table-rendering
...
Fixing the table rendering in reference/run.md
Upstream-commit: 9c96304a86b14cb80af46c45c516c38ed4df8ba2
Component: engine
2015-07-07 18:09:53 -07:00
9b1a73e4d4
Merge pull request #14430 from zmarouf/master
...
fix(docs): Small typoes in the Supported installation page
Upstream-commit: 81c30c3303288d53abdf47daa1ef5dada89d48b5
Component: engine
2015-07-07 18:00:19 -07:00
c17c7fce57
Revert "Fix implicit DeviceMapper selection"
...
This reverts commit 0a376291b2213699f986a7bca1cc8c4f4ed00f8d.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9af7afb9eb138bdba33c22445f36f41e5aa26bd1
Component: engine
2015-07-07 12:27:19 -07:00
d1a21ef136
Update windows.md
...
With apologies (it wasn't clear from the contributing guidelines how this project feels about PRs for one or two word doc fixes).
Signed-off-by: Erik M. Bray <erik.m.bray@gmail.com >
Upstream-commit: 12c85f3671e2bc981eb246e73daa7ecf37fb274f
Component: engine
2015-07-07 13:51:17 -04:00
63dcc74119
Merge pull request #14307 from kolyshkin/readme-fixes
...
README.md: fix cgroups/namespaces name and link
Upstream-commit: 833cdd28ed668291bca8eb5ee5ba73a77523eafb
Component: engine
2015-07-07 06:09:20 -07:00
7fddfdcd08
fix(docs): Small typoes in the Supported installation page
...
-> https://docs.docker.com/installation/
Signed-off-by: Zeid Marouf <zeid.marouf@gmail.com >
Upstream-commit: 3bee3a2927da2187a0897ad20c3984afd67d6bba
Component: engine
2015-07-07 11:09:12 +02:00
f43c5d8e7a
Merge pull request #14406 from duglin/tweakCmdlineHelp
...
Fix example in cmdline help text to have correct output
Upstream-commit: 270d7e1af8075f8c05f820d4a9a40f0aebd3ca28
Component: engine
2015-07-07 09:26:13 +02:00
48ac43bc1b
Merge pull request #13987 from larsks/bug/7583
...
Update docker commit man page re: volumes
Upstream-commit: 244141a8aa4b80c6e508eb408a536a56b783845b
Component: engine
2015-07-07 09:16:54 +02:00
48bdf6fd55
Merge pull request #14275 from ankushagarwal/runtime-metrics-docs-stats
...
Add Docker stats to runtime metrics article
Upstream-commit: 81964ca555aa595600b0d706ad68783e12919627
Component: engine
2015-07-07 08:21:31 +02:00
02dcc46d4e
Merge pull request #14095 from timwraight/master
...
Clarify .dockerignore example for Markdown files
Upstream-commit: a25ee91f1c163ef77539eafd0509ccfcf619106d
Component: engine
2015-07-07 07:59:39 +02:00
a32ec20c5e
daemon.md: fix placement of exec driver heading
...
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
Upstream-commit: 68efb27e990a52478d9927911757a07910244dc5
Component: engine
2015-07-06 22:51:31 -07:00
4813a5b1aa
Fix example in cmdline help text to have correct output
...
Showing "$$ exit 13" caught my eye and wasn't correct.
While in there I also made it so the following paragraph didn't go past 80 chars
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: aea0fd0115ab99a9797cc2ba4d9ef530f76c3ecc
Component: engine
2015-07-06 17:51:09 -07:00
d3498560e9
Merge pull request #14154 from chrismckinnel/master
...
Fix a broken link to .dockerignore
Upstream-commit: 6ffce0131c6be276d5919dff0500db7a67065b4d
Component: engine
2015-07-06 15:48:25 -07:00
8d8ca6624e
Add Docker stats to runtime metrics article
...
Fixes #13170
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 274c838ced96e1b7f9b6c5854856004d0b130627
Component: engine
2015-07-06 15:40:26 -07:00
c016079ee2
Add some missing events to the API docs
...
Closes #14407
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 4bb3c253e83454e00381723f17ca69dd4e9b3d7a
Component: engine
2015-07-06 11:39:37 -07:00
d49aa7e5dc
Update docker commit man page re: volumes
...
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.
Addresses comments in #7583
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com >
Upstream-commit: a9747895375a27e0f4d46d9cf8f501815e5b2642
Component: engine
2015-07-06 10:16:21 -04:00
461cafcee4
Carries and closes 13361
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 2c5e044b59c5f37381a22d9a3e8414314802c225
Component: engine
2015-07-04 18:12:52 -07:00
ef90db9fac
Merge pull request #14392 from moxiegirl/fix-fedora-table
...
Table formatting was broken
Upstream-commit: 7aa554c4447adc4186bc554d75f7e5ae48e45fb5
Component: engine
2015-07-04 16:30:17 -07:00
326b0850c7
Merge pull request #14235 from mlarcher/mlarcher-patch-2
...
Add workaround in docs for git bash usage issue
Upstream-commit: 57286aad252a4f22e499c85dd1c27e034f7d87e2
Component: engine
2015-07-04 21:00:53 +02:00
a4234c8502
Merge pull request #14309 from Tenk42/14287-wheezy-link-broken-on-debian-page
...
Fixing Wheezy link on debian installation page
Upstream-commit: f240bb5e941f664b23e7c625378bf72bc882ea71
Component: engine
2015-07-04 14:57:00 -04:00
e0231e4d94
Table formatting was broken
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 762214ccc860cbe41cb84a4078adfbe4cd92e149
Component: engine
2015-07-04 07:32:58 -07:00
057d94db14
Merge pull request #14159 from tristan0x/patch-1
...
docker-hub Admin right gives access to build logs
Upstream-commit: a89f4e36ab7e8b927c92fa5a170213e7135ae75e
Component: engine
2015-07-03 16:56:04 +02:00
907298f6f9
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 >
Upstream-commit: 515df52f19314f48d4a2cb4aa7f672d1e4eb7703
Component: engine
2015-07-03 16:29:30 +02:00
45f765fb3b
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 >
Upstream-commit: 33be2c5d2ed15a2f9bb272ac9492ad36113ddb32
Component: engine
2015-07-03 09:07:44 +02:00
26b82c6f4b
Edit "Working with Containers" page for readability
...
Signed-off-by: ayoshitake <airandfingers@gmail.com >
Upstream-commit: 0ed7fd46b6a02203bb6ddaf5cb004641e127da49
Component: engine
2015-07-02 23:10:36 -07:00
bc7c7e9f54
Merge pull request #14292 from calavera/fix_driver_detection
...
Fix implicit DeviceMapper selection
Upstream-commit: f0ed68f852e33ed21420959790be4741725b03b1
Component: engine
2015-07-02 11:33:55 -07:00
740b021c6a
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 >
Upstream-commit: 0a376291b2213699f986a7bca1cc8c4f4ed00f8d
Component: engine
2015-07-02 09:21:27 -07:00
807f056fef
Merge pull request #13825 from Mashimiao/unify-help-message
...
Unify docker commands' usage in man and help
Upstream-commit: 9300eb668459f1e21298db1de829265d6a4c9dd6
Component: engine
2015-07-02 15:31:57 +02:00
23dd86bcae
Unify docker commands' usage in man and help
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: f38232b475d126d6ea3a37d82be2c7269324e4ab
Component: engine
2015-07-02 10:33:26 +08:00
ee7a0ea07c
Fix missing newline
...
Fixes #14340
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 942a0f994f1c6da840086cbcd2933e23521a2953
Component: engine
2015-07-01 18:16:22 -07:00
8211ecfd09
Merge pull request #13187 from shishir-a412ed/docker_inspect_issue
...
Flag Addition: --type flag added for docker inspect command
Upstream-commit: 98f988f62ceccf7237cbcb45f1095ff15f005ea9
Component: engine
2015-07-02 01:31:15 +02:00
a41be0879e
Merge pull request #12548 from camallen/docker_host_docs
...
add note in docs about DOCKER_HOST env var overriding unix socket config
Upstream-commit: f51d77f86e533f6fb4892f6aa0ae7646a7dfbdad
Component: engine
2015-07-02 01:27:47 +02:00
8aaef3e5b3
Flag Addition: --type flag added for docker inspect command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 2cb74e691538351efbdee7a78be6535f22c5d024
Component: engine
2015-07-01 12:14:01 -04:00
fda86a6f5b
Fixing the table rendering in reference/run.md
...
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com >
Upstream-commit: 636ec6383be4cb7c776940565a06d5500e0608bd
Component: engine
2015-07-01 16:07:39 +05:30
9b385c8c95
Fixing Wheezy link
...
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com >
Upstream-commit: 82b444e3fa18af2a392f0896a12ef929b08320b0
Component: engine
2015-07-01 13:01:00 +09:00
5b89db2050
Merge pull request #13962 from unclejack/shrink_docs_images
...
docs: shrink some big images
Upstream-commit: a453da21147cefefae52e95a54e427cb4b211e81
Component: engine
2015-06-30 21:55:44 +02:00
14f61357df
Typo in memory-swap flag
...
Fixes #14253
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: e7e48bcfddf8f2a28fcb79f0282afd1fc86133fb
Component: engine
2015-06-29 13:12:08 -07:00
0bc889c212
Merge pull request #14261 from jeremyprice/basics-doc-typo-fix
...
fix(docs): removed extra quote character in heading
Upstream-commit: 0aea0e4072c403d7377ff63313196fb8fdabf9a1
Component: engine
2015-06-29 11:05:54 -07:00
184681a206
fix(docs): removed extra quote character in heading
...
Signed-off-by: Jeremy Price <jprice.rhit@gmail.com >
Upstream-commit: d612782023f550d6990e9fc76c2a9de97ab97a43
Component: engine
2015-06-29 09:46:50 -05:00
4f74d3f3bd
Closes #13323 and carries
...
Entering comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 078b23a37daf95101bf31bafc7f8396af7ad7d98
Component: engine
2015-06-29 06:18:41 -07:00
229f4e374b
Merge pull request #14126 from laijs/fix-file-permission
...
docs: fix file's permissions
Upstream-commit: 31ae9d876ad577775e8492065a02a364d745ccde
Component: engine
2015-06-26 10:08:06 -07:00
009aa5c322
Merge pull request #12876 from tagomoris/logger-driver-fluentd
...
Add new Logging driver "fluentd"
Upstream-commit: b96f1093441a20678c9ff0e57528bbb780b34d10
Component: engine
2015-06-26 08:41:10 -07:00
4fb55aac44
Adding installation index
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: d5de3ed09ec0fc218cb26bb5556b77043887902d
Component: engine
2015-06-26 02:12:27 -07:00
9c2998785f
Fix a broken anchor tag on the CLI builder page
...
Signed-off-by: Chris McKinnel <chrismckinnel@gmail.com >
Upstream-commit: 3c5b17cf7ee2a5830396a033091b8c551da37d3c
Component: engine
2015-06-26 09:43:30 +01:00
6aea64cdef
Update English expressions by review comments
...
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com >
Upstream-commit: 78f4a9dad4fb92fb2175ff5afe5fb2d7938e9668
Component: engine
2015-06-26 11:04:26 +09:00
22652d4dad
Add new logging driver: fluentd
...
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com >
Upstream-commit: 361a582ba0bccea04a8ea1799e68779fa66abb9f
Component: engine
2015-06-26 11:03:11 +09:00
a3f7d22b3d
Fix docs for #14047
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 857e0ba32e38f02b96e7c6753d902aca7a7922fc
Component: engine
2015-06-25 13:39:12 -07:00
3fae971f18
Merge pull request #14178 from csarrazi/patch-1
...
[Easy-Pick] [Documentation] Fix broken links for Fedora
Upstream-commit: de9c5473f769c6b18c1417525de3873304de2f80
Component: engine
2015-06-25 13:15:26 -07:00
7241037f74
Merge pull request #14156 from HuKeping/master
...
Docs: fix wrong example of API Exec
Upstream-commit: 8c8e8d624f546e52d37ce09f5e16361bc38df073
Component: engine
2015-06-25 13:09:36 -07:00
c4d8b40978
Splitting out the cli command into parts.
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 561bfb268de3c674b04d48895b7e46ae890ef795
Component: engine
2015-06-25 12:02:41 -07:00
