Quellcode durchsuchen

Rename namespace driver to docker
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Michael Crosby vor 11 Jahren
Ursprung
Commit
77f68f74c7
4 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
  1. 1 1
      execdriver/docker/default_template.go
  2. 1 1
      execdriver/docker/driver.go
  3. 1 1
      execdriver/docker/term.go
  4. 2 2
      runtime.go

+ 1 - 1
execdriver/namespaces/default_template.go → execdriver/docker/default_template.go

@@ -1,4 +1,4 @@
-package namespaces
+package docker
 
 import (
 	"github.com/dotcloud/docker/pkg/cgroups"

+ 1 - 1
execdriver/namespaces/driver.go → execdriver/docker/driver.go

@@ -1,4 +1,4 @@
-package namespaces
+package docker
 
 import (
 	"encoding/json"

+ 1 - 1
execdriver/namespaces/term.go → execdriver/docker/term.go

@@ -1,4 +1,4 @@
-package namespaces
+package docker
 
 import (
 	"github.com/dotcloud/docker/execdriver"

+ 2 - 2
runtime.go

@@ -7,8 +7,8 @@ import (
 	"github.com/dotcloud/docker/dockerversion"
 	"github.com/dotcloud/docker/engine"
 	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/execdriver/docker"
 	_ "github.com/dotcloud/docker/execdriver/lxc"
-	"github.com/dotcloud/docker/execdriver/namespaces"
 	"github.com/dotcloud/docker/graphdriver"
 	"github.com/dotcloud/docker/graphdriver/aufs"
 	_ "github.com/dotcloud/docker/graphdriver/btrfs"
@@ -704,7 +704,7 @@ func NewRuntimeFromDirectory(config *DaemonConfig, eng *engine.Engine) (*Runtime
 
 	sysInfo := sysinfo.New(false)
 
-	ed, err := namespaces.NewDriver(config.Root)
+	ed, err := docker.NewDriver(config.Root)
 	if err != nil {
 		return nil, err
 	}