Преглед на файлове

Move execdrivers into runtime top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Michael Crosby преди 11 години
родител
ревизия
af385151ce

+ 1 - 1
runtime/container.go

@@ -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"

+ 0 - 0
execdriver/MAINTAINERS → runtime/execdriver/MAINTAINERS


+ 0 - 0
execdriver/driver.go → runtime/execdriver/driver.go


+ 3 - 3
execdriver/execdrivers/execdrivers.go → runtime/execdriver/execdrivers/execdrivers.go

@@ -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"
 )

+ 1 - 1
execdriver/lxc/driver.go → runtime/execdriver/lxc/driver.go

@@ -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"

+ 0 - 0
execdriver/lxc/info.go → runtime/execdriver/lxc/info.go


+ 0 - 0
execdriver/lxc/info_test.go → runtime/execdriver/lxc/info_test.go


+ 1 - 1
execdriver/lxc/init.go → runtime/execdriver/lxc/init.go

@@ -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"

+ 0 - 0
execdriver/lxc/lxc_init_linux.go → runtime/execdriver/lxc/lxc_init_linux.go


+ 0 - 0
execdriver/lxc/lxc_init_unsupported.go → runtime/execdriver/lxc/lxc_init_unsupported.go


+ 1 - 1
execdriver/lxc/lxc_template.go → runtime/execdriver/lxc/lxc_template.go

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

+ 1 - 1
execdriver/lxc/lxc_template_unit_test.go → runtime/execdriver/lxc/lxc_template_unit_test.go

@@ -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"

+ 1 - 1
execdriver/native/default_template.go → runtime/execdriver/native/default_template.go

@@ -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"

+ 1 - 1
execdriver/native/driver.go → runtime/execdriver/native/driver.go

@@ -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"

+ 0 - 0
execdriver/native/info.go → runtime/execdriver/native/info.go


+ 1 - 1
execdriver/native/term.go → runtime/execdriver/native/term.go

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

+ 0 - 0
execdriver/pipes.go → runtime/execdriver/pipes.go


+ 0 - 0
execdriver/termconsole.go → runtime/execdriver/termconsole.go


+ 3 - 3
runtime/runtime.go

@@ -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
runtime/volumes.go

@@ -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
sysinit/sysinit.go

@@ -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"
 )