a4f1a75c45
doc cli lint.
...
- 79 char line length (non-command).
- Consistent single space between sentences.
- Replace start of line tabs with spaces.
- Remove trailing white space.
- Consistent "**Note:**" style.
https://docs.docker.com/project/doc-style/#notes
- Replace the ``` sections with indented code.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com >
Upstream-commit: b4a52fc4e9b8ed745eb012ba45628cdb3654ed70
Component: engine
2015-05-27 15:07:57 -07:00
1adf295b9a
Modify volume mounts SELinux labels on the fly based on :Z or :z
...
This patch is extending the qualifiers on the -v command to allow
an admin to tell the system to relabel, content. There might be a
need for something similar for changing the DAC Permissions.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 160dc79db095767de74deb75b8e1ae86f213593c
Component: engine
2015-05-27 12:50:16 -07:00
af47afb0d1
Merge pull request #13406 from moxiegirl/experimental-work
...
Placeholder Part II: For commenting about install
Upstream-commit: e580734149c646adf1c939cc292bebc4950afde4
Component: engine
2015-05-26 18:19:26 -07:00
0c3a03c749
Fixes title, line wrap, and Adds install area
...
Tibor's comment
Updating with the new plugins
Entering comments from Seb
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 1ba1a0550ff3fa98397cd93195cc33b8c2f6473a
Component: engine
2015-05-26 15:37:38 -07:00
d89704cf56
Revert "Add docker exec run a command in privileged mode"
...
This reverts commit 72a500e9e5929b038816d8bd18d462a19e571c99.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Conflicts:
daemon/execdriver/native/exec.go
integration-cli/docker_cli_exec_test.go
runconfig/exec.go
Upstream-commit: 40b71adee390e9c06471b89ed845132b4ec80177
Component: engine
2015-05-26 14:12:16 -07:00
6497871310
Merge pull request #13467 from epc/epc-2015145
...
Documentation Copy edits for typos
Upstream-commit: 628c3965554484c4585b9ff67c9e64f541414057
Component: engine
2015-05-25 14:32:17 -04:00
08e38fdc3f
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
Upstream-commit: 7d75c5be95cb51a0d61862988bf263d3f8525d3e
Component: engine
2015-05-25 13:39:56 -04:00
69ad999592
Merge pull request #13447 from justone/mention-dockviz-alternative
...
mention dockviz alternative
Upstream-commit: 8efd87f5a2606f309c1eecb12efd05579f9b9429
Component: engine
2015-05-25 19:26:19 +02:00
9ac01175a5
Merge pull request #13418 from donkirkby/patch-1
...
small formatting and grammar fixes
Upstream-commit: 187362414d32f19dbe472a8eaf595f97f00a47ed
Component: engine
2015-05-25 19:15:47 +02:00
23b19da74f
mention dockviz alternative
...
closes #13431
Signed-off-by: Nate Jones <nate@endot.org >
Upstream-commit: 453c0abf1c08e71c14ae6809a6e4b0d08a31e245
Component: engine
2015-05-25 09:43:25 -07:00
c5e7666b15
Merge pull request #13461 from moxiegirl/add-glossary-back
...
Adding back in Glossary
Upstream-commit: c12081987adda9c143c265737b7180c9c7744864
Component: engine
2015-05-25 18:32:15 +02:00
691314940f
Merge pull request #13458 from janjaapdriessen/patch-1
...
Fix markdown syntax for "docker run" instruction example
Upstream-commit: 5f57143b3149520842c02bbdbfe03dfc61b0e6f2
Component: engine
2015-05-25 18:07:19 +02:00
aecc4da2e0
small formatting and grammar fixes
...
Having the line break in the middle of a code span caused the line break to appear on the web site version, even though it doesn't appear in the preview.
The other two changes are just small grammar improvements.
Signed-off-by: don <donkirkby@gmail.com >
Upstream-commit: 5051aee555428f5501de2b8fa24000de093220f5
Component: engine
2015-05-25 09:05:42 -07:00
e901db1c34
Markdown changes (thanks to runcom for the rebase+squash handholding)
...
Signed-off-by: Jan-Jaap Driessen <janjaapdriessen@gmail.com >
Upstream-commit: 02405a96b2ace7bf34fa9e0628892e4a707bed4d
Component: engine
2015-05-25 17:24:41 +02:00
e783ada3bb
Adding back in Glossary
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 08da08f3f993bbe379e5b71e78108702aca3daa8
Component: engine
2015-05-25 07:39:27 -07:00
4b9ff49cd8
doc: cli images examples rm "| head".
...
It's a given that lines of example output might be truncated or come
from a contrived environment.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com >
Upstream-commit: ca23ac37efe4b8785751f95d5c09c94811a43ed3
Component: engine
2015-05-24 14:04:13 -07:00
0d8ca6abd9
Merge pull request #13161 from calavera/plugin_discovery
...
Proposal: Volume refactor and external volume plugins
Upstream-commit: bce3e761c0a78ca55cefa9c6d040c1bc9138c1fb
Component: engine
2015-05-23 18:44:18 -07:00
95ae7ce2aa
Finally, finally, close #12164
...
Updating with typo Seb found
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 6de4138465f089687b2c860f986616f6cb9f059b
Component: engine
2015-05-23 14:27:50 -07:00
cfff66c7bb
Document in the experimental section
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
(cherry picked from commit a31633c2707c78c2ffd684a5a3e576f310af0fb5)
Upstream-commit: 8d0486832dafb775e93dafd1229fcf7e81ee4a28
Component: engine
2015-05-22 17:00:04 -07:00
f23ada12c4
Move Documentation changes out or this PR.
...
The will come in a follow up PR inside the experimental section.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ab8a5bcf04243577516207257c7fe5ec8257a9f4
Component: engine
2015-05-22 16:58:48 -07:00
3f5d7444b3
Merge pull request #13303 from moxiegirl/experimental-work
...
Experimental features placeholder
Upstream-commit: 8e76c0d1d8b77b86d1131ca82a7034b985a26526
Component: engine
2015-05-22 08:42:57 -07:00
801e8947c6
Mark volume drivers and plugins as experimental in the documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a867c1b70a0ee3db2793ab1a8f56d24beaa41388
Component: engine
2015-05-21 20:34:17 -07:00
e89556546b
Mark --volume-driver as experimental
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 4fc37a1ede58153bfa6aa5c9aa0f2903f18d572f
Component: engine
2015-05-21 20:34:17 -07:00
89782c55eb
Volumes refactor and external plugin implementation.
...
Signed by all authors:
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Jeff Lindsay <progrium@gmail.com >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Signed-off-by: Luke Marsden <luke@clusterhq.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
2015-05-21 20:34:17 -07:00
d5d48e47c8
Publish release notes for latest cs Docker engine
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 740b1b5a2d89ef8d2c4c606636e5b42234298734
Component: engine
2015-05-22 09:14:06 +10:00
d60fe719f4
Merge pull request #13336 from calavera/document_missing_build_flags
...
Document missing build flags.
Upstream-commit: b639f00280d974f4c8c3e1ced18afd5173a1f4e3
Component: engine
2015-05-22 01:03:37 +02:00
50f6b1411a
Document missing build flags.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a85b09d8a40456fb5f3b72b7b1999cd9df08c082
Component: engine
2015-05-21 15:02:00 -07:00
19664cd1d4
Experimental features placeholder
...
Signed-off-by: Mary Anthony <mary@docker.com >
Adding experimental features into the mix
Signed-off-by: Mary Anthony <mary@docker.com >
renaming file
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 7231692a02ee6346b051a00fde153675e0a9a771
Component: engine
2015-05-20 18:10:07 -07:00
7e35f8d0a4
Merge pull request #13366 from moxiegirl/162-release-notes
...
Updating with 1.6.2-cs5 notes
Upstream-commit: 2bf409d4eff3836dd4cc82bc8cb656af2a2dd63d
Component: engine
2015-05-20 15:03:27 -07:00
4a24c72f56
Updating with 1.6.2-cs5 notes
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 7554949da654fb55dd1bccc3308ef12c013a16d5
Component: engine
2015-05-20 14:39:00 -07:00
0a8a3b1dc5
Merge pull request #13338 from icecrime/13023_experimental_env_var
...
Add DOCKER_EXPERIMENTAL environment variable
Upstream-commit: 19790c46dc7fbd489bbd4ccd6f138663312e7579
Component: engine
2015-05-20 13:04:28 -07:00
045dd55a7d
Add DOCKER_EXPERIMENTAL environment variable
...
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: ca6722f1c5e4e2017a71e33579d91ac0d9ea2a25
Component: engine
2015-05-20 12:21:17 -07:00
baf6ea6d24
Merge pull request #13324 from duglin/BadRCOnVersion
...
Make version check return 400 instead of 404
Upstream-commit: 53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Component: engine
2015-05-20 11:13:56 -07:00
6f9f58e9c5
Merge pull request #13214 from zoechi/master
...
add bwu_docker
Upstream-commit: a09dfbcaad82c8e483189e5966fdff6146105965
Component: engine
2015-05-20 13:43:16 +10:00
3e16398646
Merge pull request #13315 from SvenDowideit/add-kitematic-docs
...
Add Kitematic documentation to docs.master.docker.com
Upstream-commit: a057accb594f3cce0cd6e158050b328ab698cc17
Component: engine
2015-05-20 12:27:33 +10:00
f475565e21
Add Kitematic documentation to docs.master.docker.com
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 82bd3886d54da4fcbcd29cde957568a75ecd186e
Component: engine
2015-05-20 01:57:45 +00:00
bca5faa4ca
Make version check return 400 instead of 404
...
Closes : #13321
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 7fcf849749322b3e02ae0305f40e505e83b54e9a
Component: engine
2015-05-19 11:21:05 -07:00
881a75dcdf
Merge pull request #13238 from hqhq/hq_fix_usingdocker_md
...
Remove wrong usage in usingdocker.md
Upstream-commit: 6f4b808f415bd762a1090215cc73f66f49e52845
Component: engine
2015-05-19 09:24:31 -07:00
82047fce6d
Remove wrong usage in usingdocker.md
...
Fixes: https://github.com/docker/docker/issues/13235
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f46cf7329507351e107e3a84132f14ed02dc163b
Component: engine
2015-05-19 13:07:41 +08:00
a7fe46a565
Merge pull request #13189 from alvinr/mongodb-fixup
...
Fixup MongoDB changes to line up with MongoDB 3.0 release
Upstream-commit: 6a18412d5b9c9fae7d7f3ab13eab44e0e4906124
Component: engine
2015-05-18 15:22:41 -07:00
e1c50ccb66
Bring MongoDB examples up to date with 3.0 release
...
Signed-off-by: Alvin Richards <alvin.richards@docker.com >
Upstream-commit: 3f37afe0b98919b91bffb0f90abe2d25a5ead989
Component: engine
2015-05-18 13:08:31 -07:00
30a0089656
Merge pull request #13206 from draghuram/info_api_doc
...
Bring /info API doc in line with the actual response.
Upstream-commit: 93825056d8de651e5cbfff9122144e892e988144
Component: engine
2015-05-18 20:20:57 +02:00
ed62b6ffc8
Merge pull request #12804 from ankushagarwal/configuring-docker
...
Add CentOS/RHEL configuration to the config article
Upstream-commit: 8f8ee7d5c3277a3d16556ddcbae40e12f36a154a
Component: engine
2015-05-18 14:18:32 -04:00
61e72a4efb
Bring /info API doc in line with the actual response.
...
The fix handles versions 1.18 and 1.19.
Closes #13139 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 9c0608565c93a31d6885842376e82a19db5a7af4
Component: engine
2015-05-18 13:55:42 -04:00
82bce49b9c
Merge pull request #13086 from shishir-a412ed/docker_root_execdriver
...
root dir for execdriver (/var/run/docker) should be configurable
Upstream-commit: b785e5091ff35b3fe74ad1d16f77fe611049ae44
Component: engine
2015-05-15 11:16:12 -07:00
7f98a41593
root dir for execdriver (/var/run/docker) should be configurable
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 8b2c6cb0729eadb09d688241e0f5debf1d5ccb0b
Component: engine
2015-05-15 09:30:36 -04:00
56ea157723
Revert "Fix inconsistent date formats in API"
...
This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
2015-05-14 17:31:45 -07:00
729c010981
Add bwu_docker to the list.
...
Signed-off-by: Guenter Zoechbauer <guenter@gzoechbauer.com >
Upstream-commit: ef956253d844589c139d52dec93948744a139491
Component: engine
2015-05-14 15:27:51 +02:00
f38b9f3ec2
Update Configuring and running Docker article
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 9bfe6f0d24a9eb85c7689bc696487d9f016a67d4
Component: engine
2015-05-14 07:45:20 +02:00
34f1d71bf5
Merge pull request #11706 from HuKeping/time
...
Fix inconsistent date formats in API
Upstream-commit: 1d57642906ced778e826f655aed5a0eaab30fe71
Component: engine
2015-05-13 20:23:19 -07:00
