docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move networking drivers 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:03:23 -07:00
parent 2ada6441db
commit 2230c9b9a7
13 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtins/builtins.go
View File

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

2
daemonconfig/config.go
View File

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

2
networkdriver/ipallocator/allocator.go → runtime/networkdriver/ipallocator/allocator.go
View File

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

0
networkdriver/ipallocator/allocator_test.go → runtime/networkdriver/ipallocator/allocator_test.go
View File

8
networkdriver/lxc/driver.go → runtime/networkdriver/lxc/driver.go
View File

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

0
networkdriver/network.go → runtime/networkdriver/network.go
View File

0
networkdriver/network_test.go → runtime/networkdriver/network_test.go
View File

0
networkdriver/portallocator/portallocator.go → runtime/networkdriver/portallocator/portallocator.go
View File

0
networkdriver/portallocator/portallocator_test.go → runtime/networkdriver/portallocator/portallocator_test.go
View File

0
networkdriver/portmapper/mapper.go → runtime/networkdriver/portmapper/mapper.go
View File

0
networkdriver/portmapper/mapper_test.go → runtime/networkdriver/portmapper/mapper_test.go
View File

0
networkdriver/utils.go → runtime/networkdriver/utils.go
View File

4
runtime/runtime.go
View File

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