7da37fec13
handle capital
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-07 23:40:45 +00:00
3729ece2ea
improve alpha sort in mflag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-07 02:20:59 +00:00
78dc1ede52
Merge pull request #4512 from crosbymichael/no-pivot-root
...
No pivot root because of ramdisk
2014-03-07 02:54:03 +02:00
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
bd263f5b15
Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE"
...
This reverts commit 757b577572
2014-03-06 16:41:03 -08:00
82f797f140
Revert "libcontainer: Use pivot_root instead of chroot"
...
This reverts commit 5b5c884cc8
2014-03-06 16:32:06 -08:00
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
1695c77c43
Merge pull request #4509 from crosbymichael/kill-all
...
Remove the ghosts and kill everything
2014-03-07 01:35:38 +02:00
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
eda43fc70f
Merge pull request #4510 from vieux/fix_param_doc
...
Fix name parameter
2014-03-06 17:55:57 -05:00
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
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
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
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
b722aa21b7
Merge pull request #4506 from creack/fix_apparmor
...
Use CGO for apparmor profile switch
2014-03-06 13:37:34 -08:00
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
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
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
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
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
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
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
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
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
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
c273a93cf9
Merge pull request #4474 from timthelion/master
...
Change mustn't to must not
2014-03-06 09:48:59 -05:00
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
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
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
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
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
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
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
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
4b700dbe85
Merge pull request #6 from crosbymichael/tryagain2
...
Some cleanup around logs
2014-03-05 13:54:21 -08:00
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
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
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
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
ac734f0d36
Merge pull request #4392 from SvenDowideit/small-doc-fixes
...
Small doc fixes
2014-03-05 12:29:46 -08:00
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
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
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
c05e095baa
Merge pull request #4476 from vieux/improve_flags
...
Improve flags
2014-03-05 21:59:05 +02:00
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
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
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
9101686161
Merge pull request #4462 from jamtur01/langfix
...
Updated a variety of language and error messages
2014-03-05 10:22:51 -08:00
2a8c927f33
Merge pull request #4461 from jamtur01/capital
...
Consistently capitalize CLI options
2014-03-05 10:21:20 -08:00
47f1609f5c
Change mustn't to must not
...
mustn't is ambiguous. It may mean "you don't need to" even when it's not a tag question. See prose:
http://books.google.cz/books?id=otFPvwLG524C&pg=PA241&lpg=PA241&dq=mustn%27t+trouble+yourself&source=bl&ots=vjgh7n-yyW&sig=LBQAwlZu3GxI5YzvRAXFow4hE1U&hl=en&sa=X&ei=a14XU9vxB4SBywOPz4HwDw&ved=0CDQQ6AEwAg#v=onepage&q=mustn%27t%20trouble%20yourself&f=false
http://www.nytimes.com/books/first/m/maynard-home.html (search for mustn't)
We mustn't argue over grammar.
See: https://github.com/dotcloud/docker/pull/4473
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
2014-03-05 17:33:18 +00:00
Victor Vieux
unclejack
Michael Crosby
James Turnbull
Andy Rothfusz
Guillaume J. Charmes
Tianon Gravi
Guillaume J. Charmes
Geoffrey Bachelet
Evan Krall
unclejack
Alexander Larsson
Sven Dowideit
Timothy Hobbs