From d62f25e4220d1d1ca792adf9c7423ee60a00c0d7 Mon Sep 17 00:00:00 2001 From: Michal Fojtik Date: Tue, 3 Feb 2015 12:41:21 +0100 Subject: [PATCH] Fix lxc-start in lxc>1.1.0 where containers start daemonized by default Signed-off-by: Michal Fojtik --- daemon/execdriver/lxc/driver.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/daemon/execdriver/lxc/driver.go b/daemon/execdriver/lxc/driver.go index f45c21445f..b30e7d2169 100644 --- a/daemon/execdriver/lxc/driver.go +++ b/daemon/execdriver/lxc/driver.go @@ -20,6 +20,7 @@ import ( "github.com/docker/docker/daemon/execdriver" sysinfo "github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/term" + "github.com/docker/docker/pkg/version" "github.com/docker/docker/utils" "github.com/docker/libcontainer" "github.com/docker/libcontainer/cgroups" @@ -115,6 +116,13 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba "-n", c.ID, "-f", configPath, } + + // From lxc>=1.1 the default behavior is to daemonize containers after start + lxcVersion := version.Version(d.version()) + if lxcVersion.GreaterThanOrEqualTo(version.Version("1.1")) { + params = append(params, "-F") + } + if c.Network.ContainerID != "" { params = append(params, "--share-net", c.Network.ContainerID,