clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,883 Commits 9 Branches 112 Tags
5239aa1f11c32f3befc25fb2fa8a0ecf75ec4bf6
Commit Graph
6883 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby 557e4fef44 Revert "Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE"" 
This reverts commit bd263f5b15.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-06 17:19:47 -08:00
unclejack 78dc1ede52 Merge pull request #4512 from crosbymichael/no-pivot-root 
No pivot root because of ramdisk
 2014-03-07 02:54:03 +02:00
unclejack f244d9763e Merge pull request #4511 from crosbymichael/ensure-native-containers-die 
Ensure that native containers die with the parent
 2014-03-07 02:49:10 +02:00
Michael Crosby bd263f5b15 Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE" 
This reverts commit 757b577572.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-06 16:41:03 -08:00
Michael Crosby 82f797f140 Revert "libcontainer: Use pivot_root instead of chroot" 
This reverts commit 5b5c884cc8.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-06 16:32:06 -08:00
Michael Crosby ea9bce8724 Ensure that native containers die with the parent 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-06 16:30:56 -08:00
unclejack 1695c77c43 Merge pull request #4509 from crosbymichael/kill-all 
Remove the ghosts and kill everything
 2014-03-07 01:35:38 +02:00
Michael Crosby 772ef99d28 Remove the ghosts and kill everything 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-06 15:30:26 -08:00
James Turnbull eda43fc70f Merge pull request #4510 from vieux/fix_param_doc 
Fix name parameter
 2014-03-06 17:55:57 -05:00
Andy Rothfusz 44fc1dfca2 Merge pull request #4475 from ubermuda/patch-1 
Added Docker-PHP to the list of client libs
 2014-03-06 14:54:33 -08:00
Victor Vieux 476c290b07 Fix name parameter 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-06 22:51:44 +00:00
unclejack e4ebe6a12f Merge pull request #4488 from crosbymichael/return-correct-lxc-pid 
Return correct process pid for lxc
 2014-03-07 00:14:08 +02:00
unclejack e388b6aba5 Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command 
Add ability to force removal of running container via docker rm -f
 2014-03-07 00:05:57 +02:00
Guillaume J. Charmes b722aa21b7 Merge pull request #4506 from creack/fix_apparmor 
Use CGO for apparmor profile switch
 2014-03-06 13:37:34 -08:00
Walter Leibbrandt 188dea9e0e Fixed installmirrors ref 
Nested inline markup is not (yet) possible: http://stackoverflow.com/a/9645684
 2014-03-06 23:33:08 +02:00
Guillaume J. Charmes 2128eb52ed Merge pull request #7 from tianon/fix-hack-tags 
Update build tags such that we can properly compile on all platforms
 2014-03-06 12:49:05 -08:00
Tianon Gravi 0b23393ba1 Update build tags such that we can properly compile on all platforms (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-06 13:39:17 -07:00
Guillaume J. Charmes c89fa6645e Add buildflags to allow crosscompilation for apparmor 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-03-06 12:05:03 -08:00
Geoffrey Bachelet 511b57bee5 Added Docker-PHP to the list of client libs 
Docker-DCO-1.1-Signed-off-by: Geoffrey Bachelet <geoffrey.bachelet@gmail.com> (github: ubermuda)
 2014-03-06 20:33:51 +01:00
Victor Vieux 83ffc2860b Merge pull request #3612 from EvanKrall/specify_socket_group 
Create a -G option that specifies the group which unix sockets belong to...
 2014-03-06 11:30:17 -08:00
Guillaume J. Charmes 31f62b934b Merge pull request #4503 from unclejack/attempt_to_fix_apparmor_profile 
remove dbus from apparmor profile for Ubuntu 12.04
 2014-03-06 11:20:06 -08:00
Evan Krall 644acec2f7 Create a -G option that specifies the group which unix sockets belong to. 
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com> (github: EvanKrall)
 2014-03-06 11:17:04 -08:00
Guillaume J. Charmes f0f833c6d7 Use CGO for apparmor profile switch 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-03-06 11:10:58 -08:00
unclejack 46fdb6af8e remove dbus from apparmor profile 
This removes the dbus entry from the apparmor profile Docker creates.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-03-06 19:47:03 +02:00
Alexander Larsson 81f148be56 devmapper: Increase sleep times and unlock while sleeping 
We've seen some cases in the wild where waiting for unmount/deactivate
of devmapper devices taking a long time (several seconds). So, we increase
the sleeps to 10 seconds before we timeout. For instance:

https://github.com/dotcloud/docker/issues/4389

But, in order to not keep other processes blocked we unlock the global
dm lock while waiting to allow other devices to continue working.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-06 18:36:08 +01:00
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
Michael Crosby 6af82bf4ca Merge pull request #4498 from alexlarsson/fix-cloexec-race 
libcontainer: Don't use UsetCloseOnExec, it is racy
 2014-03-06 11:45:26 -05:00
James Turnbull c273a93cf9 Merge pull request #4474 from timthelion/master 
Change mustn't to must not
 2014-03-06 09:48:59 -05:00
Alexander Larsson 1cdd775f5d DeviceMapper: Succeed immediately when removing non-existant devices 
We've seen situations where removal of "ID-init" failed during
container deletion (EBUSY), after removal of "ID" has succeeded. This
caused the container delete operation to fail, and on the next delete
attempt the removal of "ID" failed immediately with "does not exist".

Ideally we should not fail the ID-init removal, but its also non-ideal
to allow a state where the container is half-removed and we cannot
make progress deleting the container. So, we silently ignore not-exist
errors on device removal.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-06 15:12:09 +01:00
Alexander Larsson 5c9b28db18 libcontainer: Don't use UsetCloseOnExec, it is racy 
We can't keep file descriptors without close-on-exec except with
syscall.ForkLock held, as otherwise they could leak by accident into
other children from forks in other threads.

Instead we just use Cmd.ExtraFiles which handles all this for us.

This fixes https://github.com/dotcloud/docker/issues/4493

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-03-06 14:10:32 +01:00
Michael Crosby 69e3d30bb6 Return correct process pid for lxc 
Fixes #2875
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-05 18:02:19 -08: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