4718170d22
Merge pull request #2731 from SvenDowideit/docker-commit-doc
...
make the docker commit help more copy&pasteable
Upstream-commit: 8498b44eac24f4f62cd082aa9ecac7ce503bb3ef
Component: engine
2013-11-21 15:33:05 -08:00
de93f1b190
Merge pull request #2772 from bitoiu/patch-3
...
Change to documentation for AWS AMI request
Upstream-commit: e2dcfc2cf7ea00619e327a900d1b87cb437a634c
Component: engine
2013-11-21 15:15:04 -08:00
1eafcb9d5e
Merge pull request #2717 from metalivedev/2342-uploadingcontext
...
Fix #2342 . Harmonize information about ADD. Cross-link build info.
Upstream-commit: 9b4c15114201bab21437853463d58652c8e1624a
Component: engine
2013-11-21 15:09:47 -08:00
63c337d326
Fix title on doc page for remote_api_client_libraries.rst
...
Upstream-commit: 362e9d6b3c7049d44c016ee72fe255b76ec80c5a
Component: engine
2013-11-21 12:45:01 -08:00
94ec1bcdfe
Merge pull request #2727 from SvenDowideit/docker-images-doc
...
add some common examples for docker images, and tell the user what -a filters out
Upstream-commit: 82cdd21a3492789a47fc4c3bb3f8a4d85b89d14c
Component: engine
2013-11-20 16:30:48 -08:00
afc3ae3564
Merge pull request #2723 from SvenDowideit/doc-build-image
...
Use the work Path for docker cp CONTAINER:PATH
Upstream-commit: 2bc35287a080cd9a9805e343595055dcbfb0db01
Component: engine
2013-11-20 11:10:13 -08:00
46ebe14722
Adding 1.7 documentation
...
Upstream-commit: 383f95bba1fef213473725fdf6193be0de5b73fd
Component: engine
2013-11-20 03:52:33 +00:00
9f3f248404
Adding spaces to fix docs build
...
Upstream-commit: bf504f2afab679922e92b8bb5fe28957f5f6bf02
Component: engine
2013-11-20 03:52:33 +00:00
390195822f
Offline Image Transfers #1155
...
Upstream-commit: 7eaa59f626fa9e9b3bf61d3d7eff0fb70b3d011a
Component: engine
2013-11-20 03:52:33 +00:00
791d32523f
Fix #2342 . Harmonize information about ADD. Cross-link build info.
...
Upstream-commit: 4f9f83d6c6e71f826489f04e497f4a384c49a2c1
Component: engine
2013-11-19 11:16:28 -08:00
f37e981fe7
Merge pull request #2757 from Painted-Fox/patch-2
...
Simplify the upstart example in host_integration.rst
Upstream-commit: 4eaba8de918c384a782f181122c333fa7bd14857
Component: engine
2013-11-19 10:29:54 -08:00
7d3676e536
Merge pull request #2770 from tianon/better-man-page
...
Switch sphinx man_pages generation to use commandline/cli
Upstream-commit: 434c1613a42661014147c21fe22867f6faa0a901
Component: engine
2013-11-19 10:28:50 -08:00
e6a444ec3b
Change to documentation for AWS AMI request
...
Hi guys, it just might be me, but clicking the AMI from http://cloud-images.ubuntu.com/locator/ec2/ is broken to me. So I just did it via the normal Create Instance Wizard.
I just though some people might have the same issue.
Sorry if my markdown for links is screwed up, I went by the examples, since I'm used to the `[]()` traditional one.
Cheers.
Upstream-commit: aeb304b37c190e7fab60c0db946d1fd5d8e9e9f3
Component: engine
2013-11-19 17:50:38 +00:00
8dfcb6d8f5
Fix quote mistake.
...
Upstream-commit: 1da8c50deddde692c1f87aec86c20cd3c2c3fd11
Component: engine
2013-11-19 12:14:39 -05:00
a9304e452b
Switch sphinx man_pages generation to use commandline/cli instead of toctree for a more relevant/useful man page
...
Upstream-commit: 1cd9529ad350f70aaf6627368bdc8d007b90b3e4
Component: engine
2013-11-19 10:10:42 -07:00
3ec0757555
fixed typos, and made small improvements to the wording
...
Upstream-commit: 3656db66d2f13d74e07574d229b32023bb11dc1f
Component: engine
2013-11-19 14:44:50 +01:00
e445caadb0
Correct the quotations in the command to add the -r=false flag. Thanks to @tianon for pointing this out.
...
Upstream-commit: 194d4b93768c49f0d76a5da8943446efbea879ca
Component: engine
2013-11-18 21:23:00 -05:00
d87c69acdb
Merge pull request #2719 from metalivedev/2702-knownissue-lxc-start-failed-to-mount
...
Fixes #2702 . Also cleans up formatting and long lines in volumes doc.
Upstream-commit: 1de02a70dea3249413da4a06a205d7d9c98145aa
Component: engine
2013-11-18 17:27:49 -08:00
f783d46575
Merge pull request #2755 from metalivedev/test-2592
...
Replace PR#2592
Upstream-commit: 511a62a099ee086b6472816703a3e247d42f2127
Component: engine
2013-11-18 15:29:48 -08:00
2b588f2557
Merge pull request #2721 from metalivedev/2701-addmedia
...
Add security section and embed private registry video.
Upstream-commit: 256d46fe68e0faaab8efc3101ece2260a009e2af
Component: engine
2013-11-18 15:29:35 -08:00
5a2e995ad5
Simplify the upstart example in host_integration.rst
...
Taking some pointers from @tianon on my pull request #2685 .
Upstream-commit: 76ee860ece15f8a7738c503fdd73f124f0ef1f4b
Component: engine
2013-11-18 16:21:03 -05:00
814f2e1b4e
Fixes #2702 . Also cleans up formatting and long lines in volumes doc.
...
Upstream-commit: 2ae1f29dfe6fea26d2e0ac29faa2375a5db2c2d9
Component: engine
2013-11-18 13:09:13 -08:00
29163ad063
Merge pull request #2729 from SvenDowideit/docker-info-doc
...
add example for docker info
Upstream-commit: 669e4bac30f41c2bebbcae2889fb1420cd41af37
Component: engine
2013-11-18 11:44:54 -08:00
28e01f39d4
Merge pull request #2726 from SvenDowideit/docker-history-doc
...
add example for docker history
Upstream-commit: f6362fbb0ee00aa2a7ac6ca21f8ba1004a135b4c
Component: engine
2013-11-18 11:43:44 -08:00
0af8e75a2b
Merge pull request #2742 from rick/patch-1
...
Tiny typo cleanup
Upstream-commit: c1cd8245709da81e5633145a8e6991eee336c555
Component: engine
2013-11-18 11:37:37 -08:00
92d82345a3
Tiny typo cleanup
...
Upstream-commit: b76574f85512d3566bd056d516084e777788a82c
Component: engine
2013-11-17 21:10:06 -08:00
a69dc14f58
make the docker commit help more copy&pasteable
...
Upstream-commit: bc74f65068b6b80b657e07f4ab2d7b115aacae75
Component: engine
2013-11-16 21:11:34 +10:00
dbb96cce3d
add example
...
Upstream-commit: 5c741ef11db8777bc7723d879624ae8281121c18
Component: engine
2013-11-16 20:53:45 +10:00
dbd9984b5b
add some common examples for docker images, and tell the user what -a filters out
...
Upstream-commit: 152459b7272daa30ab5207b512f5319fdc4ff491
Component: engine
2013-11-16 20:45:30 +10:00
b3d92f6b0f
add example for docker history
...
Upstream-commit: f04142c1f765b4d1afb8eb388f3ca9466c22abf7
Component: engine
2013-11-16 20:36:33 +10:00
83c673a90c
add an example of what to expect from docker diff, and what the 3 codes mean
...
Upstream-commit: af05ab399e17c97bdea4b3ee893c47f29c0e22a5
Component: engine
2013-11-16 20:26:47 +10:00
bc3e877db3
expunge the word 'Resource' in reference to a file/dir in a CONTAINER - that way users don't wonder how its different from a Path
...
Upstream-commit: 27159ce6bac4308b5fba311258fab8e852667787
Component: engine
2013-11-16 20:15:04 +10:00
b666bf948d
Fixes #2701 . Adds security section.
...
Upstream-commit: d33ffe44a9f09b0e0aedf162ee17076571479003
Component: engine
2013-11-15 18:12:35 -08:00
c2f970187c
Merge pull request #2709 from eugenkrizo/patch-1
...
path needs to be specified to 'docker build' command
Upstream-commit: e12bba66ea784e0c7859b5679d6a55d639889508
Component: engine
2013-11-15 13:34:08 -08:00
4f21d884c5
Merge pull request #2713 from eugenkrizo/patch-2
...
port published explicitly (for docker 0.6.6)
Upstream-commit: 92c3a319fba58132bfc918a3bde8dcc64e00304c
Component: engine
2013-11-15 13:32:18 -08:00
f5175fa4bb
Merge pull request #2685 from Painted-Fox/patch-1
...
Add more depth to the upstart example in host_integration.rst
Upstream-commit: 323e86032db8941135bea418cfbddc8d20739c0e
Component: engine
2013-11-15 12:28:07 -08:00
da637b552f
Fix typos, add links, streamline content of #2592
...
Upstream-commit: 9a9d3239e10b55cc15bb38788a411d9a16c477fc
Component: engine
2013-11-15 11:38:03 -08:00
dc84120dc9
Merge branch 'fix_examples_use_docs' of git://github.com/rogaha/docker into test-2592
...
Upstream-commit: 33110ddc3fbb457d071fa9a53f9bb76e52dd724b
Component: engine
2013-11-15 11:15:14 -08:00
07dd17035d
Merge pull request #2689 from metalivedev/fix-syntax
...
Clean up sphinx syntax
Upstream-commit: 6341768393a8b48cc37e29f43efdffd3fa4caf33
Component: engine
2013-11-15 11:09:51 -08:00
b2bdca3ec2
Merge pull request #2712 from makinacorpus/master
...
Do not drop sys_boot
Upstream-commit: ad96d5ff04dd9b8284bad4f86ed285f905723951
Component: engine
2013-11-15 10:33:41 -08:00
3c67b07093
port published explicitly (for docker 0.6.6)
...
port 5984 to couchdb needs to be published explicitly in docker version 0.6.6
Upstream-commit: 492ce4c665b7d55d1496fb7e822a49ff0d44809d
Component: engine
2013-11-15 17:12:48 +01:00
bc283849de
path needs to be specified to 'docker build' command
...
current folder '.' appended as a path
Upstream-commit: 007964793dd619279bfb48c3fa84ada65aa599bd
Component: engine
2013-11-15 16:16:59 +01:00
a9461ab782
Merge pull request #2690 from codevin/master
...
Improvise documentation for builder.rst / VOLUME command
Upstream-commit: bed87ea1038321d4c58d379040acdbd824cb8b7c
Component: engine
2013-11-14 19:23:18 -08:00
7b5ae8dd36
thankyou @tomdz - I forgot about URL based ADDs
...
Upstream-commit: e42144674fb6eeb76bcda822105b049f7fb6ab30
Component: engine
2013-11-14 14:53:55 +10:00
7c37de4a14
Improvise documentation for builder.rst / VOLUME command
...
Upstream-commit: 37abc07852874939aabe7ba9a346d4d893e40409
Component: engine
2013-11-14 09:54:31 +05:30
d8cd1b4245
Merge pull request #2688 from dhrp/doc-layout-dotcloud-to-docker-inc
...
Updated documentation footer to say "Docker Inc." instead of dotCloud. And added Read the Docs.
Upstream-commit: 61abc3f8ac89bd3b238a7ceaf26fa004c462848b
Component: engine
2013-11-13 18:31:21 -08:00
e96e8ebc75
Merge pull request #2661 from rogaha/links_docs
...
- Added a doc about Links and Container Naming
Upstream-commit: 5fc56b6b47ede3f6c86177fa315743196854412b
Component: engine
2013-11-13 18:15:25 -08:00
35545fd6bb
Clean up sphinx syntax, upgrade http markup package, minor link changes, update intro.
...
Upstream-commit: 059950b095a48c254a9f407f2bff13eaab7a7a1c
Component: engine
2013-11-13 17:45:22 -08:00
687d57d2f0
Updated documentation footer to say "Docker Inc." instead of dotCloud. And added link to Read the Docs for giving them credit to hosting us. (Thanks Read The Docs!)
...
Upstream-commit: 9ab85f4d1220d04a3b682d5612ff27db5983f5d3
Component: engine
2013-11-13 16:09:23 -08:00
de14ff2222
Merge pull request #2679 from FreekKalter/master
...
fix error in python webapp example
Upstream-commit: 3cf23b93eaf0b51983204bb28182eb39c0791559
Component: engine
2013-11-13 13:35:01 -08:00
