diff --git a/builtins/builtins.go b/builtins/builtins.go index eb4a0be874..86f3973c62 100644 --- a/builtins/builtins.go +++ b/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" ) diff --git a/contrib/docker-device-tool/device_tool.go b/contrib/docker-device-tool/device_tool.go index 4d1ee0cea5..12c762a7f3 100644 --- a/contrib/docker-device-tool/device_tool.go +++ b/contrib/docker-device-tool/device_tool.go @@ -3,7 +3,7 @@ package main import ( "flag" "fmt" - "github.com/dotcloud/docker/graphdriver/devmapper" + "github.com/dotcloud/docker/runtime/graphdriver/devmapper" "os" "path" "sort" diff --git a/daemonconfig/config.go b/daemonconfig/config.go index 0aee7e78ba..b26d3eec3a 100644 --- a/daemonconfig/config.go +++ b/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 ( diff --git a/graph/graph.go b/graph/graph.go index 01659b549f..4349cac129 100644 --- a/graph/graph.go +++ b/graph/graph.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/graphdriver" "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/runconfig" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/utils" "io" "io/ioutil" diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go index 153f94db3d..17773912cf 100644 --- a/graph/tags_unit_test.go +++ b/graph/tags_unit_test.go @@ -2,9 +2,9 @@ package graph import ( "bytes" - "github.com/dotcloud/docker/graphdriver" - _ "github.com/dotcloud/docker/graphdriver/vfs" // import the vfs driver so it is used in the tests "github.com/dotcloud/docker/image" + "github.com/dotcloud/docker/runtime/graphdriver" + _ "github.com/dotcloud/docker/runtime/graphdriver/vfs" // import the vfs driver so it is used in the tests "github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io" diff --git a/image/graph.go b/image/graph.go index 857c09edd9..dd0136b00e 100644 --- a/image/graph.go +++ b/image/graph.go @@ -1,7 +1,7 @@ package image import ( - "github.com/dotcloud/docker/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver" ) type Graph interface { diff --git a/image/image.go b/image/image.go index e091879049..33503bad5a 100644 --- a/image/image.go +++ b/image/image.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/graphdriver" "github.com/dotcloud/docker/runconfig" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/utils" "io/ioutil" "os" diff --git a/integration/graph_test.go b/integration/graph_test.go index e575a252f3..5602b3938d 100644 --- a/integration/graph_test.go +++ b/integration/graph_test.go @@ -5,8 +5,8 @@ import ( "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/dockerversion" "github.com/dotcloud/docker/graph" - "github.com/dotcloud/docker/graphdriver" "github.com/dotcloud/docker/image" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/utils" "io" "io/ioutil" diff --git a/runtime/container.go b/runtime/container.go index ee545db201..9b138c89c1 100644 --- a/runtime/container.go +++ b/runtime/container.go @@ -6,12 +6,12 @@ import ( "fmt" "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/execdriver" - "github.com/dotcloud/docker/graphdriver" "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/links" "github.com/dotcloud/docker/nat" "github.com/dotcloud/docker/runconfig" + "github.com/dotcloud/docker/runtime/execdriver" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/utils" "io" "io/ioutil" diff --git a/execdriver/MAINTAINERS b/runtime/execdriver/MAINTAINERS similarity index 100% rename from execdriver/MAINTAINERS rename to runtime/execdriver/MAINTAINERS diff --git a/execdriver/driver.go b/runtime/execdriver/driver.go similarity index 100% rename from execdriver/driver.go rename to runtime/execdriver/driver.go diff --git a/execdriver/execdrivers/execdrivers.go b/runtime/execdriver/execdrivers/execdrivers.go similarity index 79% rename from execdriver/execdrivers/execdrivers.go rename to runtime/execdriver/execdrivers/execdrivers.go index 7486d649c1..9e277c86df 100644 --- a/execdriver/execdrivers/execdrivers.go +++ b/runtime/execdriver/execdrivers/execdrivers.go @@ -2,10 +2,10 @@ 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/pkg/sysinfo" + "github.com/dotcloud/docker/runtime/execdriver" + "github.com/dotcloud/docker/runtime/execdriver/lxc" + "github.com/dotcloud/docker/runtime/execdriver/native" "path" ) diff --git a/execdriver/lxc/driver.go b/runtime/execdriver/lxc/driver.go similarity index 99% rename from execdriver/lxc/driver.go rename to runtime/execdriver/lxc/driver.go index 9abec8ac3f..b7311cc1ff 100644 --- a/execdriver/lxc/driver.go +++ b/runtime/execdriver/lxc/driver.go @@ -2,8 +2,8 @@ package lxc import ( "fmt" - "github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/pkg/cgroups" + "github.com/dotcloud/docker/runtime/execdriver" "github.com/dotcloud/docker/utils" "io/ioutil" "log" diff --git a/execdriver/lxc/info.go b/runtime/execdriver/lxc/info.go similarity index 100% rename from execdriver/lxc/info.go rename to runtime/execdriver/lxc/info.go diff --git a/execdriver/lxc/info_test.go b/runtime/execdriver/lxc/info_test.go similarity index 100% rename from execdriver/lxc/info_test.go rename to runtime/execdriver/lxc/info_test.go diff --git a/execdriver/lxc/init.go b/runtime/execdriver/lxc/init.go similarity index 98% rename from execdriver/lxc/init.go rename to runtime/execdriver/lxc/init.go index 0f134088a3..a64bca15b2 100644 --- a/execdriver/lxc/init.go +++ b/runtime/execdriver/lxc/init.go @@ -3,9 +3,9 @@ package lxc import ( "encoding/json" "fmt" - "github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/pkg/user" + "github.com/dotcloud/docker/runtime/execdriver" "github.com/syndtr/gocapability/capability" "io/ioutil" "net" diff --git a/execdriver/lxc/lxc_init_linux.go b/runtime/execdriver/lxc/lxc_init_linux.go similarity index 100% rename from execdriver/lxc/lxc_init_linux.go rename to runtime/execdriver/lxc/lxc_init_linux.go diff --git a/execdriver/lxc/lxc_init_unsupported.go b/runtime/execdriver/lxc/lxc_init_unsupported.go similarity index 100% rename from execdriver/lxc/lxc_init_unsupported.go rename to runtime/execdriver/lxc/lxc_init_unsupported.go diff --git a/execdriver/lxc/lxc_template.go b/runtime/execdriver/lxc/lxc_template.go similarity index 98% rename from execdriver/lxc/lxc_template.go rename to runtime/execdriver/lxc/lxc_template.go index 84cd4e442e..db55287522 100644 --- a/execdriver/lxc/lxc_template.go +++ b/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" ) diff --git a/execdriver/lxc/lxc_template_unit_test.go b/runtime/execdriver/lxc/lxc_template_unit_test.go similarity index 98% rename from execdriver/lxc/lxc_template_unit_test.go rename to runtime/execdriver/lxc/lxc_template_unit_test.go index 99d6e636f5..ae66371836 100644 --- a/execdriver/lxc/lxc_template_unit_test.go +++ b/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" diff --git a/execdriver/native/default_template.go b/runtime/execdriver/native/default_template.go similarity index 98% rename from execdriver/native/default_template.go rename to runtime/execdriver/native/default_template.go index 5351911427..e76be6ebec 100644 --- a/execdriver/native/default_template.go +++ b/runtime/execdriver/native/default_template.go @@ -2,9 +2,9 @@ package native import ( "fmt" - "github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/dotcloud/docker/runtime/execdriver" "os" ) diff --git a/execdriver/native/driver.go b/runtime/execdriver/native/driver.go similarity index 99% rename from execdriver/native/driver.go rename to runtime/execdriver/native/driver.go index 9b49fd156f..bf7e8ccdec 100644 --- a/execdriver/native/driver.go +++ b/runtime/execdriver/native/driver.go @@ -3,12 +3,12 @@ package native import ( "encoding/json" "fmt" - "github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/nsinit" "github.com/dotcloud/docker/pkg/system" + "github.com/dotcloud/docker/runtime/execdriver" "io" "io/ioutil" "log" diff --git a/execdriver/native/info.go b/runtime/execdriver/native/info.go similarity index 100% rename from execdriver/native/info.go rename to runtime/execdriver/native/info.go diff --git a/execdriver/native/term.go b/runtime/execdriver/native/term.go similarity index 94% rename from execdriver/native/term.go rename to runtime/execdriver/native/term.go index ec69820f75..0d5298d388 100644 --- a/execdriver/native/term.go +++ b/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" diff --git a/execdriver/pipes.go b/runtime/execdriver/pipes.go similarity index 100% rename from execdriver/pipes.go rename to runtime/execdriver/pipes.go diff --git a/execdriver/termconsole.go b/runtime/execdriver/termconsole.go similarity index 100% rename from execdriver/termconsole.go rename to runtime/execdriver/termconsole.go diff --git a/graphdriver/aufs/aufs.go b/runtime/graphdriver/aufs/aufs.go similarity index 99% rename from graphdriver/aufs/aufs.go rename to runtime/graphdriver/aufs/aufs.go index a15cf6b273..6f05ddd025 100644 --- a/graphdriver/aufs/aufs.go +++ b/runtime/graphdriver/aufs/aufs.go @@ -24,8 +24,8 @@ import ( "bufio" "fmt" "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/graphdriver" mountpk "github.com/dotcloud/docker/pkg/mount" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/utils" "os" "os/exec" diff --git a/graphdriver/aufs/aufs_test.go b/runtime/graphdriver/aufs/aufs_test.go similarity index 99% rename from graphdriver/aufs/aufs_test.go rename to runtime/graphdriver/aufs/aufs_test.go index 6002bec5a1..cb417c3b26 100644 --- a/graphdriver/aufs/aufs_test.go +++ b/runtime/graphdriver/aufs/aufs_test.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "fmt" "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver" "io/ioutil" "os" "path" diff --git a/graphdriver/aufs/dirs.go b/runtime/graphdriver/aufs/dirs.go similarity index 100% rename from graphdriver/aufs/dirs.go rename to runtime/graphdriver/aufs/dirs.go diff --git a/graphdriver/aufs/migrate.go b/runtime/graphdriver/aufs/migrate.go similarity index 100% rename from graphdriver/aufs/migrate.go rename to runtime/graphdriver/aufs/migrate.go diff --git a/graphdriver/aufs/mount.go b/runtime/graphdriver/aufs/mount.go similarity index 100% rename from graphdriver/aufs/mount.go rename to runtime/graphdriver/aufs/mount.go diff --git a/graphdriver/aufs/mount_linux.go b/runtime/graphdriver/aufs/mount_linux.go similarity index 100% rename from graphdriver/aufs/mount_linux.go rename to runtime/graphdriver/aufs/mount_linux.go diff --git a/graphdriver/aufs/mount_unsupported.go b/runtime/graphdriver/aufs/mount_unsupported.go similarity index 100% rename from graphdriver/aufs/mount_unsupported.go rename to runtime/graphdriver/aufs/mount_unsupported.go diff --git a/graphdriver/btrfs/btrfs.go b/runtime/graphdriver/btrfs/btrfs.go similarity index 98% rename from graphdriver/btrfs/btrfs.go rename to runtime/graphdriver/btrfs/btrfs.go index 592e058458..b0530be92b 100644 --- a/graphdriver/btrfs/btrfs.go +++ b/runtime/graphdriver/btrfs/btrfs.go @@ -11,7 +11,7 @@ import "C" import ( "fmt" - "github.com/dotcloud/docker/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver" "os" "path" "syscall" diff --git a/graphdriver/btrfs/dummy_unsupported.go b/runtime/graphdriver/btrfs/dummy_unsupported.go similarity index 100% rename from graphdriver/btrfs/dummy_unsupported.go rename to runtime/graphdriver/btrfs/dummy_unsupported.go diff --git a/graphdriver/devmapper/attach_loopback.go b/runtime/graphdriver/devmapper/attach_loopback.go similarity index 100% rename from graphdriver/devmapper/attach_loopback.go rename to runtime/graphdriver/devmapper/attach_loopback.go diff --git a/graphdriver/devmapper/deviceset.go b/runtime/graphdriver/devmapper/deviceset.go similarity index 100% rename from graphdriver/devmapper/deviceset.go rename to runtime/graphdriver/devmapper/deviceset.go diff --git a/graphdriver/devmapper/devmapper.go b/runtime/graphdriver/devmapper/devmapper.go similarity index 100% rename from graphdriver/devmapper/devmapper.go rename to runtime/graphdriver/devmapper/devmapper.go diff --git a/graphdriver/devmapper/devmapper_doc.go b/runtime/graphdriver/devmapper/devmapper_doc.go similarity index 100% rename from graphdriver/devmapper/devmapper_doc.go rename to runtime/graphdriver/devmapper/devmapper_doc.go diff --git a/graphdriver/devmapper/devmapper_log.go b/runtime/graphdriver/devmapper/devmapper_log.go similarity index 100% rename from graphdriver/devmapper/devmapper_log.go rename to runtime/graphdriver/devmapper/devmapper_log.go diff --git a/graphdriver/devmapper/devmapper_test.go b/runtime/graphdriver/devmapper/devmapper_test.go similarity index 100% rename from graphdriver/devmapper/devmapper_test.go rename to runtime/graphdriver/devmapper/devmapper_test.go diff --git a/graphdriver/devmapper/devmapper_wrapper.go b/runtime/graphdriver/devmapper/devmapper_wrapper.go similarity index 100% rename from graphdriver/devmapper/devmapper_wrapper.go rename to runtime/graphdriver/devmapper/devmapper_wrapper.go diff --git a/graphdriver/devmapper/driver.go b/runtime/graphdriver/devmapper/driver.go similarity index 98% rename from graphdriver/devmapper/driver.go rename to runtime/graphdriver/devmapper/driver.go index 8c5a19eea0..33c7a0f483 100644 --- a/graphdriver/devmapper/driver.go +++ b/runtime/graphdriver/devmapper/driver.go @@ -4,7 +4,7 @@ package devmapper import ( "fmt" - "github.com/dotcloud/docker/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/utils" "io/ioutil" "os" diff --git a/graphdriver/devmapper/driver_test.go b/runtime/graphdriver/devmapper/driver_test.go similarity index 99% rename from graphdriver/devmapper/driver_test.go rename to runtime/graphdriver/devmapper/driver_test.go index 68699f208e..9af71a00b3 100644 --- a/graphdriver/devmapper/driver_test.go +++ b/runtime/graphdriver/devmapper/driver_test.go @@ -4,7 +4,7 @@ package devmapper import ( "fmt" - "github.com/dotcloud/docker/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver" "io/ioutil" "path" "runtime" diff --git a/graphdriver/devmapper/ioctl.go b/runtime/graphdriver/devmapper/ioctl.go similarity index 100% rename from graphdriver/devmapper/ioctl.go rename to runtime/graphdriver/devmapper/ioctl.go diff --git a/graphdriver/devmapper/mount.go b/runtime/graphdriver/devmapper/mount.go similarity index 100% rename from graphdriver/devmapper/mount.go rename to runtime/graphdriver/devmapper/mount.go diff --git a/graphdriver/devmapper/sys.go b/runtime/graphdriver/devmapper/sys.go similarity index 100% rename from graphdriver/devmapper/sys.go rename to runtime/graphdriver/devmapper/sys.go diff --git a/graphdriver/driver.go b/runtime/graphdriver/driver.go similarity index 100% rename from graphdriver/driver.go rename to runtime/graphdriver/driver.go diff --git a/graphdriver/vfs/driver.go b/runtime/graphdriver/vfs/driver.go similarity index 97% rename from graphdriver/vfs/driver.go rename to runtime/graphdriver/vfs/driver.go index 21da63878a..10a7b223a4 100644 --- a/graphdriver/vfs/driver.go +++ b/runtime/graphdriver/vfs/driver.go @@ -2,7 +2,7 @@ package vfs import ( "fmt" - "github.com/dotcloud/docker/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver" "os" "os/exec" "path" diff --git a/networkdriver/ipallocator/allocator.go b/runtime/networkdriver/ipallocator/allocator.go similarity index 98% rename from networkdriver/ipallocator/allocator.go rename to runtime/networkdriver/ipallocator/allocator.go index 1c5a7b4cc2..70a7028bbe 100644 --- a/networkdriver/ipallocator/allocator.go +++ b/runtime/networkdriver/ipallocator/allocator.go @@ -3,8 +3,8 @@ package ipallocator import ( "encoding/binary" "errors" - "github.com/dotcloud/docker/networkdriver" "github.com/dotcloud/docker/pkg/collections" + "github.com/dotcloud/docker/runtime/networkdriver" "net" "sync" ) diff --git a/networkdriver/ipallocator/allocator_test.go b/runtime/networkdriver/ipallocator/allocator_test.go similarity index 100% rename from networkdriver/ipallocator/allocator_test.go rename to runtime/networkdriver/ipallocator/allocator_test.go diff --git a/networkdriver/lxc/driver.go b/runtime/networkdriver/lxc/driver.go similarity index 98% rename from networkdriver/lxc/driver.go rename to runtime/networkdriver/lxc/driver.go index 6185c42752..827de2a609 100644 --- a/networkdriver/lxc/driver.go +++ b/runtime/networkdriver/lxc/driver.go @@ -3,12 +3,12 @@ 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/pkg/iptables" "github.com/dotcloud/docker/pkg/netlink" + "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/utils" "io/ioutil" "log" diff --git a/networkdriver/network.go b/runtime/networkdriver/network.go similarity index 100% rename from networkdriver/network.go rename to runtime/networkdriver/network.go diff --git a/networkdriver/network_test.go b/runtime/networkdriver/network_test.go similarity index 100% rename from networkdriver/network_test.go rename to runtime/networkdriver/network_test.go diff --git a/networkdriver/portallocator/portallocator.go b/runtime/networkdriver/portallocator/portallocator.go similarity index 100% rename from networkdriver/portallocator/portallocator.go rename to runtime/networkdriver/portallocator/portallocator.go diff --git a/networkdriver/portallocator/portallocator_test.go b/runtime/networkdriver/portallocator/portallocator_test.go similarity index 100% rename from networkdriver/portallocator/portallocator_test.go rename to runtime/networkdriver/portallocator/portallocator_test.go diff --git a/networkdriver/portmapper/mapper.go b/runtime/networkdriver/portmapper/mapper.go similarity index 100% rename from networkdriver/portmapper/mapper.go rename to runtime/networkdriver/portmapper/mapper.go diff --git a/networkdriver/portmapper/mapper_test.go b/runtime/networkdriver/portmapper/mapper_test.go similarity index 100% rename from networkdriver/portmapper/mapper_test.go rename to runtime/networkdriver/portmapper/mapper_test.go diff --git a/networkdriver/utils.go b/runtime/networkdriver/utils.go similarity index 100% rename from networkdriver/utils.go rename to runtime/networkdriver/utils.go diff --git a/runtime/runtime.go b/runtime/runtime.go index 32584cbf6e..677d52acc5 100644 --- a/runtime/runtime.go +++ b/runtime/runtime.go @@ -7,21 +7,21 @@ 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/graph" - "github.com/dotcloud/docker/graphdriver" - "github.com/dotcloud/docker/graphdriver/aufs" - _ "github.com/dotcloud/docker/graphdriver/btrfs" - _ "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/pkg/graphdb" "github.com/dotcloud/docker/pkg/sysinfo" "github.com/dotcloud/docker/runconfig" + "github.com/dotcloud/docker/runtime/execdriver" + "github.com/dotcloud/docker/runtime/execdriver/execdrivers" + "github.com/dotcloud/docker/runtime/execdriver/lxc" + "github.com/dotcloud/docker/runtime/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver/aufs" + _ "github.com/dotcloud/docker/runtime/graphdriver/btrfs" + _ "github.com/dotcloud/docker/runtime/graphdriver/devmapper" + _ "github.com/dotcloud/docker/runtime/graphdriver/vfs" + _ "github.com/dotcloud/docker/runtime/networkdriver/lxc" + "github.com/dotcloud/docker/runtime/networkdriver/portallocator" "github.com/dotcloud/docker/utils" "io" "io/ioutil" diff --git a/runtime/volumes.go b/runtime/volumes.go index 9cb66aae44..1bbb14a369 100644 --- a/runtime/volumes.go +++ b/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" diff --git a/sysinit/sysinit.go b/sysinit/sysinit.go index 56508b105d..50c858296f 100644 --- a/sysinit/sysinit.go +++ b/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" )