eb864572ee
Merge pull request #6279 from sebastienhouzet/patch-3
...
Update dockervolumes.md
Upstream-commit: 5b85dc3584b0f4ff02874c78e8fb475f26889288
Component: engine
2014-06-08 11:33:06 -07:00
b141ed9bf5
Update dockervolumes.md
...
Error on title note :)
Upstream-commit: 752c3e9208fc44ca25d9698170d41d28a3005cee
Component: engine
2014-06-08 20:31:10 +02:00
02dc7c114e
Merge pull request #6278 from sebastienhouzet/patch-2
...
Update dockerimages.md
Upstream-commit: 7992fb5911ecbf7e18afdd64f4ead73c0362e927
Component: engine
2014-06-08 11:25:22 -07:00
967a1996ae
Update dockerimages.md
...
Error on title Note.
Upstream-commit: 5f9a673025bc5025fd4550a4c18591a66d2fd815
Component: engine
2014-06-08 20:15:31 +02:00
c9fed3e72d
Merge pull request #6272 from sebastienhouzet/patch-1
...
Update dockerizing.md
Upstream-commit: 1151f9ef9ec801fa25d2dcd8393d3aeea571ecc7
Component: engine
2014-06-08 08:39:42 -07:00
9f47d9852d
Update dockerizing.md
...
Error on title Note :)
Upstream-commit: 31e8993d5725421d5979ec7fa247e353aea122b6
Component: engine
2014-06-08 17:25:53 +02:00
d866bb2587
Merge pull request #6235 from zdover23/06_Jun_2014
...
Fixed docker commit man page typos
Upstream-commit: 259d714b9300f5b30f8da2380ae996d7b901e463
Component: engine
2014-06-07 23:15:39 -07:00
fb8eee397b
BZ#1104401
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
Upstream-commit: 8f99875d030cb282090d41fbbf8669169fbc9e2f
Component: engine
2014-06-08 14:15:37 +10:00
d0a58d4a1e
Merge pull request #6260 from vieux/disable_timeout_on_push
...
Disable timeout for push
Upstream-commit: cfd209fd6eca089fab5d0cb94a81f362b194c978
Component: engine
2014-06-07 17:24:43 -07:00
c2d0bb307f
Disable timeout for push
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 8baafacf404265c95753e63d2b7510731359c4b4
Component: engine
2014-06-07 23:48:25 +00:00
7eb900ab44
Merge pull request #6258 from crosbymichael/capkill
...
Add CAP_KILL to unprivileged containers
Upstream-commit: a2c08792f0e8477c0c185b93f7d20d59ae74e3ad
Component: engine
2014-06-08 01:37:28 +03:00
4f6cc66699
Add CAP_KILL to unprivileged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: fa72eb3a58ebfec8ef1b27d8e7aa8cbdb41733a2
Component: engine
2014-06-07 15:18:18 -07:00
51a1bf0d7b
Merge pull request #6255 from vieux/improve_trusted_detection
...
improve trusted location detection
Upstream-commit: 94dc07c0445b57038fde8d79df06fe4401eca796
Component: engine
2014-06-08 00:28:18 +03:00
9f4eb42cca
improve trusted location detection
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: daa89c420caac0881b09e2a36feff977ec43d7cd
Component: engine
2014-06-07 21:17:56 +00:00
63e43e0a44
Merge pull request #6241 from proppy/fix-google-docs
...
docs/google: fix code blocks
Upstream-commit: f7e4546af0daac44deaf59110529ebda483005fb
Component: engine
2014-06-07 09:54:21 -07:00
d889591a8d
Mention bugfixes in 0.12 changelog
...
Upstream-commit: 0c611d9b15945fc6d94cc999684483421709a3df
Component: engine
2014-06-06 13:31:10 -07:00
de4a43cde3
docs/google: fix code blocks
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: e2119f3050b225ccaf25990e5d6714dae2de7afe
Component: engine
2014-06-06 13:11:21 -07:00
b1b5a3ab57
Merge pull request #6238 from tiborvass/merge_release_v0.12.0
...
Merge release v0.12.0
Upstream-commit: 5d07362a842a67c48158dfe0edd46aecfd6f66e0
Component: engine
2014-06-06 11:55:50 -07:00
72c4f26c6c
Change version to 0.12.0-dev
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: c95f77866c18fcd75507bf72df405bc61ba50bb0
Component: engine
2014-06-06 11:45:57 -07:00
7b45d705e3
Merge pull request #6230 from tiborvass/bump_v0.12.0
...
Bump version to v0.12.0
Upstream-commit: c624caa949a19b9fe7802976c6f4bb98fa029da4
Component: engine
2014-06-06 11:41:06 -07:00
6a34dc5f38
Bump version to v0.12.0
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 14680bf724161785d164fd99de36e3eb03a823ef
Component: engine
2014-06-05 17:59:19 -07:00
2af79a6c4e
Merge pull request #6228 from vieux/fix_restart_links
...
Fix restart links
Upstream-commit: c06f32a7b9cb1cd40265a1cd42d52ed246cbe1e7
Component: engine
2014-06-05 17:54:27 -07:00
5bfe5a532a
add wait4 after kill
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 30ba7546cb5a1ff7e4915c5a25dd8d72b3bf735b
Component: engine
2014-06-06 00:32:14 +00:00
1d13810851
start containers after all of them are registered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 34bd2d622910444ae0d30bd0ac32005e224074c1
Component: engine
2014-06-06 00:31:58 +00:00
d76b5bb198
Merge pull request #6226 from fredlf/copyedits
...
More minor copy edits, typo fix.
Upstream-commit: 98d44ac491021463636c9f2ce0708f970b77c828
Component: engine
2014-06-05 17:07:18 -07:00
9b9d6c9913
Merge pull request #6227 from crosbymichael/fix-test-compile
...
Don't compile nsinit during tests (it has package main)
Upstream-commit: c6dc8275b2570472518886669c1174746fe7b67f
Component: engine
2014-06-05 18:06:31 -06:00
4a0a27b9ff
Don't compile nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 3986bc659be9ff83d521f82e3353b1f73b896cbc
Component: engine
2014-06-05 17:03:32 -07:00
fbe9e09f01
More minor copy edits, typo fix.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredfl)
Upstream-commit: 762c52850177d0eb9148e5f3a0df90c79043246b
Component: engine
2014-06-05 16:55:32 -07:00
1bb9f4a354
Merge pull request #6207 from crosbymichael/nsinit-cli
...
Make nsinit nicer to work with libcontainer
Upstream-commit: acb9f156fdf7f992d73a70c2697b62e3eb17bfc9
Component: engine
2014-06-05 16:51:31 -07:00
fac88c9900
Merge pull request #6221 from crosbymichael/no-unmount
...
Move remount as private to the graph drivers
Upstream-commit: c239c8ad9d183a03fd93948061ae79f81c335c32
Component: engine
2014-06-05 16:51:10 -07:00
12d535e2c7
Move remount as private to the graph drivers
...
If this is at the root directory for the daemon you could unmount
somones filesystem when you stop docker and this is actually only needed
for the palces that the graph drivers mount the container's root
filesystems.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 3609b051b88565c0fe0615fd47ddb48eed549d27
Component: engine
2014-06-05 16:02:25 -07:00
e7cde49487
Merge pull request #6224 from tiborvass/storage-options
...
Add --storage-opt daemon option and some devicemapper option (with fixes)
Upstream-commit: 9329c0d2e08671e3d152c11595f398ff01e5fa18
Component: engine
2014-06-05 16:00:03 -07:00
124f8c9778
Merge pull request #6145 from shykes/pr_out_pkg_testutils_utility_functions_to_facilitate_writing_go_tests
...
pkg/testutils: utility functions to facilitate writing Go tests
Upstream-commit: 2f72fdf6eac43ebb89028308a6d5a5fac0b93ecc
Component: engine
2014-06-06 01:26:53 +03:00
4092b1735f
Merge pull request #6182 from mheon/fix_manpage_issue
...
Clarify manpages on docker start
Upstream-commit: 19ef3ff1126be62c6dcb0a24a797a09ad251e5bb
Component: engine
2014-06-05 15:15:50 -07:00
9fb60c3559
Ensures files get closed properly. Closes #6213
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: b1ac791d8426cd7b6fb5a19f5e918b26c83d83f6
Component: engine
2014-06-05 15:13:43 -07:00
429e3bef53
Merge pull request #6219 from cpuguy83/fix_ssh_example_docs_root_login
...
Fixes broken ssh server example
Upstream-commit: a2c553bd6bb223fb5449f9875a8e2f40abb14994
Component: engine
2014-06-05 15:02:43 -07:00
6d3f7f2239
Merge pull request #6222 from SvenDowideit/pr_out_reflow_to_80_columns
...
Initial edits to home page
Upstream-commit: 64ce33268cda1210017f0a226846b004616e0915
Component: engine
2014-06-05 14:58:29 -07:00
cefcc5a5b7
reflow to 80 columns
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: abcb724ed90a1e68234bd9c1c0d9263557b67026
Component: engine
2014-06-06 07:58:05 +10:00
ccac994016
Initial copy edits to home page.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: SvenDowideit)
Upstream-commit: 09b19752e028f91644e3e2801f0fd616c4adc683
Component: engine
2014-06-06 07:58:04 +10:00
87c7a13363
Merge pull request #6223 from jamtur01/rl
...
Revert "Initial links for Docker Hub rename"
Upstream-commit: 6be75947abd788773ae02ffd9e2a4dd7dcd3e871
Component: engine
2014-06-05 14:56:12 -07:00
1492ef2c06
Revert "Initial links for Docker Hub rename"
...
This reverts commit 2819677c215bd409b4ce4da51f0ddfb303760796.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: fad14eda3af8b4ffa59f74dc5c6583d22bcc9471
Component: engine
2014-06-05 14:52:06 -07:00
a0d36a9d79
Merge pull request #6156 from jamtur01/links
...
Initial link update for Docs
Upstream-commit: 6fa3acc96c2d39c75193f140c5ed2e654cc77208
Component: engine
2014-06-05 14:46:33 -07:00
bd1ced896d
Merge pull request #6220 from vieux/fix_redirect
...
Only forward auth to trusted locations
Upstream-commit: cedab4d06a6e74d6567799ac4ad494884a8a9b13
Component: engine
2014-06-05 14:34:37 -07:00
19c2bab6db
Update for nsenter
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f3621531579495e7de911004d47e077d421fcfb8
Component: engine
2014-06-05 14:31:16 -07:00
9760ac9e6f
Update nsinit to be nicer to work with and test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1a3d43c23ec7bbb1aa206581acd0497c47e29a2f
Component: engine
2014-06-05 14:13:02 -07:00
51ac70314e
only forward auth to trusted locations
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: a12453186323372f4d4e23980d3f1caa2de91e5a
Component: engine
2014-06-05 19:47:33 +00:00
cdfc620fa1
Clarify effect of docker start on started container in CLI docs
...
This behavior changed from v0.9 to v0.10, so document it to prevent
any confusion.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: d08c965e2c6ed223e10773ac77f95b7b6e273e0a
Component: engine
2014-06-05 15:08:54 -04:00
15bbcd7308
Fixes broken ssh server example
...
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 04620e01547d6526023b49494919f3eb3fcf900a
Component: engine
2014-06-05 14:10:52 -04:00
af0d43a64a
Merge pull request #6215 from cpuguy83/fix_volumes_from_api_doc
...
Fixes incorrect API spec for items moved to HostConfig
Upstream-commit: 734d108ed244b34a1111d864dc9b53046e3dc0ec
Component: engine
2014-06-05 10:33:16 -07:00
81d8873d1e
Fixes incorrect API spec for items moved to HostConfig
...
DNS and VolumesFrom were moved to HostConfig and as such are part of the
container start and not create.
For some reason 0.10 docs are correct (except for a missing quote in the
JSON") but 0.11 and latest are not.
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 8c646ebf16bd0e2618cbca430bc129ee7416a21c
Component: engine
2014-06-05 09:50:27 -04:00