Commit Graph

473 Commits

Author SHA1 Message Date
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
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
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
62138d17f2 Merge pull request #1508 from pborreli/typos
Fixed typos
Upstream-commit: 90cb66f08d139079601dbbedf1fa9706d1bf5738
Component: engine
2013-08-12 15:17:02 -07:00
64cd837579 Merge pull request #1504 from zaiste/docs/postgresql-service
docs/postgresql: PostgreSQL service on Docker example
Upstream-commit: 13acf72a3e21fe1d1515deb6a421181817822086
Component: engine
2013-08-12 14:47:19 -07:00
efc4a51c0c Fixed typos
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
a503d396c8 Merge pull request #1487 from titanous/maintainer-usernames
Add GitHub usernames to MAINTAINERS
Upstream-commit: 86ef6422f346154419ebde41ff51614f5141258b
Component: engine
2013-08-12 09:07:10 -07:00
e65d5282fa fix/docs: ubuntu instead of base, note about root-only
Upstream-commit: 3af60bf37565de35643c95eae9fd4ddc863c21fc
Component: engine
2013-08-12 15:30:52 +02:00
97b43448be Added docs
Upstream-commit: 123c80467bb6e7bef22827b55640a4789e42558d
Component: engine
2013-08-12 11:55:23 +00:00
692cd4a096 Merge pull request #1494 from KSid/typo-docs-run-command
* Documentation: Fix typo in docs for docker run -dns
Upstream-commit: edba1af3046665bb771636e333942b0acfa87668
Component: engine
2013-08-12 04:51:56 -07:00
f87f880dcc docs/postgresql: PostgreSQL service on Docker example
Upstream-commit: d52c1490753cb924aa2aeeefc92fbe7a985f4cd3
Component: engine
2013-08-12 12:03:43 +02:00
1c6718b33c Adding a reference to ps -a
It was confusing to me as a first-time user that my docker attach command failed; I was expecting the container to run continuously, and when I couldn't attach to it, I assumed something was wrong. ps -a shows that the container still exists, which gives the user confidence to go to the next step.
Upstream-commit: 529ee848da1f1dd4b628c3396289b4bcffdbd540
Component: engine
2013-08-11 17:27:47 -07:00
01d6467840 Fix typo in docs for docker run -dns
Upstream-commit: a2fb870ce30d87aa7a08cca4c2e45c4d021c99c4
Component: engine
2013-08-11 02:04:04 +01:00
33c7b64d8e Add GitHub usernames to MAINTAINERS
Upstream-commit: 4dc04d7690a4d634d9afd93821bb8e78620c5f9f
Component: engine
2013-08-09 21:16:44 -04:00
c297029200 Merge pull request #1417 from crosbymichael/root-socket
Change daemon to listen on unix socket by default
Upstream-commit: 28d38620f03d3db969f7e63655728b21180b26e9
Component: engine
2013-08-08 17:06:49 -07:00
d9ad2761a9 Merge pull request #1447 from kermit666/image-tag-doc
doc: syntax to run a specific image tag
Upstream-commit: 06183e6cdc8c2b7cef456eaf1ac1d904b57a9650
Component: engine
2013-08-07 16:23:45 -07:00
c746f1a64f Add warning when net.ipv4.ip_forwarding = 0
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
Upstream-commit: 10190be5d74bc4b13a885f2ba27c2299c868fd19
Component: engine
2013-08-07 18:28:39 -04:00
16fcec2f1e doc: syntax to run a specific image tag
Upstream-commit: 6115348dd9e302e8323b857ae8ab1061159e69cd
Component: engine
2013-08-07 13:57:31 +02:00
2b2233fe77 Suggest installing linux-headers by default. Address #1187 and #1031
Upstream-commit: e0a6f27d1bbf053baf8a94c87fddd3f9ed30964c
Component: engine
2013-08-06 13:56:29 -07:00
e6c6ac1cfb Merge pull request #1428 from dhrp/twitterhandle
changed the twitter handle
Upstream-commit: 9130ee7513bda99a2e51fb3fbb512cd73cde810f
Component: engine
2013-08-06 13:38:22 -07:00
5081a0aa8b changed the twitter handle
Upstream-commit: 1d654f615673aecb32011bd5a28c2ac43dbbc1fb
Component: engine
2013-08-06 11:40:16 -07:00
2de21e781e Move copy command docs to api 1.4 document
Upstream-commit: 583f5868c989b9da574638ffdc532826e5070347
Component: engine
2013-08-06 16:09:54 +00:00
3ea6442a29 Add cp command and copy api endpoint
The cp command and copy api endpoint allows users
to copy files and or folders from a containers filesystem.

Closes #382
Upstream-commit: 5b8cfbe15c29efd3e72ea97ba87867590aeeba25
Component: engine
2013-08-06 16:09:54 +00:00
09df97c0f0 Merge branch 'docs-example-fix' of git://github.com/faizkhan00/docker
merges #1402
Upstream-commit: 7c03bd1e7a8c62fcbcfeaf7d11809098fb347164
Component: engine
2013-08-05 18:21:19 -07:00
810e95ee21 Change daemon to listen on unix socket by default
Upstream-commit: 8934f13615e95a0c9f4bc52eefb5c97360e114f3
Component: engine
2013-08-06 00:12:56 +00:00
ce6d62db16 Merge pull request #1387 from joevandyk/patch-1
Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
Upstream-commit: 7c9604e32beea824238c0f2ac055577feb307786
Component: engine
2013-08-05 16:14:57 -07:00
46b7e044d5 Fixed some typo's and formatting issues in remote api documentation.
Upstream-commit: ff6b6f2ce1f51c38b00d1a70376182645b4a0c85
Component: engine
2013-08-05 15:55:40 -07:00
c001846be2 Merge pull request #1303 from dhrp/update-spinx-for-man
Enabled the docs to generate manpages.
Upstream-commit: d49f141fb3dc79bc4a22bbf398410f8d712bcf36
Component: engine
2013-08-05 15:31:51 -07:00
00a7cbd80b Merge pull request #1290 from dotcloud/parallel_pull
* Runtime: Parallel pull
Upstream-commit: e54e8fa9205409e741a64c7d7746e2e548c52fc0
Component: engine
2013-08-05 14:17:29 -07:00
2bc60625b2 Merge pull request #1390 from grobie/clarify-amazon-documentation
Clarify Amazon EC2 installation type
Upstream-commit: baa4618e57eadcb320dcd0b93ab2bd0dedee7d5a
Component: engine
2013-08-05 13:26:28 -07:00
33a79b5058 Merge pull request #1404 from dnordberg/fix-base-refs
'Base' image is depreciated and should no longer be referenced in the docs.
Upstream-commit: dcc1e3562f26f86eb532c5a6724c2ae59999e28e
Component: engine
2013-08-05 13:24:05 -07:00
d457571635 rebase master
Upstream-commit: 946bbee39a33b229b9da39e0f2062d43dde8dcee
Component: engine
2013-08-05 16:25:42 +00:00
9ddc15ebda Minor typos found while reading docs
Upstream-commit: ce97a71adf879a228f352ee10b7fb62ff86bc4e6
Component: engine
2013-08-05 22:47:16 +08:00
8f44de0140 Merge pull request #1400 from gorsuch/doc-typo
* Documentation: fix a typo in the ubuntu installation guide
Upstream-commit: a37b42b57cd1f372c1583fa3b46b30120401e2ff
Component: engine
2013-08-05 07:05:27 -07:00
bd5fa21461 add docs
Upstream-commit: a97cf23355e661d0336a71b5225ad463efa41297
Component: engine
2013-08-05 11:07:27 +00:00
8681336287 'Base' is depreciated and should no longer be referenced in the docs.
https://groups.google.com/forum/\#!topic/docker-club/pEjqMgcrnqA
Upstream-commit: 51d0c9238bb01088c08048e022b948a292f815ab
Component: engine
2013-08-05 01:34:32 +03:00