d95a8ab02c
Merge pull request #1704 from dhrp/ubuntu-install-finger-fingerprint
...
added apt-key finger tip and fingerprint in ubuntu installation page
Upstream-commit: 8ee4473d923eb5fc098e3ef27c8b83397c1ea492
Component: engine
2013-08-30 16:15:19 -07:00
70b7f9ce72
Merge pull request #1744 from dsissitka/patch-7
...
Updated "Use -> The Basics" to use ubuntu:12.10.
Upstream-commit: 2ea19238ff0565560a1a0aee62a26cd9e8d1fe72
Component: engine
2013-08-30 10:44:54 -07:00
cc50e6bf4b
Document FROM <image>:<tag> Dockerfile instruction.
...
Upstream-commit: 1a8a540209c997f5e75a476b942365aad892ad35
Component: engine
2013-08-30 15:23:32 +02:00
f5f5103119
Merge pull request #1736 from ramonvanalteren/patch-1
...
Update python_web_app.rst
Upstream-commit: 110d3b77949de024c5eb3263fd06f7d819a90682
Component: engine
2013-08-29 18:36:53 -07:00
02ce80c747
Updated "Use -> The Basics" to use ubuntu:12.10.
...
ubuntu:latest doesn't have nc. ubuntu:12.10 does.
Upstream-commit: c0e95fa68a37166ce551a33332bbede6b6531b68
Component: engine
2013-08-29 21:05:18 -04:00
952e5b8400
Merge pull request #1739 from dotcloud/add-docs-dockerfile
...
Added a Dockerfile which installs all deps and builds the Docs
Upstream-commit: 9b029a08549e2fef8f71115e5707c363368662e9
Component: engine
2013-08-29 17:42:17 -07:00
a659202877
added a Dockerfile which installs all deps and builds the docs.
...
Upstream-commit: c6702bebe116054a4c24487b5fb5d2c26e9fad4f
Component: engine
2013-08-30 00:13:32 +00:00
27d052d30a
Merge pull request #1721 from andrewmunsell/patch-2
...
Add privileged flag in documentation for container creation
Upstream-commit: 050cf701369feb8e90fda98b6f4b25a335c741d6
Component: engine
2013-08-29 17:05:40 -07:00
1257529085
Merge pull request #1729 from dsissitka/patch-6
...
Fixed a minor syntax error.
Upstream-commit: 0f91418b260375902430d7b057c6cfd8a07488db
Component: engine
2013-08-29 16:27:22 -07:00
6e525e067e
Merge pull request #1717 from metalivedev/1685-updateinstallation
...
Fix #1685 : Notes on production use. General installation cleanup.
Upstream-commit: c4394decf85ab1428edab61edeb73e6cf65b61ce
Component: engine
2013-08-29 16:06:00 -07:00
a42573ca6a
Update python_web_app.rst
...
Fixed typo in the WEB_PORT command, missing sudo in front of docker command
Upstream-commit: 559724ac35134ac3cced1159cf776b7ab7bdacc6
Component: engine
2013-08-30 00:37:47 +02:00
6f1d2ff264
Merge pull request #1727 from dsissitka/patch-5
...
Fixed a minor syntax error.
Upstream-commit: c46d9933ecc90ee6560054a34afc9f8ee5920601
Component: engine
2013-08-29 11:05:22 -07:00
7e1465e3d2
Merge pull request #1708 from nexxy/patch-1
...
Update docker_remote_api_v1.4.rst
Upstream-commit: bcb081a269568b5cd047ce13b6a9c57fcdb63176
Component: engine
2013-08-29 10:22:05 -07:00
58ee8a4df1
Fixed a minor syntax error.
...
Upstream-commit: 57892365ef325d824ba6ce45a8e24e48cd117f0c
Component: engine
2013-08-29 12:35:37 -04:00
03c0f1a43e
Fixed a minor syntax error.
...
Upstream-commit: 075253238dff72bdf03179fcb1d2b90ca097e7f0
Component: engine
2013-08-29 12:27:35 -04:00
02d16a65bf
Add privileged flag in documentation for container creation
...
Upstream-commit: 37a236947eaa611a441328a0dfc015091402292b
Component: engine
2013-08-28 22:18:47 -07:00
24a76563f6
Correct number of asterisks.
...
Upstream-commit: c1f6914e4374fcafa710c75eb23e8cffeeb45169
Component: engine
2013-08-28 20:01:18 -07:00
bc42da0604
Fix #1685 : Notes on production use. General installation cleanup.
...
Upstream-commit: b1eae313ad7d28142c7e0a8a60e3961bed0c84f0
Component: engine
2013-08-28 17:26:10 -07:00
9b11388338
fix start doc
...
Upstream-commit: 66ef6c0f6ed887008ad73e317767e81551f76e72
Component: engine
2013-08-28 16:40:00 +00:00
97250ab7c0
Update docker_remote_api_v1.4.rst
...
Fixed a (very serious) typo.
Upstream-commit: 69a93b36d5a43c22402af5beea01d60b1b3be91f
Component: engine
2013-08-28 04:12:37 -07:00
f47e456912
added apt-key finger tip and fingerprint in ubuntu installation page
...
Upstream-commit: 466a88b9a8331154730551c0009b67cded83ba58
Component: engine
2013-08-27 19:59:36 -07:00
e1dfe0469e
Fix #621 : add new use/base images section. Include examples.
...
Upstream-commit: dffb72ca898ce44e19f148112c3f9b43c96e01da
Component: engine
2013-08-27 18:49:43 -07:00
2d98a967b5
Merge pull request #1698 from metalivedev/1684-Cleanup
...
Fix #1684 : Cleanup introduction, working with repos, "use" index.
Upstream-commit: 128893062b5b479d64dbcc62e16b66584f24b16b
Component: engine
2013-08-27 18:15:06 -07:00
e74c0d800f
Fix #1684 : Old Welcome is now Introduction. Working with Repos now follows Builder.
...
Clean up some doc build errors. Removed old Manifesto. Tweaked layout javascript
to allow direct link from first and last index elements.
Upstream-commit: c627ff6e209ac1f660a49371d4f6bd710470aacb
Component: engine
2013-08-27 14:29:49 -07:00
b70dc614ff
Troubleshooting windows installation section
...
Upstream-commit: f861c493bf4d391f1721f536e86da4fa007fb7f0
Component: engine
2013-08-27 11:19:32 -07:00
a51df5a054
Merge pull request #1622 from TylerBrock/patch-2
...
Some fixes for MongoDB example
Upstream-commit: 5b84252c73ed0e6d3bf351099d73a4a69bacc60d
Component: engine
2013-08-26 17:28:38 -07:00
1a3985cf66
ENTRYPOINT fixups
...
Upstream-commit: f352ec945fbc34eafdde04dff7ced995c9e3a409
Component: engine
2013-08-26 19:17:26 -04:00
d94e17669e
Merge pull request #1671 from kim0/patch-3
...
Don't force a non-existent npm version, use latest from epel
Upstream-commit: f7fa6c2b0bdaa8ed236ae8bf78206e97aa938613
Component: engine
2013-08-26 14:33:07 -07:00
242a1e6f55
Don't force a non-existent npm version, use latest from epel
...
Not the smartest thing to do
Upstream-commit: 843ef645d2c76275e484e3fd5262b947d5611d59
Component: engine
2013-08-26 12:54:15 +03:00
f620f56abe
Change fetching of gpg key from http to https
...
Or was there any reason to fetch using http?
Upstream-commit: 4440bde0ebffcb31025fd9f3db8e4275b77332b1
Component: engine
2013-08-26 11:45:15 +02:00
6c86af54b3
Merge pull request #1634 from songgao/patch-1
...
Added utils/utils.go : CopyEscapable escale sequence to tutorial.
Upstream-commit: 820a3b962aa469fa3f655c7fb252548f11979c77
Component: engine
2013-08-23 18:52:17 -07:00
3bf995dd21
Merge pull request #1633 from abhirajbutala/patch-1
...
Update docker_remote_api.rst
Upstream-commit: dd9ee039a62484292b85a16159ecf729d21377ee
Component: engine
2013-08-23 15:17:21 -07:00
f10523fade
Merge pull request #1641 from dotcloud/docs-0.6-gpg-key
...
Docs 0.6 gpg key
Upstream-commit: e2594d162e8c2c60dc4741a0519ce09148a9e87c
Component: engine
2013-08-23 13:14:21 -07:00
60812a84c0
Added adding the gpg key
...
Upstream-commit: ebb9b5e85be296fd73f4d64e61dfc87fe0c3ae72
Component: engine
2013-08-23 12:56:03 -07:00
82a09e242f
Added line on top of ubuntulinux announcing change in 0.6
...
Added lines on top of vagrant installs
Upstream-commit: 091fb892948abee1ad5451ee6c9d7dd540d88780
Component: engine
2013-08-23 11:45:52 -07:00
d544e9592e
Merge pull request #1637 from dhrp/change-docs-ubuntu-sources
...
Updated the docs to reflect we no longer use Launchpad and host our own
Upstream-commit: 3ebda17f0f050c6aa1dbb7eec5774ad9e603b022
Component: engine
2013-08-23 11:05:59 -07:00
8aac574cd3
Updated the docs to reflect we no longer use Launchpad and host our own repository.
...
Upstream-commit: f753dfe6b3d3a8e4d770ae73e947e2fe339df536
Component: engine
2013-08-23 10:41:53 -07:00
a7d762c81f
Update docker_remote_api.rst
...
Upstream-commit: 3396a183c61b66dd60458f67049a50b393e760f8
Component: engine
2013-08-23 01:28:58 -07:00
dfb6c3c80f
Add lxc-conf flag to allow custom lxc options
...
Upstream-commit: 551092f9c0da2244c60b75d893ef847f915ca604
Component: engine
2013-08-22 16:05:21 +00:00
8ed0b7d24b
Some fixes for MongoDB example
...
Upstream-commit: d6f53049c4ec4513a136bfd512dafe166c4ad901
Component: engine
2013-08-21 23:48:32 -04:00
6f9dbd0830
Merge pull request #1596 from metalivedev/1149-easyfixes
...
Fix #1330 and #1149 . Improve CMD, ENTRYPOINT, and attach docs.
Upstream-commit: 0b9c8e286050bd7bc21e15085b34ed9779080ce6
Component: engine
2013-08-21 14:06:41 -07:00
7c2919c17f
Merge pull request #1614 from denibertovic/docs
...
Small fix to docs regarding adding docker groups
Upstream-commit: 42fe550c9eb570adc2aedfcc8c5ceb62388f14e4
Component: engine
2013-08-21 12:26:56 -07:00
934a8f1946
Add mongodb example
...
Upstream-commit: f5bd13721666366879e3a9681df8442181448ffc
Component: engine
2013-08-21 12:09:40 -07:00
0398c9c138
Merge pull request #1607 from TylerBrock/mongodb
...
Add MongoDB image example
Upstream-commit: 348696f3fe88fbae1a1c15d34fe09398e73f6897
Component: engine
2013-08-21 12:07:50 -07:00
29acb4a3dc
Merge pull request #1513 from dotcloud/add_user_dockerfile
...
Add USER instruction do Dockerfile
Upstream-commit: 6da071985f5500d10122d5ce59a2764377652c2f
Component: engine
2013-08-21 09:19:31 -07:00
9e0921e842
Merge pull request #1576 from MatthewMueller/patch-1
...
updated default -H docs
Upstream-commit: e0a7013836e9302a5181f1e78ed6b9310b5eeac6
Component: engine
2013-08-21 09:09:43 -07:00
c79c5213b2
small fix to docs regarding adding docker groups
...
Upstream-commit: 467dbb75f10ae97e785a127a7547a5015cbb2a99
Component: engine
2013-08-21 17:28:13 +02:00
0957301291
add mongodb image example
...
Upstream-commit: 2c147dd721c5a92fa86af0ab4a6b9b9ebcd8d546
Component: engine
2013-08-20 18:08:15 -04:00
ac774c5f65
rebase docs
...
Upstream-commit: f69c4652314064a2e676220ef8e137e8499ce3b8
Component: engine
2013-08-20 11:42:53 +00:00
2524368b0f
Fix #1330 and #1149 . Improve CMD, ENTRYPOINT, and attach docs.
...
Upstream-commit: 75f4fd978d234efbc3a5c5c55ea162a9a68246d9
Component: engine
2013-08-19 19:13:26 -07:00
