From af385151ceedde097eda8a5195b431e8076cf76b Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 14 Mar 2014 14:07:32 -0700 Subject: Move execdrivers into runtime top level pkg Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- runtime/execdriver/execdrivers/execdrivers.go | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 runtime/execdriver/execdrivers/execdrivers.go (limited to 'runtime/execdriver/execdrivers/execdrivers.go') diff --git a/runtime/execdriver/execdrivers/execdrivers.go b/runtime/execdriver/execdrivers/execdrivers.go new file mode 100644 index 0000000000..29fa5b44f9 --- /dev/null +++ b/runtime/execdriver/execdrivers/execdrivers.go @@ -0,0 +1,23 @@ +package execdrivers + +import ( + "fmt" + "github.com/dotcloud/docker/runtime/execdriver" + "github.com/dotcloud/docker/runtime/execdriver/lxc" + "github.com/dotcloud/docker/runtime/execdriver/native" + "github.com/dotcloud/docker/pkg/sysinfo" + "path" +) + +func NewDriver(name, root, initPath string, sysInfo *sysinfo.SysInfo) (execdriver.Driver, error) { + switch name { + case "lxc": + // we want to five the lxc driver the full docker root because it needs + // to access and write config and template files in /var/lib/docker/containers/* + // to be backwards compatible + return lxc.NewDriver(root, sysInfo.AppArmor) + case "native": + return native.NewDriver(path.Join(root, "execdriver", "native"), initPath) + } + return nil, fmt.Errorf("unknown exec driver %s", name) +} -- cgit v1.2.1 From 2bddcd68b4b927d36ffadd80e098f6d4ae2cf5d6 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 14 Mar 2014 15:07:52 -0700 Subject: Gofmt imports Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- runtime/execdriver/execdrivers/execdrivers.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/execdriver/execdrivers/execdrivers.go') diff --git a/runtime/execdriver/execdrivers/execdrivers.go b/runtime/execdriver/execdrivers/execdrivers.go index 29fa5b44f9..9e277c86df 100644 --- a/runtime/execdriver/execdrivers/execdrivers.go +++ b/runtime/execdriver/execdrivers/execdrivers.go @@ -2,10 +2,10 @@ package execdrivers import ( "fmt" + "github.com/dotcloud/docker/pkg/sysinfo" "github.com/dotcloud/docker/runtime/execdriver" "github.com/dotcloud/docker/runtime/execdriver/lxc" "github.com/dotcloud/docker/runtime/execdriver/native" - "github.com/dotcloud/docker/pkg/sysinfo" "path" ) -- cgit v1.2.1