7e3fb2e06b
specific kernel config
...
Upstream-commit: a69bb25820df8951151c8c6cb5952ba5496463db
Component: engine
2013-12-05 23:54:23 -08:00
6671f362c6
Add debian mirrors. Fixes #3045 .
...
Upstream-commit: 58b75f8f29b5fff388ec3d8d84249e122462c137
Component: engine
2013-12-05 18:08:56 -08:00
900b5e498f
Merge pull request #3069 from proppy/patch-1
...
docs/installation/google: add enabling Google Compute Engine step
Upstream-commit: f9147effac69e9746b6aae5af9d37bf437aa6c2d
Component: engine
2013-12-05 17:40:42 -08:00
1a871cfdd1
Merge pull request #3001 from dotcloud/api_json
...
add docs for the new json format
Upstream-commit: 0e2b0f284c1acfbb152ccca77417b4e132a4355b
Component: engine
2013-12-05 17:35:51 -08:00
5115cf8685
Merge pull request #3051 from pariviere/2490-docs-network
...
Network documentation page
Upstream-commit: 80dfa23da8359618a2453cb1cb3cb5fa69bb71f8
Component: engine
2013-12-05 17:29:54 -08:00
fec117a06e
Clean up quoting, wraps, and build error on code-block.
...
Upstream-commit: 4bea68dfa6a9c68232ff7a5c36c85fc827dae938
Component: engine
2013-12-05 17:16:31 -08:00
41a5e644a5
Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test
...
Upstream-commit: ea0ed9a9159de98c444c6a83649ae2eb51da1c84
Component: engine
2013-12-05 17:03:26 -08:00
9b49298d93
Merge pull request #2358 from tianon/mkimage-rinse
...
Remove mkimage-centos.sh in favor of a new rinse-based script...
Upstream-commit: 584164177ea0036c4d3503bf45645b44a9bb05d5
Component: engine
2013-12-05 16:07:59 -08:00
dd568b3dd1
Merge pull request #3065 from SvenDowideit/use-makefile-in-devenv-documentation
...
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
Upstream-commit: 81b25fde7998cb9f5720844e5d487f73c7942d07
Component: engine
2013-12-05 15:27:36 -08:00
8a00a3de0b
Merge pull request #3062 from SvenDowideit/cli-examples-dollar-sudo-docker
...
Some examples didnt use $ sudo docker, so this makes it a little more consistent
Upstream-commit: 0189a994715f0ca141c7af289ede6d553c12b78e
Component: engine
2013-12-05 15:25:09 -08:00
c8f60ad629
Merge pull request #3061 from shykes/sven-doc-maintainers
...
Add Sven Dowideit to docs maintainers
Upstream-commit: 9320f4e2d1caf0b3d84388808c23767543987fd0
Component: engine
2013-12-05 15:17:34 -08:00
322ee3f0e8
refs #2490 : add a network page to docs
...
Upstream-commit: eac95671f50a65279f8c39341c4f3be680add98a
Component: engine
2013-12-05 23:40:33 +01:00
f9d6ff33ee
include Red Hat Enterprise, should have part of #3011
...
oops, forgot the index!
Upstream-commit: a96bf7439774d905f72e835218c72a5b45da37c0
Component: engine
2013-12-05 14:34:10 -08:00
89905dc61d
Merge pull request #3011 from goldmann/rhel_instructions
...
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS
Upstream-commit: cc0466bb685ad9c393e282860734282659a4b409
Component: engine
2013-12-05 14:30:31 -08:00
8592a6729a
Merge pull request #3034 from rogaha/fix_doc_registry_index_spec
...
- Updated the doc according to the current implementation status
Upstream-commit: 0a7e0f081958e3b12ad7941ace04af0fb5ef675b
Component: engine
2013-12-05 14:24:13 -08:00
629f490217
Merge pull request #3074 from crosbymichael/dm-history-calc
...
Save layersize on pull
Upstream-commit: ef157cee30795229d781c6b91dafded75c3e96c0
Component: engine
2013-12-05 14:13:03 -08:00
18b9488ee1
Save layersize on pull
...
Do not display size and virtual size on the cli.
Only display virtual size on the cli
Upstream-commit: 697707e4afe6f1e7e5e33c24ada2f1f2af279142
Component: engine
2013-12-05 14:03:23 -08:00
754f4c422f
Merge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example
...
add an example of docker ps, and also of link aliases
Upstream-commit: e3c3f3c324e37536cc582f91b8963ba10d337417
Component: engine
2013-12-05 14:00:53 -08:00
f81857be89
Merge pull request #3024 from jamtur01/ubunturepo
...
Added note about Ubuntu curl installation
Upstream-commit: 4188cd6bcd6d078ebf2bc72d5685970965453a96
Component: engine
2013-12-05 11:27:46 -08:00
370b2a74f3
Merge pull request #3038 from SvenDowideit/2485-ambassador-pattern-doc
...
initial stab at writing a use/ambassador-pattern howto
Upstream-commit: e304e8936b4f23c875dfe18e07763642cdf73a64
Component: engine
2013-12-05 11:01:27 -08:00
20fd83bd52
add docs for the new json format
...
Upstream-commit: f95f2789f274f3d98ea77cd6c10b899aa3db2dc6
Component: engine
2013-12-05 10:12:22 -08:00
94326d728b
docs/installation/google: add enabling Google Compute Engine step
...
Upstream-commit: 5a17c208cd4858a21d38b09e60ee8199880f02bb
Component: engine
2013-12-05 09:43:08 -08:00
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
534fc04e4e
- Added link to the source code repo on github
...
Upstream-commit: 909da5d5249880b02bad5fb893d12fe2a3fdd942
Component: engine
2013-12-04 21:08:44 -08:00
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
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
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
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
6e5bbd93f0
Add Sven Dowideit to docs maintainers
...
Upstream-commit: b4e21ad1da616ab46669401dc7d62a6e19b05619
Component: engine
2013-12-04 17:50:33 -08:00
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
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
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
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
b230abcf63
- Updated the doc with the current implementation status
...
Upstream-commit: 58c33360b01748f4900dd00dc57c3aec89a98e27
Component: engine
2013-12-03 16:39:23 -08:00
b4dda37afd
Added myself to docs MAINTAINERS
...
Upstream-commit: 0132547a385697f3fee1e6bf9fe3fa07c98f3fd0
Component: engine
2013-12-03 17:51:34 -05:00
8fd397a50c
Updated Fedora docs
...
* Added Fedora installation instructions
Upstream-commit: 45567f2209d3450142ae8042f674269902d58e3b
Component: engine
2013-12-03 16:55:55 -05:00
1f27c8a370
Added note about Ubuntu curl installation
...
Upstream-commit: 64439505c7801214d4e01941c2e92d64261ab137
Component: engine
2013-12-03 14:37:01 -05:00
aea480f046
Add docs for hostconfig in inspect
...
Upstream-commit: 664174c7aa1300b9a856eafafc01a1d416a731ff
Component: engine
2013-12-03 11:09:10 -08:00
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
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
1ba0ef805d
Fixes broken RST links; clarifies AWS instructions
...
Upstream-commit: 6c70d23e0d850b31fce0e658ad9ddd7a167bcdcb
Component: engine
2013-12-02 17:55:42 -05:00
22aa07cf7a
Reformats source text to proper widths
...
Upstream-commit: c9432cf51aea9351cc88791036b986e6662a49b8
Component: engine
2013-12-02 17:55:42 -05:00
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
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
