1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Move execdrivers into runtime top level pkg

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-03-14 14:07:32 -07:00
parent 2230c9b9a7
commit af385151ce
21 changed files with 18 additions and 18 deletions

View file

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/engine" "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/graphdriver"
"github.com/dotcloud/docker/image" "github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/links" "github.com/dotcloud/docker/links"

View file

@ -2,9 +2,9 @@ package execdrivers
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/execdriver/lxc" "github.com/dotcloud/docker/runtime/execdriver/lxc"
"github.com/dotcloud/docker/execdriver/native" "github.com/dotcloud/docker/runtime/execdriver/native"
"github.com/dotcloud/docker/pkg/sysinfo" "github.com/dotcloud/docker/pkg/sysinfo"
"path" "path"
) )

View file

@ -2,7 +2,7 @@ package lxc
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
"io/ioutil" "io/ioutil"

View file

@ -3,7 +3,7 @@ package lxc
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/pkg/netlink"
"github.com/dotcloud/docker/pkg/user" "github.com/dotcloud/docker/pkg/user"
"github.com/syndtr/gocapability/capability" "github.com/syndtr/gocapability/capability"

View file

@ -1,7 +1,7 @@
package lxc package lxc
import ( import (
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
"strings" "strings"
"text/template" "text/template"
) )

View file

@ -3,7 +3,7 @@ package lxc
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"os" "os"

View file

@ -2,7 +2,7 @@ package native
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"os" "os"

View file

@ -3,7 +3,7 @@ package native
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/apparmor"

View file

@ -5,7 +5,7 @@
package native package native
import ( import (
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
"io" "io"
"os" "os"
"os/exec" "os/exec"

View file

@ -7,9 +7,9 @@ import (
"github.com/dotcloud/docker/daemonconfig" "github.com/dotcloud/docker/daemonconfig"
"github.com/dotcloud/docker/dockerversion" "github.com/dotcloud/docker/dockerversion"
"github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/execdriver/execdrivers" "github.com/dotcloud/docker/runtime/execdriver/execdrivers"
"github.com/dotcloud/docker/execdriver/lxc" "github.com/dotcloud/docker/runtime/execdriver/lxc"
"github.com/dotcloud/docker/graph" "github.com/dotcloud/docker/graph"
"github.com/dotcloud/docker/graphdriver" "github.com/dotcloud/docker/graphdriver"
"github.com/dotcloud/docker/graphdriver/aufs" "github.com/dotcloud/docker/graphdriver/aufs"

View file

@ -3,7 +3,7 @@ package runtime
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
"io/ioutil" "io/ioutil"
"os" "os"

View file

@ -3,9 +3,9 @@ package sysinit
import ( import (
"flag" "flag"
"fmt" "fmt"
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/runtime/execdriver"
_ "github.com/dotcloud/docker/execdriver/lxc" _ "github.com/dotcloud/docker/runtime/execdriver/lxc"
_ "github.com/dotcloud/docker/execdriver/native" _ "github.com/dotcloud/docker/runtime/execdriver/native"
"log" "log"
"os" "os"
) )