Browse Source

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

Michael Crosby 11 years ago
parent
commit
2230c9b9a7

+ 1 - 1
builtins/builtins.go

@@ -4,7 +4,7 @@ import (
 	"github.com/dotcloud/docker/engine"
 
 	"github.com/dotcloud/docker/api"
-	"github.com/dotcloud/docker/networkdriver/lxc"
+	"github.com/dotcloud/docker/runtime/networkdriver/lxc"
 	"github.com/dotcloud/docker/server"
 )
 

+ 1 - 1
daemonconfig/config.go

@@ -4,7 +4,7 @@ import (
 	"net"
 
 	"github.com/dotcloud/docker/engine"
-	"github.com/dotcloud/docker/networkdriver"
+	"github.com/dotcloud/docker/runtime/networkdriver"
 )
 
 const (

+ 1 - 1
networkdriver/ipallocator/allocator.go → runtime/networkdriver/ipallocator/allocator.go

@@ -3,7 +3,7 @@ package ipallocator
 import (
 	"encoding/binary"
 	"errors"
-	"github.com/dotcloud/docker/networkdriver"
+	"github.com/dotcloud/docker/runtime/networkdriver"
 	"github.com/dotcloud/docker/pkg/collections"
 	"net"
 	"sync"

+ 0 - 0
networkdriver/ipallocator/allocator_test.go → runtime/networkdriver/ipallocator/allocator_test.go


+ 4 - 4
networkdriver/lxc/driver.go → runtime/networkdriver/lxc/driver.go

@@ -3,10 +3,10 @@ package lxc
 import (
 	"fmt"
 	"github.com/dotcloud/docker/engine"
-	"github.com/dotcloud/docker/networkdriver"
-	"github.com/dotcloud/docker/networkdriver/ipallocator"
-	"github.com/dotcloud/docker/networkdriver/portallocator"
-	"github.com/dotcloud/docker/networkdriver/portmapper"
+	"github.com/dotcloud/docker/runtime/networkdriver"
+	"github.com/dotcloud/docker/runtime/networkdriver/ipallocator"
+	"github.com/dotcloud/docker/runtime/networkdriver/portallocator"
+	"github.com/dotcloud/docker/runtime/networkdriver/portmapper"
 	"github.com/dotcloud/docker/pkg/iptables"
 	"github.com/dotcloud/docker/pkg/netlink"
 	"github.com/dotcloud/docker/utils"

+ 0 - 0
networkdriver/network.go → runtime/networkdriver/network.go


+ 0 - 0
networkdriver/network_test.go → runtime/networkdriver/network_test.go


+ 0 - 0
networkdriver/portallocator/portallocator.go → runtime/networkdriver/portallocator/portallocator.go


+ 0 - 0
networkdriver/portallocator/portallocator_test.go → runtime/networkdriver/portallocator/portallocator_test.go


+ 0 - 0
networkdriver/portmapper/mapper.go → runtime/networkdriver/portmapper/mapper.go


+ 0 - 0
networkdriver/portmapper/mapper_test.go → runtime/networkdriver/portmapper/mapper_test.go


+ 0 - 0
networkdriver/utils.go → runtime/networkdriver/utils.go


+ 2 - 2
runtime/runtime.go

@@ -17,8 +17,8 @@ import (
 	_ "github.com/dotcloud/docker/graphdriver/devmapper"
 	_ "github.com/dotcloud/docker/graphdriver/vfs"
 	"github.com/dotcloud/docker/image"
-	_ "github.com/dotcloud/docker/networkdriver/lxc"
-	"github.com/dotcloud/docker/networkdriver/portallocator"
+	_ "github.com/dotcloud/docker/runtime/networkdriver/lxc"
+	"github.com/dotcloud/docker/runtime/networkdriver/portallocator"
 	"github.com/dotcloud/docker/pkg/graphdb"
 	"github.com/dotcloud/docker/pkg/sysinfo"
 	"github.com/dotcloud/docker/runconfig"