Phil Estes
d37aad170f
Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
...
fix release script for experimental
2015-06-01 12:29:45 -04:00
Mary Anthony
3ce2797541
Updating after the pr went through
...
Updating with comments.
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-01 09:20:31 -07:00
Tobias Gesellchen
16e649c589
indicate HostConfig to be used for "create container"
...
Closes #13614
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-06-01 07:04:41 +02:00
Joe Gordon
3d87b80b46
Fix spelling mistakes in documentation
...
While reading some of the docs I noticed a few errors, so I ran
misspellings (https://pypi.python.org/pypi/misspellings ) on markdown files
Signed-off-by: Joe Gordon <joe.gordon0@gmail.com>
2015-05-31 11:53:23 -07:00
moxiegirl
093f57a261
Merge pull request #13460 from moxiegirl/add-created-state-diagram
...
Updating event diagram with the created state. Cool, thank you.
2015-05-30 19:47:24 -07:00
James Turnbull
73683e807d
Merge pull request #13616 from konstruktoid/docs_openssl
...
Docs: sha256 and 4096 when using openssl
2015-05-30 19:20:21 -04:00
Thomas Sjögren
5cd64cb93f
aes256 and 4096 bits
...
squashing down to a single commit and change back to cert.pem
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-05-31 01:05:49 +02:00
Sebastiaan van Stijn
f2154a5a6b
Merge pull request #13367 from duglin/Issue13353
...
Add a "Created" state for new containers that haven't been run yet
2015-05-30 19:49:38 +02:00
Doug Davis
dc697b1c9f
Add a "Created" state for new containers that haven't been run yet
...
Closes #13353
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-30 07:48:46 -07:00
Sebastiaan van Stijn
279c877451
Merge pull request #13580 from vdemeester/update-api-commit
...
Update api documentation to add labels in commit
2015-05-30 14:44:05 +02:00
Doug Davis
e51b311129
Premature newline insertions
...
Noticed that there were a few newlines in the middle of a \`...\` blocks that
made the text look funny when displayed in HTML.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-30 04:46:24 -07:00
Vincent Demeester
c61fa8471a
Update api documentation to add labels in commit
...
It is already possible to set labels at commit when using the API. But
it is not present in the API documentation. Added an integration test
too, to validate this work (and will be in the future).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-05-30 11:31:51 +02:00
Sebastiaan van Stijn
1613897d2d
Merge pull request #13561 from icecrime/warn_overlay_docs
...
Add note about overlay not being production ready
2015-05-30 01:24:02 +02:00
Antonio Murdaca
c42ede311b
Revert api doc for 1.19 about PortSpecs removal
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-30 00:32:03 +02:00
Arnaud Porterie
67cb748e26
Add note about overlay not being production ready
...
Add a paragraph in cli.md mentioning that overlay is not a production
ready graphdriver.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-29 13:53:09 -07:00
Antonio Murdaca
15134a3320
Remove PortSpecs from Config
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-29 22:38:09 +02:00
David Calavera
f1fed87fc0
Merge pull request #13392 from runcom/syslog-connection-url-log-opt
...
Add syslog-address log-opt
2015-05-29 10:21:57 -07:00
Jessica Frazelle
b372f9f224
fix experimental version and release script
...
add api version experimental
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-29 10:00:22 -07:00
moxiegirl
87d36079a7
Merge pull request #13574 from anchal-agrawal/13345-fix-mac-install-docs
...
Fixing Mac Boot2Docker installation doc Your fix has left the building.
2015-05-29 09:13:04 -07:00
Hu Keping
22fda380a9
Fix inconsistent of remote API and document
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-29 22:56:35 +08:00
Anchal Agrawal
27ffccf540
Fixing Mac Boot2Docker installation doc
...
Signed-off-by: Anchal Agrawal <aagrawa4@illinois.edu>
2015-05-28 22:53:54 -05:00
Jessie Frazelle
fcdea09ea5
Merge pull request #13530 from jfrazelle/bump-api-version
...
bump api version to 1.20
2015-05-28 16:14:30 -07:00
David Calavera
7317b84ce0
Merge pull request #13558 from calavera/doc_ulimit
...
Add comment about ulimit format.
2015-05-28 15:51:06 -07:00
Antonio Murdaca
e8c88d2533
Add syslog-address log-opt
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-29 00:42:11 +02:00
Jessica Frazelle
e76d0f5571
bump api version to 1.20
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-28 15:32:05 -07:00
Mary Anthony
30901609a8
Fixes to the 1.19 version
...
updating with changes to this instant
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-28 14:25:26 -07:00
David Calavera
9292859fce
Add comment about ulimit format.
...
Fixes #12116
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-28 14:14:07 -07:00
Lloyd Dewolf
b4a52fc4e9
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>
2015-05-27 15:07:57 -07:00
Dan Walsh
160dc79db0
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>
2015-05-27 12:50:16 -07:00
moxiegirl
e580734149
Merge pull request #13406 from moxiegirl/experimental-work
...
Placeholder Part II: For commenting about install
2015-05-26 18:19:26 -07:00
Mary Anthony
1ba1a0550f
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>
2015-05-26 15:37:38 -07:00
Jessica Frazelle
40b71adee3
Revert "Add docker exec run a command in privileged mode"
...
This reverts commit 72a500e9e5
.
Signed-off-by: Jessica Frazelle <princess@docker.com>
Conflicts:
daemon/execdriver/native/exec.go
integration-cli/docker_cli_exec_test.go
runconfig/exec.go
2015-05-26 14:12:16 -07:00
James Turnbull
628c396555
Merge pull request #13467 from epc/epc-2015145
...
Documentation Copy edits for typos
2015-05-25 14:32:17 -04:00
Ed Costello
7d75c5be95
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com>
2015-05-25 13:39:56 -04:00
Sebastiaan van Stijn
8efd87f5a2
Merge pull request #13447 from justone/mention-dockviz-alternative
...
mention dockviz alternative
2015-05-25 19:26:19 +02:00
Sebastiaan van Stijn
187362414d
Merge pull request #13418 from donkirkby/patch-1
...
small formatting and grammar fixes
2015-05-25 19:15:47 +02:00
Nate Jones
453c0abf1c
mention dockviz alternative
...
closes #13431
Signed-off-by: Nate Jones <nate@endot.org>
2015-05-25 09:43:25 -07:00
Sebastiaan van Stijn
c12081987a
Merge pull request #13461 from moxiegirl/add-glossary-back
...
Adding back in Glossary
2015-05-25 18:32:15 +02:00
Sebastiaan van Stijn
5f57143b31
Merge pull request #13458 from janjaapdriessen/patch-1
...
Fix markdown syntax for "docker run" instruction example
2015-05-25 18:07:19 +02:00
Don Kirkby
5051aee555
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>
2015-05-25 09:05:42 -07:00
Jan-Jaap Driessen
02405a96b2
Markdown changes (thanks to runcom for the rebase+squash handholding)
...
Signed-off-by: Jan-Jaap Driessen <janjaapdriessen@gmail.com>
2015-05-25 17:24:41 +02:00
Mary Anthony
08da08f3f9
Adding back in Glossary
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-25 07:39:27 -07:00
Mary Anthony
9c65862cd6
Updating with the created state
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-25 07:33:01 -07:00
Lloyd Dewolf
ca23ac37ef
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>
2015-05-24 14:04:13 -07:00
Arnaud Porterie
bce3e761c0
Merge pull request #13161 from calavera/plugin_discovery
...
Proposal: Volume refactor and external volume plugins
2015-05-23 18:44:18 -07:00
Mary Anthony
6de4138465
Finally, finally, close #12164
...
Updating with typo Seb found
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-23 14:27:50 -07:00
Arnaud Porterie
8d0486832d
Document in the experimental section
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
(cherry picked from commit a31633c2707c78c2ffd684a5a3e576f310af0fb5)
2015-05-22 17:00:04 -07:00
David Calavera
ab8a5bcf04
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>
2015-05-22 16:58:48 -07:00
moxiegirl
8e76c0d1d8
Merge pull request #13303 from moxiegirl/experimental-work
...
Experimental features placeholder
2015-05-22 08:42:57 -07:00
David Calavera
a867c1b70a
Mark volume drivers and plugins as experimental in the documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-21 20:34:17 -07:00