Move execdrivers into runtime top level pkg

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: af385151ceedde097eda8a5195b431e8076cf76b
Component: engine
This commit is contained in:
Michael Crosby
2014-03-17 11:40:12 -07:00
parent 4b7a6e2613
commit 68860e9695
21 changed files with 18 additions and 18 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"fmt"
"github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/graphdriver"
"github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/links"
@@ -2,9 +2,9 @@ package execdrivers
import (
"fmt"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/execdriver/lxc"
"github.com/dotcloud/docker/execdriver/native"
"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"
)
@@ -2,7 +2,7 @@ package lxc
import (
"fmt"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/utils"
"io/ioutil"
@@ -3,7 +3,7 @@ package lxc
import (
"encoding/json"
"fmt"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/pkg/netlink"
"github.com/dotcloud/docker/pkg/user"
"github.com/syndtr/gocapability/capability"
@@ -1,7 +1,7 @@
package lxc
import (
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/runtime/execdriver"
"strings"
"text/template"
)
@@ -3,7 +3,7 @@ package lxc
import (
"bufio"
"fmt"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/runtime/execdriver"
"io/ioutil"
"math/rand"
"os"
@@ -2,7 +2,7 @@ package native
import (
"fmt"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/libcontainer"
"os"
@@ -3,7 +3,7 @@ package native
import (
"encoding/json"
"fmt"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/apparmor"
@@ -5,7 +5,7 @@
package native
import (
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/runtime/execdriver"
"io"
"os"
"os/exec"
+3 -3
View File
@@ -7,9 +7,9 @@ import (
"github.com/dotcloud/docker/daemonconfig"
"github.com/dotcloud/docker/dockerversion"
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/execdriver/execdrivers"
"github.com/dotcloud/docker/execdriver/lxc"
"github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/runtime/execdriver/execdrivers"
"github.com/dotcloud/docker/runtime/execdriver/lxc"
"github.com/dotcloud/docker/graph"
"github.com/dotcloud/docker/graphdriver"
"github.com/dotcloud/docker/graphdriver/aufs"
+1 -1
View File
@@ -3,7 +3,7 @@ package runtime
import (
"fmt"
"github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/utils"
"io/ioutil"
"os"
+3 -3
View File
@@ -3,9 +3,9 @@ package sysinit
import (
"flag"
"fmt"
"github.com/dotcloud/docker/execdriver"
_ "github.com/dotcloud/docker/execdriver/lxc"
_ "github.com/dotcloud/docker/execdriver/native"
"github.com/dotcloud/docker/runtime/execdriver"
_ "github.com/dotcloud/docker/runtime/execdriver/lxc"
_ "github.com/dotcloud/docker/runtime/execdriver/native"
"log"
"os"
)