ca9e7bd94d
Add -bip flag: allow specification of dynamic bridge IP via CIDR
...
e.g.:
```
docker -d -bip "10.10.0.1/16"
```
If set and valid, use provided in place of trial and error from pre-defined array in network.go.
Mutually exclusive of -b option.
Upstream-commit: a68d7f3d70ab1638fd5b63a3026b211cb4e7a65e
Component: engine
2013-12-13 10:47:19 -05:00
0675a87be6
make docs is more consistent
...
Upstream-commit: 27646c445951b47a728675764d7ef2b198436156
Component: engine
2013-12-11 10:14:56 +10:00
1bde8bd6e1
Fix #1229 . Update titles, fix some wrapping.
...
Make the Ambassador container explicit.
Apply Sven's suggestions.
Upstream-commit: 9c1e9a5157b3ef7627f4b735c2b8b6d97f26dd53
Component: engine
2013-12-09 17:23:56 -08:00
5584948c34
Some minor cleanup of the Links use document
...
Upstream-commit: c9cedb4c0484c3e1879495ab5c02088ae738763e
Component: engine
2013-12-09 16:47:19 -08:00
86975238fd
Merge pull request #3109 from artagnon/arch-install
...
Update Arch installation doc
Upstream-commit: b7bc80cba90ecfe75cd621f3d437e63e3ec3fd5d
Component: engine
2013-12-09 15:52:54 -08:00
6865b89ad2
Merge pull request #3104 from jamtur01/uses
...
Added section on Trusted Builds
Upstream-commit: 864729b96fbf3fa912d2686df79ec9baf15af856
Component: engine
2013-12-09 15:51:52 -08:00
86c7a0eff5
Make it extra clear that the docker group is root-equivalent.
...
Upstream-commit: e2ee5c71fc665170db6a3a487aebb4d7f42eed0b
Component: engine
2013-12-09 12:25:20 -05:00
dd4af9a43c
Added section on Trusted Builds
...
Upstream-commit: c094807a1b8159bf237091ecc85fcbd6e2092a3e
Component: engine
2013-12-08 15:54:12 -05:00
23da3f2ced
archlinux installation doc: correct some details
...
1. The AUR package is called docker-git, not lxc-docker-git.
2. According to the official community package, docker depends on
sqlite.
3. 02ef8ec (Update archlinux.rst as packages have changed, 2013-12-06)
updated the installation instructions, but left behind residual
wording about the AUR package not being officially supported; the
community repository is officially supported.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com >
Upstream-commit: f832b76bdfafe3108af61d00171567da02482222
Component: engine
2013-12-08 15:36:02 +05:30
a30df829ac
Merge pull request #3030 from jamtur01/versions
...
Fixed #2136 - Added styles
Upstream-commit: 07f7643bbc98dd43dd073a128c33495d55b099d4
Component: engine
2013-12-06 14:27:53 -08:00
6ca0e7d37f
Merge pull request #3094 from tang0th/patch-1
...
Update archlinux.rst as packages have changed
Upstream-commit: 6fa1463614b810d725763a20aec1fb4b8c4d1c22
Component: engine
2013-12-06 14:18:31 -08:00
c3791e2e87
update doc
...
Upstream-commit: becb13dc26e8b40be4eec2da933705b2a378db35
Component: engine
2013-12-06 14:09:27 -08:00
46d11941b1
change the policy wrt $ sudo docker to simplify auto-testing
...
Upstream-commit: 13da09d22bcae553cb11b5f906d3c260db571b7d
Component: engine
2013-12-07 07:23:53 +10:00
f1753d066b
Merge pull request #3071 from lsm5/fedora-docs-update
...
use mattdm/fedora in fedora doc and other cosmetic changes
Upstream-commit: d75fc6e529a4a7279829f4229c474adf29514b8b
Component: engine
2013-12-06 11:25:10 -08:00
8dbc8f134f
Update archlinux.rst as packages have changed
...
The docker package has been added into the Arch Linux community repo, this means that the package names and installation instructions have slightly changed.
Upstream-commit: 02ef8ec3ca1a9b16b905b671ade74cf24d11bb3a
Component: engine
2013-12-06 15:47:24 +00:00
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
9597f3f794
separate block for yum update docker
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 7ab4f37d6084c98e1f725be4cc88ea76bf952eb7
Component: engine
2013-12-05 16:11:33 -06:00
b3835c5b32
add unofficial header back, yum update docker
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 5d022f04453d3bac2e17b8622f013420778e8d5b
Component: engine
2013-12-05 16:08:08 -06: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
d47883ca6a
yum upgrade on fedora not required before install
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 61fbf3d8e27541882ff7c446a7f0edfb4ed03d82
Component: engine
2013-12-05 14:21:03 -06:00
3f0ab3c931
use mattdm/fedora in fedora doc and other cosmetic changes
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: f49eb29497620de597f4690a29957f44341f3673
Component: engine
2013-12-05 14:03:17 -06: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
c6803b7bf2
Fixed #2136 - Added styles
...
Added styling for versionadded, versionchanged, and
deprecated.
Upstream-commit: 03f8a3bbae5bfc0f43e1b3a2852d1557b21c5848
Component: engine
2013-12-05 13:46:15 -05: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
