fd15c72b59
Merge pull request #3289 from crosbymichael/add-mtu-option
...
Allow mtu to be configured at daemon start
Upstream-commit: aa619de748e2337f6bb7aac62c212811ac709c1e
Component: engine
2013-12-20 13:21:56 -08:00
44050b9219
Allow mtu to be configured at daemon start
...
Upstream-commit: 566ff54d0ddffbeb3ba2e5f1e400db8528faf0a7
Component: engine
2013-12-20 12:12:03 -05:00
31ff556216
Merge pull request #3286 from pandrew/3279-documentation-docker-inspect
...
Update docs to include images for docker inspect
Upstream-commit: efde305c05fe1969b6116f4ee777e5c37d30d139
Component: engine
2013-12-19 14:50:55 -08:00
f4c2be3a58
Update docs to include images for docker inspect
...
Upstream-commit: 8072d3a4e009f404fbc31507887c3418ea7327fc
Component: engine
2013-12-19 20:55:19 +01:00
b1321196bf
Added some more items to the FAQ
...
Upstream-commit: 8c52140059c83b9ef6f4f9336f162945cd360c4f
Component: engine
2013-12-19 14:27:47 -05:00
5fd54c24bc
Use box-drawing characters in docker images -tree
...
This makes the output of `docker images -tree` look a little prettier.
Previously it displayed a combination of box-drawing characters and pipe
characters, so the lines didn't quite connect...
Before:
└─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
|─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
| └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
| └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
After:
└─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
├─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
│ └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
│ └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
Upstream-commit: d14c162fd621da809baa48e8af007443c4f2ae0a
Component: engine
2013-12-18 22:30:21 -08:00
5f28e84d16
Merge pull request #3128 from codeaholics/1530-improve-error-message
...
Improve error message when refusing to remove image due to multiple repo tags
Upstream-commit: 70c7220a990ba522a12baed8d8c7aa06af7f8547
Component: engine
2013-12-17 20:49:25 -08:00
7df1c5a0f0
Merge pull request #3234 from creack/default_unix_path
...
Default unix path
Upstream-commit: 1acefac97eafdb8e701763da8616b607be4f0510
Component: engine
2013-12-17 16:24:01 -08:00
ddd720195c
Merge pull request #3228 from maztaim/patch-1
...
Update binaries.rst
Upstream-commit: f630fbc7cf76fb123efff855de465a140e470754
Component: engine
2013-12-17 13:10:08 -08:00
295882518c
Update docker_remote_api.rst to reflect that the latest remote API version is 1.8
...
Upstream-commit: c4444ce48fac417847f95a11024667d48e715a52
Component: engine
2013-12-17 11:48:21 -08:00
80983f7def
Merge pull request #3236 from dhrp/doc-master-warning
...
Added warning when browsing master. & no longer hides alternative versions
Upstream-commit: 7ba0f1f421fea08728675d9ec424b97ad51cd695
Component: engine
2013-12-17 11:17:17 -08:00
57ff515d90
Merge pull request #3249 from tianon/fix-sphinx-warning
...
Fix minor sphinx warning
Upstream-commit: 30454bb85ca30cec9e904e75f5d9c4e436d54858
Component: engine
2013-12-17 11:03:44 -08:00
9af351f520
Merge pull request #3248 from lsm5/docker-fedora-conflict
...
Docker fedora conflict
Upstream-commit: 2deb0c3365a5d0f8825c7fd2139f3a6cdcba2016
Component: engine
2013-12-17 11:01:37 -08:00
96dc4ccb26
Removed unnessary span element from version floater and
...
Replaced social footer by the one from www.docker.io
Upstream-commit: efc0610c0eec78850e0fc1e4f09bb294693a31e5
Component: engine
2013-12-17 10:39:22 -08:00
ab2b80c344
Merge pull request #3221 from jamtur01/introlink
...
Updated Introduction link
Upstream-commit: 391676b59875ef08e3f42bd4a80fde9b5c100f32
Component: engine
2013-12-17 10:36:00 -08:00
2756066cbe
Fix minor sphinx warning
...
Upstream-commit: 81d112cb7fc19e4919f9916c08d8409c74aa117a
Component: engine
2013-12-17 10:38:55 -07:00
2b1ed3c336
Fedora first letter capitalize and misc. rewording
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 25be0b1e987934ca39085894730b54f4bbcd8ad2
Component: engine
2013-12-17 11:32:40 -06:00
3fa358de88
docker and docker-io conflict update for epel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 30b4a0f76a63f24f96ba588216990f0ae7cd60a2
Component: engine
2013-12-17 10:56:31 -06:00
fccc41956a
update fedora doc: docker and docker-io conflict
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 7d95145b76decc511bc78d887ec3843bd182e58a
Component: engine
2013-12-17 10:33:52 -06:00
43c7f2497f
Update docs
...
Upstream-commit: 379a7fab0717475353e3f6f4ac0ccbc13a55e86e
Component: engine
2013-12-17 07:55:36 -08:00
fe64f8a242
Improve error message when refusing to remove image due to multiple repo tags
...
Upstream-commit: c3705e83e7eac1e67dbb9c6fc354063bbe43eae6
Component: engine
2013-12-17 12:34:25 +00:00
ffd30c0904
Added warning when browsing master. & no longer hides alternative versions.
...
Upstream-commit: 746ae155fb5a17c9f31873ad6d387b58574849ba
Component: engine
2013-12-16 18:36:35 -08:00
3002a11d90
Improvement upon @SvenDowideit suggestion to make the docs use full-width
...
Moved the style comments source to into the .less file
Upstream-commit: fe956ad4495f0ed566bf20cb9cd10e0c54ccef6b
Component: engine
2013-12-16 14:37:56 -08:00
f583fe51af
Merge branch 'use-complete-width-of-browser-for-docs' of github.com:SvenDowideit/docker into SvenDowideit-use-complete-width-of-browser-for-docs
...
Upstream-commit: fa48f17493d4f182294fe2228d7f5ecd53447ed5
Component: engine
2013-12-16 13:08:00 -08:00
e18bf01fe0
Merge pull request #3099 from vieux/fix_pull_build
...
added authConfig to docker build
Upstream-commit: b3ad3307829dc4601cb996be3d6d8cfa37e71c79
Component: engine
2013-12-16 10:53:10 -08:00
f78ee734d9
Update binaries.rst
...
Along with the kernel requirement, you need a working copy of lxc. When trying to start using "/docker -d", received error 'initapi: exec: "lxc-start": executable file not found in $PATH'
Upstream-commit: 67215250686687134788c4826f3d9eccb9981344
Component: engine
2013-12-16 12:04:29 -05:00
638d177a3b
please, don't use 30% of the screen for whitespace, and thus compress the examples so they are ~80 chars wide - the output of 'docker ps' and 'docker images' becomes needlessly unreadable
...
Upstream-commit: e1efd4cb8c6a5c645285b1f39d4508419e5626c9
Component: engine
2013-12-16 13:24:35 +10:00
bc3c34fbfd
Updated Introduction link
...
Previously the introduction link pointed to www.docker.io. That
did not seem to make a lot of sense to me so instead I pointed it
at:
http://www.docker.io/learn_more/
Upstream-commit: 58daccab26bb9bcdbf4b14c20cc6dd0b257aa6b3
Component: engine
2013-12-15 03:13:41 -05:00
ffe3e370f1
Merge pull request #3213 from metalivedev/1695-dockerlogs
...
Add more information about Docker logging
Upstream-commit: 906b481148d8355f3cab2271d55ecf64d2d46102
Component: engine
2013-12-13 14:29:14 -08:00
8638e1b670
Merge pull request #3208 from WarheadsSE/bridgeip
...
Add -bip flag: allow specification of dynamic bridge IP via CIDR
Upstream-commit: 9a9ecda7c8034534130a37a469a66e90c51799f8
Component: engine
2013-12-13 13:56:35 -08:00
a0d092fa16
Fix #1695 by adding more about logging.
...
Upstream-commit: 1e85aabf710b2bc8d47027973fe19f4f10a5ba1e
Component: engine
2013-12-13 11:42:58 -08:00
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
6c5256e4e3
Merge pull request #3190 from zain/master
...
Small typo fixes
Upstream-commit: 2d1f61ef0ec93539fd55f27cbd6f08ef0f0f33d2
Component: engine
2013-12-12 11:25:11 -08:00
641d703cbd
Small typo fixes
...
Upstream-commit: f26a9d456ca267b0346077b98fc447b99319d8b9
Component: engine
2013-12-12 01:23:16 -08:00
147d85142c
Minor spelling fix
...
Upstream-commit: bf5b949ffc005127399db51f8f49c3c8cc4736bc
Component: engine
2013-12-12 01:09:24 -05:00
80136f3a4a
keeping rhel page sorta in sync with fedora
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 8874f2aef9ed12574160394fd7a6a254c0ef0526
Component: engine
2013-12-11 18:26:17 -06:00
8caad93e85
remove step numbers, keep consistent with fedora
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: e8ec3dba7b1eb9254a04c852ffe7d98d10d0d476
Component: engine
2013-12-11 18:21:52 -06:00
a47c0933c1
Merge pull request #3177 from tianon/fix-turnbull-github
...
Fix James's github handle in docs/MAINTAINERS
Upstream-commit: 4eda2a54de9d1033d5be4925ae4aa6fb3b4508d9
Component: engine
2013-12-11 16:00:06 -08:00
b20c07a32a
Merge pull request #3176 from lsm5/rhel-docs
...
Rhel docs
Upstream-commit: d3292078dc501b8afc94c87554184789757586e7
Component: engine
2013-12-11 15:58:42 -08:00
256dcd7255
more typo corrections
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 44984602c7c7460454531c22ee4dfab2a34fa334
Component: engine
2013-12-11 16:36:14 -06:00
51019ea44e
some typo corrections
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: d534e1c3a1e00786d63e9dbeffceb6ab7f51c92b
Component: engine
2013-12-11 16:20:54 -06:00
1f4103a07d
Merge pull request #3174 from richo/features/https_install_script
...
Use https to get the install script
Upstream-commit: d56d8ab96eff194619624a5b09749ebb960743ad
Component: engine
2013-12-11 14:09:22 -08:00
ef604cf7d9
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
Upstream-commit: 6cf8ec606ee6826c65efe4275cd819002bacb9a5
Component: engine
2013-12-11 14:04:34 -08:00
18d434e8aa
rhel page keywords update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: db3019d50b7a38dd52d8ad959017c63b04f11462
Component: engine
2013-12-11 16:00:46 -06:00
f68960fa0e
rhel description update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 42c38bf34dff7a5af4c75646b7252d3ecbdd334a
Component: engine
2013-12-11 15:59:35 -06:00
851d8d4fe9
Merge pull request #3167 from qbrossard/patch-1
...
Corrected typo (resdis -> redis)
Upstream-commit: 11b3fbb3bdedfeb65ae002a6feaa336a7a8c7c5b
Component: engine
2013-12-11 13:57:59 -08:00
562bdffce3
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 :)
Upstream-commit: 036f41fde395d0f567b08996836aeb7e217729f3
Component: engine
2013-12-11 13:57:13 -08:00
b98e3d0286
Fix James's github handle in docs/MAINTAINERS
...
Upstream-commit: 39cc8a32b1dcf6dcb9462fbc2768ae035e8095dc
Component: engine
2013-12-11 14:13:55 -07:00
17c7de8491
rhel page only for rhel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 31961ccd94bc2d0941d3062591206a58b3b451a1
Component: engine
2013-12-11 14:36:12 -06:00
c55d5472f2
rhel docs update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: eec48f93a36873b8255c1c533b0d2bfbd742f9fa
Component: engine
2013-12-11 14:34:51 -06:00
