Commit Graph

505 Commits

Author SHA1 Message Date
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
09d848fbf1 Merge pull request #1590 from elmendalerenda/patch-3
fixed postgresql conf setting
Upstream-commit: d627ff969735d44201fc88539d388ad87f102cda
Component: engine
2013-08-19 10:27:43 -07:00
9fa228bf68 fixed postgresql conf setting
small typo, changed listen_address to listen_addresses
Upstream-commit: 83acd37161ed7149843546a779a95fdaf3e2458f
Component: engine
2013-08-19 14:20:25 +01:00
c06359e035 Added escape sequence to tutorial
Upstream-commit: b22c9731102abbaf42e8d7e37e179ef56b945ccd
Component: engine
2013-08-18 21:44:46 -05:00
0c286d916a Add workdir support for the Buildfile
For consistency the Buildfile should have the option to
set the working directory.

Of course that is one option more to the buildfile,
so please tell me if we really want this to happen.
Upstream-commit: 319988336ceed4428de0e1e55685f8a0ed48a7bd
Component: engine
2013-08-18 20:30:19 +02:00
35c6bf7330 Add an option to set the working directory.
This makes it possible to simply wrap a command inside a container. This makes
it easier to use a container as an unified build environment.

Examples:

~/workspace/docker
$ docker  run  -v `pwd`:`pwd` -w `pwd` -i -t  ubuntu ls
AUTHORS		 Makefile	archive.go	   changes.go	      docker
[...]


docker  run  -v `pwd`:`pwd` -w `pwd` -i -t  ubuntu pwd
/home/marco/workspace/docker
Upstream-commit: 687d27ab575778196ea646b6d3fa61b6c8e512b0
Component: engine
2013-08-18 19:34:01 +02:00
d4bbe3167c updated default
Upstream-commit: 5325703c2758b394de3e12723dd8dc89b1df9b29
Component: engine
2013-08-17 21:54:10 -07:00
7830299d44 remove extraneous step and stupid whitespace
Upstream-commit: 674e5c850374fffa03fb205ae6b623ec069978d9
Component: engine
2013-08-16 13:30:54 -04:00
e204ad6458 Add instructions for creating and using the docker group
Upstream-commit: 2ec141da542ab7563c7104b3a950bc503e4959fb
Component: engine
2013-08-16 13:19:59 -04:00
fd36c14020 Fix #1517, #1521 by adding sudo to examples and installation.
Upstream-commit: d4eab77f0c604e10f63519833dc25fbd5a3419bf
Component: engine
2013-08-14 16:21:36 -07:00
951194f6f0 Merge pull request #1505 from dotcloud/improve_events
Add image name in /events
Upstream-commit: 15bc2240ac56a3f584bdc33865c896bac961c6a3
Component: engine
2013-08-14 15:40:36 -07:00
9defd8d614 Merge pull request #1478 from jpetazzo/929-insecure-flag
add -privileged flag and relevant tests, docs, and examples
Upstream-commit: 9662f9e56adeb92d3749c12bc1ce08928bbfc54b
Component: engine
2013-08-14 13:55:18 -07:00
05ba2d91be Merge pull request #1533 from dhrp/docs-ux-changes
Docs ux changes
Upstream-commit: 4cb57a54389e25a3803dc6c4603e330b362c4ee9
Component: engine
2013-08-13 18:03:49 -07:00
613b070b88 Merge pull request #1523 from dotcloud/docker-group-docs
Update docs for docker group
Upstream-commit: 2e5642452b23e6c81b0ec29f10e9e1b2de615597
Component: engine
2013-08-13 18:02:30 -07:00
45e3eef148 Resolved conflict in conf.py
ps. also changed navigation (swapped community and getting started)
Upstream-commit: 6c87db97a629f3d7b7f6e276a515506bcca8dbb1
Component: engine
2013-08-13 16:28:24 -07:00
14d9fa64a4 Merge remote-tracking branch 'dotcloud/master' into docs-smart-changes
Conflicts:
	docs/sources/conf.py
Upstream-commit: f127c471a15050814f8d5b97b7a768f58756afff
Component: engine
2013-08-13 16:25:58 -07:00
43b59cff4b add -insecure flag and relevant tests
Upstream-commit: 280901e5fbd0c2dabd14d7a9b69a073f6e8f87e4
Component: engine
2013-08-13 16:20:22 -07:00
f97e8fc164 [docs] Some user-friendly changes to the documentation.
- Added parmalinks (closes #1527)
 - Changed the 'fork us on github' button to 'Edit this page on github', so people can edit quickly (closes #1532)
- Changed the favicon
Upstream-commit: f14db4934605235bd77e9d1dc22377ca710e4c7b
Component: engine
2013-08-13 16:18:32 -07:00
abcb5a7554 Added information about Docker's high level tools over LXC. Formatting cleanup. Mailing list cleanup.
Upstream-commit: e2409ad3376baeb36d1011732f7d7b1a239320ae
Component: engine
2013-08-13 13:45:07 -07:00
fe8b556e8d Update docs for docker group
Upstream-commit: e4f35dd4cf81a7f2d19a61cc8b1084c3adcc5253
Component: engine
2013-08-13 12:05:27 -07:00
9540169e17 Add USER instruction
Upstream-commit: 5ee3c58d2549c25fa4464963831a28a99407b6cd
Component: engine
2013-08-13 12:02:17 +00:00
62138d17f2 Merge pull request #1508 from pborreli/typos
Fixed typos
Upstream-commit: 90cb66f08d139079601dbbedf1fa9706d1bf5738
Component: engine
2013-08-12 15:17:02 -07:00