Sébastien
b141ed9bf5
Update dockervolumes.md
...
Error on title note :)
Upstream-commit: 752c3e9208fc44ca25d9698170d41d28a3005cee
Component: engine
2014-06-08 20:31:10 +02:00
Sébastien
967a1996ae
Update dockerimages.md
...
Error on title Note.
Upstream-commit: 5f9a673025bc5025fd4550a4c18591a66d2fd815
Component: engine
2014-06-08 20:15:31 +02:00
Sébastien
9f47d9852d
Update dockerizing.md
...
Error on title Note :)
Upstream-commit: 31e8993d5725421d5979ec7fa247e353aea122b6
Component: engine
2014-06-08 17:25:53 +02:00
O.S. Tezer
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
Zac Dover
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
Michael Crosby
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
Victor Vieux
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
unclejack
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
Michael Crosby
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
Victor Vieux
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
James Turnbull
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
Solomon Hykes
d889591a8d
Mention bugfixes in 0.12 changelog
...
Upstream-commit: 0c611d9b15945fc6d94cc999684483421709a3df
Component: engine
2014-06-06 13:31:10 -07:00
Johan Euphrosine
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Victor Vieux
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
Victor Vieux
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
James Turnbull
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
Michael Crosby
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
Fred Lifton
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
Michael Crosby
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
Michael Crosby
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
Tibor Vass
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
unclejack
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
James Turnbull
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
Tibor Vass
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
Sven Dowideit
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
SvenDowideit
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
Fred Lifton
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
James Turnbull
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
James Turnbull
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
Michael Crosby
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
Michael Crosby
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
Victor Vieux
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
Matthew Heon
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
cpuguy83
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
cpuguy83
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
Alexander Larsson
3ee07ce41f
devmapper: Add blkdiscard option and disable it on raw devices
...
The blkdiscard hack we do on container/image delete is pretty slow, but
required to restore space to the "host" root filesystem. However, it
is pretty useless on raw devices, and you may not need it in development
either.
In a simple test of the devicemapper backend on loopback the time to
delete 20 container went from 11 seconds to 0.4 seconds with
--storage-opt blkdiscard=false.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 0434a2ce64c0ce07e97e9a516cef226be67d5f5b
Component: engine
2014-06-05 11:45:59 +02:00
Alexander Larsson
af11ee865f
devmapper: Add options for specifying block devices
...
This adds dm.datadev and dm.metadatadev options that you can use with
--storage-opt to set to specific devices to use for the thin
provisioning pool.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: a226168a8b877d632cb87c95dd0288f6092b9d8f
Component: engine
2014-06-05 11:45:55 +02:00
Alexander Larsson
42f2781e59
devmapper: Allow specifying filesystem for thin devices
...
This adds the following --storage-opts for the daemon:
dm.fs: The filesystem to use for the base image
dm.mkfsarg: Add an argument to the mkfs command for the base image
dm.mountopt: Add a mount option for devicemapper mount
Currently supported filesystems are xfs and ext4.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 807bc2cd049d97f31eab54ce3d5719d63240e3e7
Component: engine
2014-06-05 11:25:06 +02:00
Alexander Larsson
28ddc63894
devicemapper: Probe what filesystem to use when mounting
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 10083f414017636065aa50610f07784738df8e7a
Component: engine
2014-06-05 11:03:19 +02:00
Alexander Larsson
cb7dedffd7
devmapper: Add --storage-opt options for basic devicemapper settings
...
This allows setting these settings to be passed:
dm.basesize
dm.loopdatasize
dm.loopmetadatasize
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 7f5ba068f438ee159bfca7396de4987bcae45809
Component: engine
2014-06-05 10:50:07 +02:00
Alexander Larsson
83cd706353
Add --storage-opt graph driver option and pass through to driver
...
This lets you add storage specific options for the daemon.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 822ea97ffcf10645720bb93108a60f8b9ce9931d
Component: engine
2014-06-05 10:42:27 +02:00
Alexander Larsson
d381e276cf
devmapper: Fail init with ErrNotSupported if simple devmapper call fails
...
If we can't even get the current device mapper driver version, then
we cleanly fail the devmapper driver as not supported and fall back
on the next one.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 948e54ac455f88c79524dcf117df80f2d4c3f96c
Component: engine
2014-06-05 10:42:27 +02:00
Alexander Larsson
82966c0798
pkg/units: Add FromHumanSize
...
This does the "reverse" of HumanSize, i.e. maps a string to an int64
using SI prefixes for the extension.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 13f07b636f014331a5d5dc0eac40d6ac9e5c9263
Component: engine
2014-06-05 10:02:37 +02:00
Victor Vieux
10c138b211
Merge pull request #6026 from vmarmol/nsenter
...
Adding initial version of C-based nsenter for allowing execin in libcontainer.
Upstream-commit: 7e96f8de1c65d414dd2c5039bf5953ae10cf236f
Component: engine
2014-06-04 19:06:27 -07:00
Tibor Vass
d0a1649e4a
Move doc section in Remote API about removing insert from v1.11 to v1.12
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 0d1906feea511cbfd1695adbb0b39dfdfae2caeb
Component: engine
2014-06-04 18:30:10 -07:00
Michael Crosby
f1a3b9e98b
Exclude the user namespace for setns
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7eb508633db93213404292bd4fd21b6855f45bea
Component: engine
2014-06-04 18:03:17 -07:00
Michael Crosby
a3fd3c7cb6
Move env load to nsenter
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8497d1274b046804999699ccb66b11a3249906a1
Component: engine
2014-06-04 17:54:00 -07:00