bcab23bbdc
Have the exec driver and kernel version in non-debug mode in docker info
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-18 16:50:55 +02:00
7c35bfd78e
as you could have multiple messages per line with streams, don't \r
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-18 16:50:19 +02:00
78d66068a5
Always symlink /dev/ptmx for libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-18 16:48:57 +02:00
ab5b715964
Fix issue when /etc/apparmor.d does not exists
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-18 16:45:25 +02:00
d8448f27c6
don't leave empty cidFile behind
...
This makes `--cidfile` clean up empty container ID files. These are
left behind when creating the container fails.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-18 16:42:25 +02:00
463cf28788
improve deprecation message
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-18 16:37:26 +02:00
6ce9daea0e
Fix attach exit on darwin
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-18 16:35:48 +02:00
39dbaa08dc
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-18 16:30:53 +02:00
d70e20cddd
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-18 16:30:28 +02:00
2741b82cf3
Add variable for DOCKER_LOGFILE to sysvinit and use append instead of overwrite in opening the logfile
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-11 23:47:15 -06:00
70ec7c6355
Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount and thus work properly
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-11 23:47:10 -06:00
0225a37951
Update parseLxcInfo to comply with new lxc1.0 format
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-11 23:46:43 -06:00
4bb1950089
Remove goroutine leak upon error
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-11 23:46:36 -06:00
143c9707a9
Merge pull request #4489 from crosbymichael/bump_v0.9.0
...
Bump to version 0.9.0
2014-03-10 10:04:33 -07:00
2b3fdf2344
Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-03-10 09:57:10 -07:00
0ab7b6952a
Bump to version 0.9.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-07 15:38:10 -08:00
ccdf27e502
Merge branch 'master' into bump_v0.9.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-07 15:37:29 -08:00
d8425d98e6
Merge pull request #4534 from creack/fix_race_kill
...
Fix Race when killing the daemon
2014-03-07 18:11:51 -05:00
65283afc8b
Merge pull request #4524 from gurjeet/patch-3
...
Correct typo
2014-03-08 08:43:16 +10:00
b845ff355a
Fix Race when killing the daemon
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-07 11:51:28 -08:00
27eae50224
Merge pull request #4529 from pmorie/typo
...
Fix typo in devmapper driver_test
2014-03-07 11:01:04 -08:00
f27ad07139
Merge pull request #4516 from tianon/fix-static-dockerinit
...
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
2014-03-07 10:15:49 -08:00
5b0ca89e2a
Merge pull request #4519 from crosbymichael/back-to-pivot-root
...
Use env var to toggle pivot root or ms_move
2014-03-07 10:12:00 -08:00
b3e7df48df
Fix typo in devmapper driver_test
...
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com > (github: pmorie)
2014-03-07 12:20:25 -05:00
6d9a7d6bc3
Correct typo
2014-03-07 08:45:08 -05:00
3e5102c11e
Merge pull request #4522 from liubin0329/patch-1
...
removing redundant dot
2014-03-07 23:20:02 +10:00
29079f03cf
removing redundant dot
...
Maybe it's a typo
2014-03-07 18:19:18 +08:00
a40bb2aabc
Add new "DOCKER_CLIENTONLY" build variable to allow skipping of the dockerinit compilation, especially for Homebrew / Mac OS X client-only compilation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-06 21:22:25 -07:00
36dd124b16
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)
2014-03-06 19:30:52 -08:00
be344cf0d8
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)
2014-03-06 19:55:22 -07:00
c38635020a
Revert "Revert "libcontainer: Use pivot_root instead of chroot""
...
This reverts commit 82f797f140michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 17:19:59 -08:00
557e4fef44
Revert "Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE""
...
This reverts commit bd263f5b15michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 17:19:47 -08: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 757b577572michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 16:41:03 -08:00
82f797f140
Revert "libcontainer: Use pivot_root instead of chroot"
...
This reverts commit 5b5c884cc8michael@crosbymichael.com > (github: crosbymichael)
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
Guillaume J. Charmes