Guillaume J. Charmes
b3ad330782
Merge pull request #3099 from vieux/fix_pull_build
...
added authConfig to docker build
2013-12-16 10:53:10 -08:00
Andy Rothfusz
906b481148
Merge pull request #3213 from metalivedev/1695-dockerlogs
...
Add more information about Docker logging
2013-12-13 14:29:14 -08:00
Guillaume J. Charmes
9a9ecda7c8
Merge pull request #3208 from WarheadsSE/bridgeip
...
Add -bip flag: allow specification of dynamic bridge IP via CIDR
2013-12-13 13:56:35 -08:00
Andy Rothfusz
1e85aabf71
Fix #1695 by adding more about logging.
2013-12-13 11:42:58 -08:00
WarheadsSE
a68d7f3d70
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.
2013-12-13 10:47:19 -05:00
Andy Rothfusz
2d1f61ef0e
Merge pull request #3190 from zain/master
...
Small typo fixes
2013-12-12 11:25:11 -08:00
Zain Memon
f26a9d456c
Small typo fixes
2013-12-12 01:23:16 -08:00
Anton Nikitin
bf5b949ffc
Minor spelling fix
2013-12-12 01:09:24 -05:00
Lokesh Mandvekar
8874f2aef9
keeping rhel page sorta in sync with fedora
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-11 18:26:17 -06:00
Lokesh Mandvekar
e8ec3dba7b
remove step numbers, keep consistent with fedora
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-11 18:21:52 -06:00
Andy Rothfusz
4eda2a54de
Merge pull request #3177 from tianon/fix-turnbull-github
...
Fix James's github handle in docs/MAINTAINERS
2013-12-11 16:00:06 -08:00
Andy Rothfusz
d3292078dc
Merge pull request #3176 from lsm5/rhel-docs
...
Rhel docs
2013-12-11 15:58:42 -08:00
Lokesh Mandvekar
44984602c7
more typo corrections
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-11 16:36:14 -06:00
Lokesh Mandvekar
d534e1c3a1
some typo corrections
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-11 16:20:54 -06:00
Andy Rothfusz
d56d8ab96e
Merge pull request #3174 from richo/features/https_install_script
...
Use https to get the install script
2013-12-11 14:09:22 -08:00
Andy Rothfusz
6cf8ec606e
Merge pull request #3161 from SvenDowideit/make-replace-docker-binary-note-more-obvious
...
associate swapping the built docker binary with building the binary, rather than a note in building the docs
2013-12-11 14:04:34 -08:00
Lokesh Mandvekar
db3019d50b
rhel page keywords update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-11 16:00:46 -06:00
Lokesh Mandvekar
42c38bf34d
rhel description update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-11 15:59:35 -06:00
Andy Rothfusz
11b3fbb3bd
Merge pull request #3167 from qbrossard/patch-1
...
Corrected typo (resdis -> redis)
2013-12-11 13:57:59 -08:00
Andy Rothfusz
036f41fde3
Merge pull request #3165 from SvenDowideit/cmd-rmi-example
...
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
2013-12-11 13:57:13 -08:00
Tianon Gravi
39cc8a32b1
Fix James's github handle in docs/MAINTAINERS
2013-12-11 14:13:55 -07:00
Lokesh Mandvekar
31961ccd94
rhel page only for rhel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-11 14:36:12 -06:00
Lokesh Mandvekar
eec48f93a3
rhel docs update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-11 14:34:51 -06:00
Richo Healey
81fc368a6d
Use https to get the install script
2013-12-11 11:27:36 -08:00
Quentin Brossard
af21908493
Corrected typo (resdis -> redis)
2013-12-11 13:15:27 +01:00
Sven Dowideit
7edd1f6bad
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
2013-12-11 15:54:34 +10:00
Sven Dowideit
d878632b25
add a direct example for changing the cmd that is run
2013-12-11 12:07:07 +10:00
Sven Dowideit
be13735001
associate swapping the built docker binary with building the binary, rather than a note in building the docs
2013-12-11 11:12:11 +10:00
Sven Dowideit
27646c4459
make docs is more consistent
2013-12-11 10:14:56 +10:00
Andy Rothfusz
9c1e9a5157
Fix #1229 . Update titles, fix some wrapping.
...
Make the Ambassador container explicit.
Apply Sven's suggestions.
2013-12-09 17:23:56 -08:00
James Turnbull
c9cedb4c04
Some minor cleanup of the Links use document
2013-12-09 16:47:19 -08:00
Andy Rothfusz
b7bc80cba9
Merge pull request #3109 from artagnon/arch-install
...
Update Arch installation doc
2013-12-09 15:52:54 -08:00
Andy Rothfusz
864729b96f
Merge pull request #3104 from jamtur01/uses
...
Added section on Trusted Builds
2013-12-09 15:51:52 -08:00
Isaac Dupree
e2ee5c71fc
Make it extra clear that the docker
group is root-equivalent.
2013-12-09 12:25:20 -05:00
James Turnbull
c094807a1b
Added section on Trusted Builds
2013-12-08 15:54:12 -05:00
Ramkumar Ramachandra
f832b76bdf
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>
2013-12-08 15:36:02 +05:30
Andy Rothfusz
07f7643bbc
Merge pull request #3030 from jamtur01/versions
...
Fixed #2136 - Added styles
2013-12-06 14:27:53 -08:00
Victor Vieux
228091c79e
added authConfig to docker build
2013-12-06 14:27:10 -08:00
Andy Rothfusz
6fa1463614
Merge pull request #3094 from tang0th/patch-1
...
Update archlinux.rst as packages have changed
2013-12-06 14:18:31 -08:00
Victor Vieux
becb13dc26
update doc
2013-12-06 14:09:27 -08:00
Sven Dowideit
13da09d22b
change the policy wrt $ sudo docker to simplify auto-testing
2013-12-07 07:23:53 +10:00
Andy Rothfusz
d75fc6e529
Merge pull request #3071 from lsm5/fedora-docs-update
...
use mattdm/fedora in fedora doc and other cosmetic changes
2013-12-06 11:25:10 -08:00
tang0th
02ef8ec3ca
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.
2013-12-06 15:47:24 +00:00
Shawn Landden
a69bb25820
specific kernel config
2013-12-05 23:54:23 -08:00
Andy Rothfusz
58b75f8f29
Add debian mirrors. Fixes #3045 .
2013-12-05 18:08:56 -08:00
Andy Rothfusz
f9147effac
Merge pull request #3069 from proppy/patch-1
...
docs/installation/google: add enabling Google Compute Engine step
2013-12-05 17:40:42 -08:00
Andy Rothfusz
0e2b0f284c
Merge pull request #3001 from dotcloud/api_json
...
add docs for the new json format
2013-12-05 17:35:51 -08:00
Andy Rothfusz
80dfa23da8
Merge pull request #3051 from pariviere/2490-docs-network
...
Network documentation page
2013-12-05 17:29:54 -08:00
Andy Rothfusz
4bea68dfa6
Clean up quoting, wraps, and build error on code-block.
2013-12-05 17:16:31 -08:00
Andy Rothfusz
ea0ed9a915
Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test
2013-12-05 17:03:26 -08:00