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
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
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
938c440dbd
docs/installation: add google compute engine quickstart
...
Upstream-commit: 3df5d120de4f42cc208283bf78b26ca5b21c6776
Component: engine
2013-12-04 12:25:22 -08:00
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
8fd397a50c
Updated Fedora docs
...
* Added Fedora installation instructions
Upstream-commit: 45567f2209d3450142ae8042f674269902d58e3b
Component: engine
2013-12-03 16:55:55 -05:00
aea480f046
Add docs for hostconfig in inspect
...
Upstream-commit: 664174c7aa1300b9a856eafafc01a1d416a731ff
Component: engine
2013-12-03 11:09:10 -08:00
56e5aafa16
CLI docs and examples of format
...
Upstream-commit: 4ad3dfb05f1932793cae5c8047a89660747b95b4
Component: engine
2013-12-02 11:07:41 -08:00
b0a3ce1eef
Use inspect format to get IP address for psql example
...
Upstream-commit: 1d503be4660667a27b42f7bf0c089404cabd2c9c
Component: engine
2013-12-02 11:07:41 -08:00
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
fe4ba516d1
Bump api version and update docs
...
Upstream-commit: e4cb83c50e554bfd8ae3e0a1f2be4f0fb661861d
Component: engine
2013-12-02 19:27:28 +01:00
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
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
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
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
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
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
36cc89d71d
Return process exit code for attach
...
Fixes #2240
Upstream-commit: 1fe1b216ad9b60f6b25a5dadda5fe26c3602b054
Component: engine
2013-11-28 15:25:50 -08:00
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
4b1fc75599
Remove explanation of removed argument
...
Upstream-commit: f1e44e0b0c6eff011c596008c75f7fdff09dbf5e
Component: engine
2013-11-28 09:55:15 -05:00
ac3797d133
Restore 'save' paragraph
...
Upstream-commit: 2c27da881807b6c63ef29e8033241a17c76f5ab7
Component: engine
2013-11-28 00:39:06 +01:00
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
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
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
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
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
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
2136e5ee7f
Tidied up Ubuntu installation documentation
...
Upstream-commit: a74b512540d24c89b64ca62933f4512c4804f3ed
Component: engine
2013-11-26 00:58:17 -05:00
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
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
c090d6cc77
Update Arch Linux instructions to include warnings at the top like other "community" platforms
...
Upstream-commit: 6ad5b2bcf4d04a0314583b29f9280d8000c1ee5a
Component: engine
2013-11-25 22:47:15 -07:00
e6fb344369
Update the Gentoo installation docs for 0.7+
...
Upstream-commit: 4049359beeb8a253f07e6dbac213391a7b39f362
Component: engine
2013-11-25 22:40:24 -07:00
d367eeb253
Installation docs update
...
* Updated TOC sort order
* Fixed some grammar in Rackspace doc
* Updated titles to remove Linux where not needed
Upstream-commit: 59f76bf1c707c01ea548c4f3f2fdfba74c764e63
Component: engine
2013-11-26 00:16:30 -05:00
30ac426721
Merge pull request #2860 from jamtur01/fedora2
...
Updated Fedora docs with simple placeholder
Upstream-commit: 5ff74e268d7dfddfa928d00221763b05d2cbfd61
Component: engine
2013-11-25 20:59:15 -08:00
47f399ed6b
Updated Fedora docs
...
* Added warning to Fedora docs
Upstream-commit: 5242a49f3fe2c18ca38be4798869cdc7c306af22
Component: engine
2013-11-25 22:51:38 -05:00
a9b6188d0b
Merge pull request #2858 from jamtur01/fedora
...
Added Fedora skeleton
Upstream-commit: 688e86c6256c31f283f58f353b832aeea8dfcf5d
Component: engine
2013-11-25 19:10:50 -08:00
62617e06d0
Added Fedora skeleton
...
Upstream-commit: 750d2d8d07069c54c0fbddf4ccd2ba10e9ba9dc9
Component: engine
2013-11-25 22:06:18 -05:00
acc5196685
Merge pull request #2609 from shykes/0.6.5-dm-plugin
...
Move aufs to a storage driver, add devicemapper and dummy drivers
Upstream-commit: 1d903da6fd89b0322f76bc91c07fd3dbe4d22099
Component: engine
2013-11-25 18:58:26 -08:00
7102c4c81c
Docs: update install pages (ubuntu and kernel requirements) to reflect the optional nature of AUFS
...
Upstream-commit: aaefb8c07cc39735250b0304f73f8cb0e19662bc
Component: engine
2013-11-26 02:45:32 +00:00
542c84c74e
Merge branch 'master' into 0.6.5-dm-plugin
...
Upstream-commit: 43c7df946d56a9d9d0e0b7226042a0dd6a58a17b
Component: engine
2013-11-26 02:00:25 +00:00
c1bd7eb1b4
Merge pull request #2725 from SvenDowideit/docker-export-doc
...
add 'to STDOUT' to the help and give an example
Upstream-commit: 33f70f8978b175915fbc71b2e82694c911a69741
Component: engine
2013-11-25 14:42:57 -08:00
f9b4bbea9e
docker in-container process management with CFEngine
...
Upstream-commit: 937f52aef98ac61bca75ef25c16b79b5fafa58ff
Component: engine
2013-11-25 14:24:23 -08:00
2f62549ee3
Merge pull request #2849 from jamtur01/supervisor
...
Added a Supervisor process management example
Upstream-commit: aa48acc5ec6621a9fb720fa00772fb8eeaa2be7a
Component: engine
2013-11-25 13:50:44 -08:00
88286721b0
Merge pull request #2836 from fj/topic/spinx⇒sphinx
...
Corrects misspellings of 'Sphinx'
Upstream-commit: ac70e296dbc55a60bd8d6fce7b1fb4a260a91fb1
Component: engine
2013-11-25 13:40:26 -08:00
e6304d10dd
Merge pull request #2835 from fj/topic/update-native-installation-instructions
...
Use requirements.txt rather than manual installation for docs
Upstream-commit: e2c3860ec3c69acdda87959927ba3c4fccee4df9
Component: engine
2013-11-25 13:28:18 -08:00
2a6a9722d8
Merge pull request #2833 from twillouer/patch-1
...
Better copy/paste :)
Upstream-commit: 2d715bf3c0ce37e31553f35fbab2112df482c46d
Component: engine
2013-11-25 13:21:50 -08:00
8d1f8e4c83
Added a Supervisor process management example
...
Upstream-commit: ba2b36e192c571566fa4769b1031d120c26b8ae0
Component: engine
2013-11-25 14:05:01 -05:00
5c5c144532
Add daemon docs with selecting graph driver
...
Upstream-commit: d8f4b733f243a3da6cf5571f44b94b7109f326c4
Component: engine
2013-11-25 09:44:55 -08:00
a92bcacbc2
Better copy/paste :)
...
Upstream-commit: 0a89db04fe62958283c17baa11893c6ad868bf9d
Component: engine
2013-11-24 13:55:53 +01:00
51f543bb50
Corrects misspellings of 'Sphinx'
...
Upstream-commit: 1cce9f25b2866883b3f1c784ea642df4e69ca6bd
Component: engine
2013-11-23 16:21:27 -05:00
