Commit Graph

143 Commits

Author SHA1 Message Date
1bde8bd6e1 Fix #1229. Update titles, fix some wrapping.
Make the Ambassador container explicit.
Apply Sven's suggestions.
Upstream-commit: 9c1e9a5157b3ef7627f4b735c2b8b6d97f26dd53
Component: engine
2013-12-09 17:23:56 -08:00
5584948c34 Some minor cleanup of the Links use document
Upstream-commit: c9cedb4c0484c3e1879495ab5c02088ae738763e
Component: engine
2013-12-09 16:47:19 -08:00
6865b89ad2 Merge pull request #3104 from jamtur01/uses
Added section on Trusted Builds
Upstream-commit: 864729b96fbf3fa912d2686df79ec9baf15af856
Component: engine
2013-12-09 15:51:52 -08:00
86c7a0eff5 Make it extra clear that the docker group is root-equivalent.
Upstream-commit: e2ee5c71fc665170db6a3a487aebb4d7f42eed0b
Component: engine
2013-12-09 12:25:20 -05:00
dd4af9a43c Added section on Trusted Builds
Upstream-commit: c094807a1b8159bf237091ecc85fcbd6e2092a3e
Component: engine
2013-12-08 15:54:12 -05:00
5115cf8685 Merge pull request #3051 from pariviere/2490-docs-network
Network documentation page
Upstream-commit: 80dfa23da8359618a2453cb1cb3cb5fa69bb71f8
Component: engine
2013-12-05 17:29:54 -08:00
fec117a06e Clean up quoting, wraps, and build error on code-block.
Upstream-commit: 4bea68dfa6a9c68232ff7a5c36c85fc827dae938
Component: engine
2013-12-05 17:16:31 -08:00
9b49298d93 Merge pull request #2358 from tianon/mkimage-rinse
Remove mkimage-centos.sh in favor of a new rinse-based script...
Upstream-commit: 584164177ea0036c4d3503bf45645b44a9bb05d5
Component: engine
2013-12-05 16:07:59 -08:00
322ee3f0e8 refs #2490 : add a network page to docs
Upstream-commit: eac95671f50a65279f8c39341c4f3be680add98a
Component: engine
2013-12-05 23:40:33 +01:00
754f4c422f Merge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example
add an example of docker ps, and also of link aliases
Upstream-commit: e3c3f3c324e37536cc582f91b8963ba10d337417
Component: engine
2013-12-05 14:00:53 -08:00
c4093ec706 initial stab at writing a use/ambassador-pattern howto (Issue #2485)
Upstream-commit: 6ddea783ef8067b0c739785b6afd10d58255b4c9
Component: engine
2013-12-04 16:47:45 +10:00
7fde61bd0c add an example of docker ps, and also of link aliases
Upstream-commit: 48e1766527770da5ca4e7554f671705d721a5a04
Component: engine
2013-12-03 17:57:51 +10:00
e1e3b66771 Remove mkimage-centos.sh in favor of a new rinse-based script, since febootstrap is fragile and picky
Upstream-commit: 9d62dc1a0837e37ce5da01c278ab20f7d32c3774
Component: engine
2013-12-02 14:54:04 -07:00
a92bcacbc2 Better copy/paste :)
Upstream-commit: 0a89db04fe62958283c17baa11893c6ad868bf9d
Component: engine
2013-11-24 13:55:53 +01: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
8dfcb6d8f5 Fix quote mistake.
Upstream-commit: 1da8c50deddde692c1f87aec86c20cd3c2c3fd11
Component: engine
2013-11-19 12:14:39 -05: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
92d82345a3 Tiny typo cleanup
Upstream-commit: b76574f85512d3566bd056d516084e777788a82c
Component: engine
2013-11-17 21:10:06 -08:00
b666bf948d Fixes #2701. Adds security section.
Upstream-commit: d33ffe44a9f09b0e0aedf162ee17076571479003
Component: engine
2013-11-15 18:12:35 -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
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
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
01395ce3bb Add more depth to the upstart example in host_integration.rst
I found that the original example wasn't starting the docker container when docker is started.  So, I modified it using information I found from https://groups.google.com/forum/#!msg/docker-user/OWz8EOpiXuo/L_uxGFQuYlkJ

Also, upstart wasn't starting docker if it wasn't running ahead of time.  So, I added a change to the docker upstart script to solve this.
Upstream-commit: 02884ee42971be141edde8964d72a2d2c7f63cfe
Component: engine
2013-11-13 13:34:34 -05:00
59d38006c9 add a little more info about the limitations of ADD wrt ../ and docker build -
Upstream-commit: af0b2e38c3b2688cd4c2e831847bf4601d8fc149
Component: engine
2013-11-13 22:55:55 +10:00
9bdd66f858 - Improved documentation and typos fixing (Thanks to @jamtur01)
Upstream-commit: 353243a7254705f92c3d775eec1f9cfe14fa4170
Component: engine
2013-11-12 10:11:52 -08:00
c75d132f03 - Added a doc about Links and Container Naming
Upstream-commit: 981560c43631e1b09b6f90945d2d5e58345cabd2
Component: engine
2013-11-11 17:38:54 -08:00
d772cfe673 make all image ID and container ID API responses use the Long ID (Closes #2098)
Upstream-commit: b3974abe4f01d408850e245c9b52c77f3571e0b2
Component: engine
2013-11-09 12:16:49 +10:00
08ddb7c17c Merge pull request #2526 from metalivedev/2074-AddKnownIssues
Add Known Issue
Upstream-commit: 67b0b97a8f17c67e5599f4566c8a9e1a5bb401fe
Component: engine
2013-11-08 12:14:04 -08:00
c81beb4bbc - Fix the attach examples according to the new attach behavior
- Add the option of adding the user to docker's group and avoid the usage of "sudo" before each command
Upstream-commit: 304d39cc505ff51682dd7e1337f9f0ab7536eec3
Component: engine
2013-11-07 14:06:49 -08:00
8a1dabb05a Merge pull request #2423 from rogaha/volumes_doc
Added volumes documentation
Upstream-commit: bf05eb8ac0a8c919131c9c640e52b73387b9a1e0
Component: engine
2013-11-05 14:38:28 -08:00
b6ee1ce3fa - Removed some unconfirmed info
- Added reference to the index.rst
Upstream-commit: 3061e9f37434fa6bb0714861119ae01d8c4b35fb
Component: engine
2013-11-04 13:16:51 -08:00
938714910e Add known issues. Fix build warnings.
Upstream-commit: 5a9adfe9fb5bc988185ef41ca637fbeee73e947c
Component: engine
2013-11-01 16:06:46 -07:00
adc686474c Add known issues to sections via new "issues" extension.
Upstream-commit: 4194617bfe1e29bae2c2515aefbed5f1f2a1ebc1
Component: engine
2013-11-01 15:15:06 -07:00
cfe12c9c5b Merge pull request #2512 from dudebout/correct-basics-doc
Corrects the TCP section of the basics use
Upstream-commit: feef16bd88c249e8725da85a491c37d7bf2086e3
Component: engine
2013-11-01 13:55:28 -07:00
c0c39b7770 Rework the port direction documentation
+ remove PUBLIC and PRIVATE keywords
+ add the <host_interface>
+ add the -expose flag through a simple link example
+ update the meaning of the EXPOSE command
Upstream-commit: c0e51a8f27defe3d4dde0b5805d3801cf25a6ce2
Component: engine
2013-11-01 12:18:04 -04:00
84bc916ae3 Corrects the TCP section of the basics use
Upstream-commit: f2ebccb5aab6600094d92bdb6d4a8ab62bb519d2
Component: engine
2013-11-01 12:14:43 -04:00
02e12e8500 correct assignment of $PORT from docker port output
in the example, PORT is assigned to "0.0.0.0:<port>" vs "<port>" as in previous versions of docker (I encountered this documentation discrepancy tonight after installing docker v0.6.5)
Upstream-commit: df1621914b56b4ed20f684363247a9bb0c7acebf
Component: engine
2013-10-31 01:08:16 -04:00
ddf4ad8def Fix #2369 by documenting decompression behavior.
Upstream-commit: 26f4d6bf59bee7cd4290ea4e31a19da087a180f2
Component: engine
2013-10-30 16:50:58 -07:00