Alexander Larsson
3e8a02a939
devmapper: Add per-device lock
...
We currently use a global lock to protect global data (like the
Devices map) as well as device data itself and access to
(non-threadsafe) libdevmapper.
This commit also adds a per-device lock, which will allow per-device
operations to temporarily release the global lock while e.g. waiting.
The per-device lock will make sure that nothing else accesses that
device while we're operating on it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-06 18:36:03 +01:00
Andy Rothfusz
fb314c266b
Merge pull request #4129 from proppy/patch-2
...
hack/RELEASE: add step for updating doc branch
2014-03-05 16:08:37 -08:00
Guillaume J. Charmes
1ad14effb5
Merge pull request #4264 from ndarilek/2973-skip-volumes-from
...
Don't call applyVolumesFrom on containers with volumes already configure...
2014-03-05 15:44:15 -08:00
Sven Dowideit
8d947da826
Merge pull request #4468 from bcbcarl/4467-dockerjs-outdated
...
Flag 'docker-js' as outdated (Fix #4467 )
2014-03-06 09:37:34 +10:00
Victor Vieux
3ab4a28807
Merge pull request #4477 from creack/apparmor_native
...
Add AppArmor support to native driver + change pipe/dup logic
2014-03-05 15:23:31 -08:00
Tianon Gravi
d03be9d7cf
Merge pull request #4463 from tianon/update-packagers-doc-and-lxc-dep
...
Update PACKAGERS.md and hack/make/ubuntu
2014-03-05 16:15:16 -07:00
Guillaume J. Charmes
920a6ca54c
Generate and load custom docker profile for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-05 15:02:11 -08:00
Guillaume J. Charmes
4b700dbe85
Merge pull request #6 from crosbymichael/tryagain2
...
Some cleanup around logs
2014-03-05 13:54:21 -08:00
Michael Crosby
37f137c822
Some cleanup around logs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-05 13:50:49 -08:00
Guillaume J. Charmes
cb4189a292
Add AppArmor support to native driver + change pipe/dup logic
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-05 13:08:24 -08:00
Michael Crosby
a24a802193
Merge pull request #4478 from vieux/add_missing_--_native
...
Add missing -- when we run dockerinit from native
2014-03-05 15:35:25 -05:00
Andy Rothfusz
34fe14f174
Merge pull request #4444 from SvenDowideit/update-host-integration-docs
...
update to use --name, and add a little more detail to how docker start -a works
2014-03-05 12:30:55 -08:00
Andy Rothfusz
ac734f0d36
Merge pull request #4392 from SvenDowideit/small-doc-fixes
...
Small doc fixes
2014-03-05 12:29:46 -08:00
Andy Rothfusz
bb0211ff30
Merge pull request #4449 from jamtur01/readme
...
Some fixes and 0.9.0 pre-req changes to the README.md
2014-03-05 12:28:32 -08:00
James Turnbull
046e6604e5
Some updates to the README.md
...
* Updated pre-reqs for 0.9.
* Fixed a couple of docker to Docker.
* Fixed the Docker build example to be correct.
* Reformatted a bunch of paragraphs
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-03-05 15:27:49 -05:00
Victor Vieux
c987901f8d
Add missing -- when we run dockerinit from native
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-05 20:26:48 +00:00
unclejack
c05e095baa
Merge pull request #4476 from vieux/improve_flags
...
Improve flags
2014-03-05 21:59:05 +02:00
Victor Vieux
069dc7f8c7
fix panic with only long flags or only one deprecatd
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-05 19:45:57 +00:00
Victor Vieux
089bf5e11e
fix usage for completly deprecated flag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-05 19:27:39 +00:00
Victor Vieux
7ec82aa727
Merge pull request #4471 from unclejack/fix_integration_test_deprecation_warnings
...
fix flag deprecation warnings in integration tests
2014-03-05 11:00:56 -08:00
Victor Vieux
9101686161
Merge pull request #4462 from jamtur01/langfix
...
Updated a variety of language and error messages
2014-03-05 10:22:51 -08:00
Victor Vieux
2a8c927f33
Merge pull request #4461 from jamtur01/capital
...
Consistently capitalize CLI options
2014-03-05 10:21:20 -08:00
Michael Crosby
858d0356fd
Merge pull request #4278 from alexlarsson/system
...
Create pkg/system and move stuff there from archive
2014-03-05 12:32:35 -05:00
Michael Crosby
ad68ab19e0
Merge pull request #4465 from alexlarsson/private
...
libcontainer: Use MS_PRIVATE instead of MS_SLAVE
2014-03-05 12:16:18 -05:00
Tianon Gravi
c41e51ce3d
Add further clarification of where/when the build-time deps are applicable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-05 08:20:42 -07:00
unclejack
35054601d8
fix flag deprecation warnings in integration tests
...
This removes three warnings in the integration tests:
Warning: '-viz' is deprecated, it will be removed soon. See usage.
Warning: '-tree' is deprecated, it will be removed soon. See usage.
Warning: '-cidfile' is deprecated, it will be removed soon. See usage.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-05 16:43:03 +02:00
Alexander Larsson
d6114c0da0
Create pkg/system and move stuff there from archive
...
This is a package for generic system calls etc that for some reason
is not yet supported by "syscall", or where it is different enough
for the different ports to need portability wrappers.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-05 14:05:32 +01:00
Carl X. Su
5e32c40795
Flag 'docker-js' as outdated
2014-03-05 20:16:41 +08:00
Alexander Larsson
757b577572
libcontainer: Use MS_PRIVATE instead of MS_SLAVE
...
Now that we unmount all the mounts from the global namespace we can
use a private namespace rather than a slave one (as we have no need
for unmounts of inherited global mounts to propagate into the
container).
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-05 09:40:54 +01:00
Tianon Gravi
5317ad476d
Add "git" to our Ubuntu package "Recommends" (whoops, this should've been in here for a while now)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 22:59:46 -07:00
Tianon Gravi
4293a1ceb4
Update the relevant docs section to match PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 22:54:58 -07:00
Tianon Gravi
b69f632830
Update package deps to remove LXC and move aufs-tools to be in "Recommends" instead of strict Depends
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 22:52:39 -07:00
Tianon Gravi
615667b883
Rewrite more loads of PACKAGERS.md to hopefully remove some outdated information, add some updated information and pointers, and generally make the tone of this document less condescending :)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 22:51:34 -07:00
Tianon Gravi
d9ec3a0347
Mention in PACKAGERS.md that Tianon is available for packager needs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 21:41:59 -07:00
Tianon Gravi
9a677e6a68
Reflow PACKAGERS.md to 80 columns (where possible) and update some minor formatting
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 21:40:42 -07:00
Tianon Gravi
a7f265223a
Update PACKAGERS.md with some text changes, including and especially moving "LXC" to a new "Optional Dependencies" section
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 21:25:00 -07:00
Tianon Gravi
6f2564350f
Merge pull request #4455 from lsm5/systemd
...
Bump container limit via systemd conf file
2014-03-04 20:37:16 -07:00
Lokesh Mandvekar
291d5e642e
bump open files and procs limit via unitfile
...
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com> (github: lsm5)
modified: contrib/init/systemd/docker.service
modified: contrib/init/systemd/socket-activation/docker.service
2014-03-04 22:29:51 -05:00
Sven Dowideit
83de8bb842
Closes #4374
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
\nDocker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: )
2014-03-05 02:41:14 +00:00
James Turnbull
9cbf22dee2
Updated a variety of language and error messages
...
In api/client.go updated:
1. Made api == API
2. Restated Docker daemon connection error to be clearer.
3. Changed use of "Impossible" in error messages.
4. Removed extra space in restart error message.
5. Fixed capitalization in three error messages.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-03-04 20:52:48 -05:00
James Turnbull
725c7cd08a
Made CLI option capitalization consistent in api/client.go
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-03-04 20:45:22 -05:00
James Turnbull
41bf38e44d
Consistently capitalize CLI options
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-03-04 20:22:51 -05:00
Sven Dowideit
3acbd758d8
update to use --name, and add a little more detail to how docker start -a works
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-03-05 00:57:08 +00:00
Victor Vieux
e7055830ab
Merge pull request #4460 from crosbymichael/add-shm-size
...
Add shm size cap to mount
2014-03-04 14:20:20 -08:00
Michael Crosby
b07708c8de
Add shm size cap to mount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-04 14:18:40 -08:00
Michael Crosby
19b898ad56
Merge pull request #4457 from creack/remove_loopback_mount
...
Remove loopback mount
2014-03-04 17:11:37 -05:00
Guillaume J. Charmes
57a47f5bbf
Remove /dev tmpfs mountpoint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-04 13:21:22 -08:00
Guillaume J. Charmes
c74a8b28cd
remove /run mountpoint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-04 12:32:17 -08:00
Guillaume J. Charmes
39d58129c3
Remove loopback mount bind
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-04 12:30:52 -08:00
unclejack
a0c465a333
Merge pull request #4456 from crosbymichael/change-veth-name
...
Change veth prefix back to veth
2014-03-04 21:51:44 +02:00