toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,062 Commits 3 Branches 295 Tags
f731a44bb1ca67b2dfbcee726dc627c7e82d6efd
Commit Graph
6515 Commits
Author SHA1 Message Date
Michael Crosby 957f74b876 Add env var to toggle pivot root or ms_move 
Use the  DOCKER_RAMDISK env var to tell the native driver not to use
a pivot root when setting up the rootfs of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 36dd124b16a76704a88142fa96bb4bb6260dd821
Component: engine
 2014-03-06 19:30:52 -08:00
Tianon Gravi 2e92b6ef1e Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: be344cf0d8e4f9881724f49398603a6e3109bc89
Component: engine
 2014-03-06 19:55:22 -07:00
Victor Vieux 3398dcb261 improve alpha sort in mflag 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3729ece2ea1c4aad286b7535a7c137045a9da107
Component: engine
 2014-03-07 02:20:59 +00:00
Michael Crosby 6f0ad9195c Revert "Revert "libcontainer: Use pivot_root instead of chroot"" 
This reverts commit 82f797f14096430c3edbace1cd30e04a483ec41f.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c38635020accaffa6868f19f308042be051132a0
Component: engine
 2014-03-06 17:19:59 -08:00
Michael Crosby 3e4d7be838 Revert "Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE"" 
This reverts commit bd263f5b15b51747e3429179fef7fcb425ccbe4a.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 557e4fef4418a251dd3a6817b97e5c1be055cbf3
Component: engine
 2014-03-06 17:19:47 -08:00
unclejack 9ba4572a15 Merge pull request #4512 from crosbymichael/no-pivot-root 
No pivot root because of ramdisk
Upstream-commit: 78dc1ede5202c8867e011582af8752810f817e9f
Component: engine
 2014-03-07 02:54:03 +02:00
Michael Crosby d96ead6498 Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE" 
This reverts commit 757b5775725fb90262cee1fa6068fa9dcbbff59f.

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

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 82f797f14096430c3edbace1cd30e04a483ec41f
Component: engine
 2014-03-06 16:32:06 -08:00
Michael Crosby c896586b70 Ensure that native containers die with the parent 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ea9bce8724303656c87c05e9049272258c9827b3
Component: engine
 2014-03-06 16:30:56 -08:00
unclejack fe7e822dde Merge pull request #4509 from crosbymichael/kill-all 
Remove the ghosts and kill everything
Upstream-commit: 1695c77c436e65a9f553b365714b56f78891bef5
Component: engine
 2014-03-07 01:35:38 +02:00
Michael Crosby 936f96cce5 Remove the ghosts and kill everything 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 772ef99d2816b629d084e11fe7fba5953687b620
Component: engine
 2014-03-06 15:30:26 -08:00
James Turnbull 5af40cdb6e Merge pull request #4510 from vieux/fix_param_doc 
Fix name parameter
Upstream-commit: eda43fc70fb771d9a55355db3f278e36987700fe
Component: engine
 2014-03-06 17:55:57 -05:00
Andy Rothfusz 6f1e791920 Merge pull request #4475 from ubermuda/patch-1 
Added Docker-PHP to the list of client libs
Upstream-commit: 44fc1dfca25dbd873c9d99eda73eba317796ec53
Component: engine
 2014-03-06 14:54:33 -08:00
Victor Vieux a45e674934 Fix name parameter 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 476c290b079d94b1da02c6e72ed15b7f9bd7fce5
Component: engine
 2014-03-06 22:51:44 +00:00
unclejack 1f7c2a04c8 Merge pull request #4488 from crosbymichael/return-correct-lxc-pid 
Return correct process pid for lxc
Upstream-commit: e4ebe6a12f5067602ab76aa0763dc4b291e5046f
Component: engine
 2014-03-07 00:14:08 +02:00
unclejack 81ffbaf8cc 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
Upstream-commit: e388b6aba5e7d75fecf87223abcd3c1deffd27f0
Component: engine
 2014-03-07 00:05:57 +02:00
Guillaume J. Charmes ecf60ced9e Merge pull request #4506 from creack/fix_apparmor 
Use CGO for apparmor profile switch
Upstream-commit: b722aa21b7ddfd558c2a36c8301d61b011221197
Component: engine
 2014-03-06 13:37:34 -08:00
Walter Leibbrandt ec7a1fa7d6 Fixed installmirrors ref 
Nested inline markup is not (yet) possible: http://stackoverflow.com/a/9645684
Upstream-commit: 188dea9e0e8b968b28a288192c357343dcc5834c
Component: engine
 2014-03-06 23:33:08 +02:00
Tianon Gravi 24c5efffe2 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)
Upstream-commit: 0b23393ba1901df3d08916fa977707db58699eca
Component: engine
 2014-03-06 13:39:17 -07:00
Guillaume J. Charmes 2ebfedab6d Add buildflags to allow crosscompilation for apparmor 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: c89fa6645ef87e1863ef5812bd42176f5bd987ca
Component: engine
 2014-03-06 12:05:03 -08:00
Geoffrey Bachelet e582b9139d Added Docker-PHP to the list of client libs 
Docker-DCO-1.1-Signed-off-by: Geoffrey Bachelet <geoffrey.bachelet@gmail.com> (github: ubermuda)
Upstream-commit: 511b57bee5bfc80cab26df044e1e821d01064192
Component: engine
 2014-03-06 20:33:51 +01:00
Victor Vieux 68556310d4 Merge pull request #3612 from EvanKrall/specify_socket_group 
Create a -G option that specifies the group which unix sockets belong to...
Upstream-commit: 83ffc2860bb4912828a8454291483ccf77888860
Component: engine
 2014-03-06 11:30:17 -08:00
Guillaume J. Charmes feec772c9b Merge pull request #4503 from unclejack/attempt_to_fix_apparmor_profile 
remove dbus from apparmor profile for Ubuntu 12.04
Upstream-commit: 31f62b934b7edc4942a6535d28954c0122748509
Component: engine
 2014-03-06 11:20:06 -08:00
Evan Krall e23e08e833 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)
Upstream-commit: 644acec2f7e3b144a423d0f0a6c900701abdc511
Component: engine
 2014-03-06 11:17:04 -08:00
Guillaume J. Charmes 9f58f80f28 Use CGO for apparmor profile switch 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: f0f833c6d795fc8b3fb4bb379f9916745f5c7ac9
Component: engine
 2014-03-06 11:10:58 -08:00
unclejack 22c0393b79 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)
Upstream-commit: 46fdb6af8ecc804b204fc93ab6d8d4a5f7503860
Component: engine
 2014-03-06 19:47:03 +02:00
Alexander Larsson 1368e7356f 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)
Upstream-commit: 81f148be566ab2b17810ad4be61a5d8beac8330f
Component: engine
 2014-03-06 18:36:08 +01:00
Alexander Larsson 2135cdee62 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)
Upstream-commit: 3e8a02a9399618917194b37435f5eed9ff86fe2f
Component: engine
 2014-03-06 18:36:03 +01:00
Michael Crosby 4b6cf8782b Merge pull request #4498 from alexlarsson/fix-cloexec-race 
libcontainer: Don't use UsetCloseOnExec, it is racy
Upstream-commit: 6af82bf4ca319c4881ede9a6cdf41e7dd7c901ef
Component: engine
 2014-03-06 11:45:26 -05:00
James Turnbull 7a63cc6849 Merge pull request #4474 from timthelion/master 
Change mustn't to must not
Upstream-commit: c273a93cf9106f1c0a8cf9766ecaf71e4294400f
Component: engine
 2014-03-06 09:48:59 -05:00
Alexander Larsson f8c71718b6 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)
Upstream-commit: 1cdd775f5d95c4da2895da85b00ffa2917bbf9b0
Component: engine
 2014-03-06 15:12:09 +01:00
Alexander Larsson 098ea0f413 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)
Upstream-commit: 5c9b28db1853cccdf7a1037eeaad372d12cd68fa
Component: engine
 2014-03-06 14:10:32 +01:00
Michael Crosby e217c314a6 Return correct process pid for lxc 
Fixes #2875
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 69e3d30bb6c5082aff2a7d5eafaf562e59246a49
Component: engine
 2014-03-05 18:02:19 -08:00
Andy Rothfusz 2eb4a2724e Merge pull request #4129 from proppy/patch-2 
hack/RELEASE: add step for updating doc branch
Upstream-commit: fb314c266b188de8aa0499c5314b01fd5d088475
Component: engine
 2014-03-05 16:08:37 -08:00
Guillaume J. Charmes eb76d6728d Merge pull request #4264 from ndarilek/2973-skip-volumes-from 
Don't call applyVolumesFrom on containers with volumes already configure...
Upstream-commit: 1ad14effb507589b84e5f93e7682c8e45ec10c28
Component: engine
 2014-03-05 15:44:15 -08:00
Sven Dowideit 6e470bbbd0 Merge pull request #4468 from bcbcarl/4467-dockerjs-outdated 
Flag 'docker-js' as outdated (Fix #4467)
Upstream-commit: 8d947da826498fb4b563edb1e68396c821238a39
Component: engine
 2014-03-06 09:37:34 +10:00
Victor Vieux 2e15652abb Merge pull request #4477 from creack/apparmor_native 
Add AppArmor support to native driver + change pipe/dup logic
Upstream-commit: 3ab4a28807c03028328f9172fc41a512cc1ca7a4
Component: engine
 2014-03-05 15:23:31 -08:00
Tianon Gravi 41674425c0 Merge pull request #4463 from tianon/update-packagers-doc-and-lxc-dep 
Update PACKAGERS.md and hack/make/ubuntu
Upstream-commit: d03be9d7cf95bffff024a4be54f6c928f76adea9
Component: engine
 2014-03-05 16:15:16 -07:00
Guillaume J. Charmes 50624219ad Generate and load custom docker profile for apparmor 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 920a6ca54ce98673d0c9a6a9502a469c1c225c75
Component: engine
 2014-03-05 15:02:11 -08:00
Michael Crosby 53277b63e3 Some cleanup around logs 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 37f137c8221be07943babeb9b107e5aee9a736d5
Component: engine
 2014-03-05 13:50:49 -08:00
Guillaume J. Charmes c1e434e543 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)
Upstream-commit: cb4189a292dc181e26e0506a3a0dc67936c5401b
Component: engine
 2014-03-05 13:08:24 -08:00
Michael Crosby 467d1e34b3 Merge pull request #4478 from vieux/add_missing_--_native 
Add missing -- when we run dockerinit from native
Upstream-commit: a24a802193dc9599c2d074a3629539412d8716ca
Component: engine
 2014-03-05 15:35:25 -05:00
Andy Rothfusz e13d9e18a0 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
Upstream-commit: 34fe14f1746903e5775a2e34ebb1176a885dc380
Component: engine
 2014-03-05 12:30:55 -08:00
Andy Rothfusz 60c64fda87 Merge pull request #4392 from SvenDowideit/small-doc-fixes 
Small doc fixes
Upstream-commit: ac734f0d36542cef241226218fde2ab2b8c191e9
Component: engine
 2014-03-05 12:29:46 -08:00
Andy Rothfusz f1ce37be65 Merge pull request #4449 from jamtur01/readme 
Some fixes and 0.9.0 pre-req changes to the README.md
Upstream-commit: bb0211ff30aaaae21d6361eb24bc2f216883e1bf
Component: engine
 2014-03-05 12:28:32 -08:00
James Turnbull dae86c26a4 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)
Upstream-commit: 046e6604e56ec93647550630fcf729c7e5ab3280
Component: engine
 2014-03-05 15:27:49 -05:00
Victor Vieux 7cf0d3e449 Add missing -- when we run dockerinit from native 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: c987901f8d64ab2390409018074b2f93c1718e89
Component: engine
 2014-03-05 20:26:48 +00:00
unclejack 2c72e525f4 Merge pull request #4476 from vieux/improve_flags 
Improve flags
Upstream-commit: c05e095baaa2de865e2e8712cbb7a37654bd41aa
Component: engine
 2014-03-05 21:59:05 +02:00
Victor Vieux ceba53329c 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)
Upstream-commit: 069dc7f8c7bc3eaf61ddd926636aacce5f1ed1ee
Component: engine
 2014-03-05 19:45:57 +00:00
Victor Vieux fdbd555f75 fix usage for completly deprecated flag 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 089bf5e11e4284a6ed07dc165098bb269dfddf46
Component: engine
 2014-03-05 19:27:39 +00:00