Andy Rothfusz
0bfa22124e
Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts
...
Conflicts:
docs/sources/examples/postgresql_service.rst
2013-12-04 18:25:58 -08:00
Solomon Hykes
c35cebaa06
Merge pull request #3031 from jamtur01/docsmaintain
...
Add James Turnbull to docs maintainers
2013-12-04 17:48:45 -08:00
Andy Rothfusz
9dfc7bc36f
Merge pull request #2834 from fj/topic/clarify-aws-instructions
...
Fix installing-on-AWS workflow description
2013-12-04 17:25:35 -08:00
Andy Rothfusz
5dab47a475
Merge pull request #2886 from jamtur01/fedora_community
...
Updated Fedora docs
2013-12-04 17:12:00 -08:00
Guillaume J. Charmes
944c1f10ea
Merge pull request #2967 from crosbymichael/return-host-config
...
Add hostconfig to container inspect
2013-12-04 16:50:42 -08:00
Andy Rothfusz
f95621fd05
Merge pull request #3033 from proppy/add-compute-docs
...
Add Google Cloud Platform installation docs
2013-12-04 15:05:07 -08:00
Johan Euphrosine
3df5d120de
docs/installation: add google compute engine quickstart
2013-12-04 12:25:22 -08:00
Andy Rothfusz
de60bee3d4
Merge pull request #2946 from dhrp/doc-postgres-typo
...
Fixed some grammar and one other line in postgres example
2013-12-04 10:51:02 -08:00
James Turnbull
0132547a38
Added myself to docs MAINTAINERS
2013-12-03 17:51:34 -05:00
James Turnbull
45567f2209
Updated Fedora docs
...
* Added Fedora installation instructions
2013-12-03 16:55:55 -05:00
Michael Crosby
664174c7aa
Add docs for hostconfig in inspect
2013-12-03 11:09:10 -08:00
John Feminella
6c70d23e0d
Fixes broken RST links; clarifies AWS instructions
2013-12-02 17:55:42 -05:00
John Feminella
c9432cf51a
Reformats source text to proper widths
2013-12-02 17:55:42 -05:00
Dustin Sallings
4ad3dfb05f
CLI docs and examples of format
2013-12-02 11:07:41 -08:00
Dustin Sallings
1d503be466
Use inspect format to get IP address for psql example
2013-12-02 11:07:41 -08:00
Victor Vieux
4b35c1b6a6
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
2013-12-02 10:59:15 -08:00
Johannes 'fish' Ziemke
e4cb83c50e
Bump api version and update docs
2013-12-02 19:27:28 +01:00
Johannes 'fish' Ziemke
b04c6466cd
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.
2013-12-02 17:52:37 +01:00
James Turnbull
39aac21db4
Updated and simplified the PG example
2013-11-30 10:58:52 -05:00
Guillaume J. Charmes
62b1faf28c
Merge pull request #2926 from crosbymichael/attach-wait
...
Return process exit code for attach
2013-11-29 18:49:24 -08:00
Thatcher
6c56993639
Merge pull request #2901 from dkumor/patch-1
...
Deleted references to AUFS in Arch docs
2013-11-28 17:39:26 -08:00
Sven Dowideit
ba5268d382
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
2013-11-29 11:22:17 +10:00
Thatcher Peskens
8291d509c2
Fixed some grammar and one other line about needing the postgresql-client for connecting to the service.
2013-11-28 17:19:26 -08:00
Thatcher
139644895e
Merge pull request #2894 from brunoqc/patch-1
...
Update postgresql's version in example
2013-11-28 17:16:25 -08:00
Michael Crosby
1fe1b216ad
Return process exit code for attach
...
Fixes #2240
2013-11-28 15:25:50 -08:00
Thatcher
a0525d90ab
Merge pull request #2937 from jwarwick/hello_world_doc
...
Remove explanation of removed argument
2013-11-28 14:35:17 -08:00
John Warwick
f1e44e0b0c
Remove explanation of removed argument
2013-11-28 09:55:15 -05:00
Alexis THOMAS
2c27da8818
Restore 'save' paragraph
2013-11-28 00:39:06 +01:00
dkumor
682a188ead
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.
2013-11-27 10:25:30 -06:00
Bruno Bigras
45b1e8c236
Update postgresql's version in example
...
It seems ppa:pitti/postgresql will be deprecated and only apt.postgresql.org has 9.3.
2013-11-27 09:55:41 -05:00
dkumor
b3e8ba1908
Arch docs: Updated dependencies to match AUR
...
The AUR packages lxc-docker and lxc-docker-git have changed their dependencies.
2013-11-26 22:07:56 -06:00
dkumor
d370a889c3
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.
2013-11-26 20:00:13 -06:00
Solomon Hykes
b6dd67c707
Merge pull request #2868 from jamtur01/ubtfixes
...
Tidied up Ubuntu installation documentation
2013-11-25 22:05:36 -08:00
Victor Vieux
4267fb66ef
Merge pull request #2866 from tianon/binaries-docs
...
Update "Binaries" installation language to point to distro packages first
2013-11-25 22:00:20 -08:00
James Turnbull
a74b512540
Tidied up Ubuntu installation documentation
2013-11-26 00:58:17 -05:00
Tianon Gravi
65fcc81b42
Update "Binaries" installation language to point to distro packages first
...
Also, added a minor consistency update to our usage of "wget".
2013-11-25 22:53:50 -07:00
Tianon Gravi
c92dab0eb4
Update Fedora placeholder to include the same "community" and "pre-1.0" warnings so we don't forget them
2013-11-25 22:48:51 -07:00
Tianon Gravi
6ad5b2bcf4
Update Arch Linux instructions to include warnings at the top like other "community" platforms
2013-11-25 22:47:15 -07:00
Tianon Gravi
4049359bee
Update the Gentoo installation docs for 0.7+
2013-11-25 22:40:24 -07:00
James Turnbull
59f76bf1c7
Installation docs update
...
* Updated TOC sort order
* Fixed some grammar in Rackspace doc
* Updated titles to remove Linux where not needed
2013-11-26 00:16:30 -05:00
Tianon Gravi
5ff74e268d
Merge pull request #2860 from jamtur01/fedora2
...
Updated Fedora docs with simple placeholder
2013-11-25 20:59:15 -08:00
James Turnbull
5242a49f3f
Updated Fedora docs
...
* Added warning to Fedora docs
2013-11-25 22:51:38 -05:00
Solomon Hykes
688e86c625
Merge pull request #2858 from jamtur01/fedora
...
Added Fedora skeleton
2013-11-25 19:10:50 -08:00
James Turnbull
750d2d8d07
Added Fedora skeleton
2013-11-25 22:06:18 -05:00
Solomon Hykes
1d903da6fd
Merge pull request #2609 from shykes/0.6.5-dm-plugin
...
Move aufs to a storage driver, add devicemapper and dummy drivers
2013-11-25 18:58:26 -08:00
Solomon Hykes
aaefb8c07c
Docs: update install pages (ubuntu and kernel requirements) to reflect the optional nature of AUFS
2013-11-26 02:45:32 +00:00
Solomon Hykes
43c7df946d
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-26 02:00:25 +00:00
Andy Rothfusz
33f70f8978
Merge pull request #2725 from SvenDowideit/docker-export-doc
...
add 'to STDOUT' to the help and give an example
2013-11-25 14:42:57 -08:00
Eystein Måløy Stenberg
937f52aef9
docker in-container process management with CFEngine
2013-11-25 14:24:23 -08:00
Andy Rothfusz
aa48acc5ec
Merge pull request #2849 from jamtur01/supervisor
...
Added a Supervisor process management example
2013-11-25 13:50:44 -08:00