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
a47c99e75e
Use https to get the install script
...
Upstream-commit: 81fc368a6d70ef369bd16a3c090c6910851faacf
Component: engine
2013-12-11 11:27:36 -08:00
8abc4cd131
Corrected typo (resdis -> redis)
...
Upstream-commit: af21908493e570a1399bbd462803398ef34e56bc
Component: engine
2013-12-11 13:15:27 +01:00
288950b62c
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
...
Upstream-commit: 7edd1f6bad752dd89eeaa3690e219dfa748afa9c
Component: engine
2013-12-11 15:54:34 +10:00
923bfddec3
add a direct example for changing the cmd that is run
...
Upstream-commit: d878632b2548247fc9e4c2da1b2520e4c7b9420a
Component: engine
2013-12-11 12:07:07 +10:00
baafd9623d
associate swapping the built docker binary with building the binary, rather than a note in building the docs
...
Upstream-commit: be137350018608bf4a1fd01ce956f166c39988c4
Component: engine
2013-12-11 11:12:11 +10: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
e34a28d653
added authConfig to docker build
...
Upstream-commit: 228091c79ed043d1896afb04cd0573ee972c2607
Component: engine
2013-12-06 14:27:10 -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
