Merge pull request #15255 from crosbymichael/lxc-dep

Add LXC built in support deprecation notice
Upstream-commit: dfb63b042568b0f4fd42bc2710761e5897a4f133
Component: engine
This commit is contained in:
David Calavera
2015-08-03 15:36:43 -07:00
2 changed files with 10 additions and 0 deletions
@@ -6,6 +6,7 @@ import (
"fmt"
"path"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/daemon/execdriver/lxc"
"github.com/docker/docker/daemon/execdriver/native"
@@ -19,6 +20,7 @@ func NewDriver(name string, options []string, root, libPath, initPath string, sy
// we want to give 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
logrus.Warn("LXC built-in support is deprecated.")
return lxc.NewDriver(root, libPath, initPath, sysInfo.AppArmor)
case "native":
return native.NewDriver(path.Join(root, "execdriver", "native"), initPath, options)