Commit Graph

1256 Commits

Author SHA1 Message Date
Sven Dowideit 9a46759761 use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
Upstream-commit: e9bf971e69800f1189dd240d95972f5f0dcc3bec
Component: engine
2013-12-05 21:48:35 +10:00
Roberto Gandolfo Hashioka 534fc04e4e - Added link to the source code repo on github
Upstream-commit: 909da5d5249880b02bad5fb893d12fe2a3fdd942
Component: engine
2013-12-04 21:08:44 -08:00
Sven Dowideit 8519def9b4 add a little prose to tell the user that run creates a container, and then starts it
Upstream-commit: 04c32495f69a48c34b753b66d7cdc4f2c695f405
Component: engine
2013-12-05 14:20:16 +10:00
Sven Dowideit 53cfdbe273 I was reading the doc, and noticed that some examples didnt use $ sudo docker, so this makes it a little more consistent
Upstream-commit: af020e2d67256d386e43741071dc4855735d92a3
Component: engine
2013-12-05 14:14:08 +10:00
Andy Rothfusz 25e3f85d24 Merge pull request #2991 from fortybillion/patch-1
API documentation: added format of Volumes and Binds parameters to "create" and "start" 
Upstream-commit: 94d46a8d3a2278962c30c01e831754d6cefe9b2e
Component: engine
2013-12-04 18:32:19 -08:00
Andy Rothfusz e5d73f33fc Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts
Conflicts:
	docs/sources/examples/postgresql_service.rst
Upstream-commit: 0bfa22124e87197be8ce47cee4e998eb9d6891b5
Component: engine
2013-12-04 18:25:58 -08:00
Solomon Hykes 6e5bbd93f0 Add Sven Dowideit to docs maintainers
Upstream-commit: b4e21ad1da616ab46669401dc7d62a6e19b05619
Component: engine
2013-12-04 17:50:33 -08:00
Solomon Hykes 8c8b421058 Merge pull request #3031 from jamtur01/docsmaintain
Add James Turnbull to docs maintainers
Upstream-commit: c35cebaa06477133a454ab8b2e3765e320ef8503
Component: engine
2013-12-04 17:48:45 -08:00
Andy Rothfusz 26d53f3ec4 Merge pull request #2834 from fj/topic/clarify-aws-instructions
Fix installing-on-AWS workflow description
Upstream-commit: 9dfc7bc36f51972ade2c6325b452f997f1583a4a
Component: engine
2013-12-04 17:25:35 -08:00
Andy Rothfusz 86c79e6a69 Merge pull request #2886 from jamtur01/fedora_community
Updated Fedora docs
Upstream-commit: 5dab47a475fe64d11834133d0689104b4e4c57ba
Component: engine
2013-12-04 17:12:00 -08:00
Guillaume J. Charmes 991a112d99 Merge pull request #2967 from crosbymichael/return-host-config
Add hostconfig to container inspect
Upstream-commit: 944c1f10eadd98a8044cd869e81badd897f96f1f
Component: engine
2013-12-04 16:50:42 -08:00
Andy Rothfusz 1fbf17a644 Merge pull request #3033 from proppy/add-compute-docs
Add Google Cloud Platform installation docs
Upstream-commit: f95621fd054004e8cc438c1bb443c3df6823d45e
Component: engine
2013-12-04 15:05:07 -08:00
Johan Euphrosine 938c440dbd docs/installation: add google compute engine quickstart
Upstream-commit: 3df5d120de4f42cc208283bf78b26ca5b21c6776
Component: engine
2013-12-04 12:25:22 -08:00
Andy Rothfusz dce2c8c9b7 Merge pull request #2946 from dhrp/doc-postgres-typo
Fixed some grammar and one other line in postgres example
Upstream-commit: de60bee3d4f34cdc61120463851fb996c4d8eb4c
Component: engine
2013-12-04 10:51:02 -08:00
Sven Dowideit 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
Roberto Gandolfo Hashioka b230abcf63 - Updated the doc with the current implementation status
Upstream-commit: 58c33360b01748f4900dd00dc57c3aec89a98e27
Component: engine
2013-12-03 16:39:23 -08:00
James Turnbull b4dda37afd Added myself to docs MAINTAINERS
Upstream-commit: 0132547a385697f3fee1e6bf9fe3fa07c98f3fd0
Component: engine
2013-12-03 17:51:34 -05:00
James Turnbull 8fd397a50c Updated Fedora docs
* Added Fedora installation instructions
Upstream-commit: 45567f2209d3450142ae8042f674269902d58e3b
Component: engine
2013-12-03 16:55:55 -05:00
James Turnbull 1f27c8a370 Added note about Ubuntu curl installation
Upstream-commit: 64439505c7801214d4e01941c2e92d64261ab137
Component: engine
2013-12-03 14:37:01 -05:00
Michael Crosby aea480f046 Add docs for hostconfig in inspect
Upstream-commit: 664174c7aa1300b9a856eafafc01a1d416a731ff
Component: engine
2013-12-03 11:09:10 -08:00
Marek Goldmann 9b091fc10b Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS.
Upstream-commit: 682cf48d1db0851789b593db732ed3801e765d56
Component: engine
2013-12-03 11:25:53 +01:00
Sven Dowideit 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
John Feminella 1ba0ef805d Fixes broken RST links; clarifies AWS instructions
Upstream-commit: 6c70d23e0d850b31fce0e658ad9ddd7a167bcdcb
Component: engine
2013-12-02 17:55:42 -05:00
John Feminella 22aa07cf7a Reformats source text to proper widths
Upstream-commit: c9432cf51aea9351cc88791036b986e6662a49b8
Component: engine
2013-12-02 17:55:42 -05:00
Tianon Gravi 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
Dustin Sallings 56e5aafa16 CLI docs and examples of format
Upstream-commit: 4ad3dfb05f1932793cae5c8047a89660747b95b4
Component: engine
2013-12-02 11:07:41 -08:00
Dustin Sallings b0a3ce1eef Use inspect format to get IP address for psql example
Upstream-commit: 1d503be4660667a27b42f7bf0c089404cabd2c9c
Component: engine
2013-12-02 11:07:41 -08:00
Victor Vieux 128e1b30b4 Merge pull request #2728 from SvenDowideit/docker-import-doc
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
Upstream-commit: 4b35c1b6a6167a0dce11cd748c94598199dce942
Component: engine
2013-12-02 10:59:15 -08:00
Johannes 'fish' Ziemke fe4ba516d1 Bump api version and update docs
Upstream-commit: e4cb83c50e554bfd8ae3e0a1f2be4f0fb661861d
Component: engine
2013-12-02 19:27:28 +01:00
Johannes 'fish' Ziemke 85e4b81e0c Make docker build return exit code of build step
If a command during build fails, `docker build` now returns with
the exit code of that command.

This makes it necessary to change the build api endpoint to
return a json object stream.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
2013-12-02 17:52:37 +01:00
Ben Sargent 9da56ff82a Added format of Volumes and Binds parameters to create and start
* Added sample Volumes parameter to container create API.
* Added PortBindings and PublishAllPorts parameter to container start API
* Added note to container start about Binds needed to be declared as Volumes during container create.
Upstream-commit: b9ad0c9f742a3e48ad06770abb362048306c763e
Component: engine
2013-12-02 16:52:12 +00:00
James Turnbull 801d5c9c0f Updated and simplified the PG example
Upstream-commit: 39aac21db47b3bcbf651008267ad1142f1213103
Component: engine
2013-11-30 10:58:52 -05:00
Guillaume J. Charmes 2c50a80ad5 Merge pull request #2926 from crosbymichael/attach-wait
Return process exit code for attach
Upstream-commit: 62b1faf28c25a678a50f59251cccd2316239cc4a
Component: engine
2013-11-29 18:49:24 -08:00
Thatcher 4a247aee4e Merge pull request #2901 from dkumor/patch-1
Deleted references to AUFS in Arch docs
Upstream-commit: 6c5699363954d145bd51c6069db587b1aceece8a
Component: engine
2013-11-28 17:39:26 -08:00
Sven Dowideit 98a6754c91 re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
Upstream-commit: ba5268d382dec7b731717feec77b6e7d2e6cfdaf
Component: engine
2013-11-29 11:22:17 +10:00
Thatcher Peskens be864815d2 Fixed some grammar and one other line about needing the postgresql-client for connecting to the service.
Upstream-commit: 8291d509c234779dff081ab579b6ff30358e7501
Component: engine
2013-11-28 17:19:26 -08:00
Thatcher b5bdf9e788 Merge pull request #2894 from brunoqc/patch-1
Update postgresql's version in example
Upstream-commit: 139644895e39fd452d0aa7b2835f4bdd0f2ec461
Component: engine
2013-11-28 17:16:25 -08:00
Michael Crosby 36cc89d71d Return process exit code for attach
Fixes #2240
Upstream-commit: 1fe1b216ad9b60f6b25a5dadda5fe26c3602b054
Component: engine
2013-11-28 15:25:50 -08:00
Thatcher 7a655fcbd8 Merge pull request #2937 from jwarwick/hello_world_doc
Remove explanation of removed argument
Upstream-commit: a0525d90abd7ab3c95ae90302ffcc8c69fe6f429
Component: engine
2013-11-28 14:35:17 -08:00
John Warwick 4b1fc75599 Remove explanation of removed argument
Upstream-commit: f1e44e0b0c6eff011c596008c75f7fdff09dbf5e
Component: engine
2013-11-28 09:55:15 -05:00
Alexis THOMAS ac3797d133 Restore 'save' paragraph
Upstream-commit: 2c27da881807b6c63ef29e8033241a17c76f5ab7
Component: engine
2013-11-28 00:39:06 +01:00
dkumor 910f11878c Arch docs: Added lxc-docker-nightly AUR package, modified deps
lxc-docker-nightly installs latest build. Removed go from dependencies, as it is not needed in lxc-docker and lxc-docker-nightly. The -git package will flag go as a dependency upon installation.
Upstream-commit: 682a188ead44e93ac3d5cc53c708808fa7d2fe4f
Component: engine
2013-11-27 10:25:30 -06:00
Bruno Bigras ac21fde93d Update postgresql's version in example
It seems ppa:pitti/postgresql will be deprecated and only apt.postgresql.org has 9.3.
Upstream-commit: 45b1e8c2362b3626ccc564496e3093386bb89cd9
Component: engine
2013-11-27 09:55:41 -05:00
dkumor 940806c07b Arch docs: Updated dependencies to match AUR
The AUR packages lxc-docker and lxc-docker-git have changed their dependencies.
Upstream-commit: b3e8ba19085732d9f633e4cbddb660f5f8dc5462
Component: engine
2013-11-26 22:07:56 -06:00
dkumor 8009f3eca3 Deleted references to AUFS
AUFS is no longer a dependency (both lxc-docker and lxc-docker-git are >=0.7), and the Arch kernel doesn't need to be replaced with AUFS_friendly.
Upstream-commit: d370a889c37b762a8ddf7e29a8e666fd7cedec3d
Component: engine
2013-11-26 20:00:13 -06:00
Solomon Hykes a9075c1b0d Merge pull request #2868 from jamtur01/ubtfixes
Tidied up Ubuntu installation documentation
Upstream-commit: b6dd67c70779d42dc36dd662becb247b79a7c083
Component: engine
2013-11-25 22:05:36 -08:00
Victor Vieux 36c5097638 Merge pull request #2866 from tianon/binaries-docs
Update "Binaries" installation language to point to distro packages first
Upstream-commit: 4267fb66efd36e0c8cf564feb1e6d570902c45b1
Component: engine
2013-11-25 22:00:20 -08:00
James Turnbull 2136e5ee7f Tidied up Ubuntu installation documentation
Upstream-commit: a74b512540d24c89b64ca62933f4512c4804f3ed
Component: engine
2013-11-26 00:58:17 -05:00
Tianon Gravi ff01a9f153 Update "Binaries" installation language to point to distro packages first
Also, added a minor consistency update to our usage of "wget".
Upstream-commit: 65fcc81b426ced8f416da3260770705ac7c90580
Component: engine
2013-11-25 22:53:50 -07:00
Tianon Gravi 1113ee60b9 Update Fedora placeholder to include the same "community" and "pre-1.0" warnings so we don't forget them
Upstream-commit: c92dab0eb4db57fd880c7b0bbf84d7288d048fef
Component: engine
2013-11-25 22:48:51 -07:00