From 4b7a6e26135aa12b026aec23650995a1679931be Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 14 Mar 2014 14:03:23 -0700 Subject: [PATCH 1/4] Move networking drivers into runtime top level pkg Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: 2230c9b9a735d731cc2fee4137633eb98b9da9d5 Component: engine --- components/engine/builtins/builtins.go | 2 +- components/engine/daemonconfig/config.go | 2 +- .../{ => runtime}/networkdriver/ipallocator/allocator.go | 2 +- .../networkdriver/ipallocator/allocator_test.go | 0 .../engine/{ => runtime}/networkdriver/lxc/driver.go | 8 ++++---- components/engine/{ => runtime}/networkdriver/network.go | 0 .../engine/{ => runtime}/networkdriver/network_test.go | 0 .../networkdriver/portallocator/portallocator.go | 0 .../networkdriver/portallocator/portallocator_test.go | 0 .../{ => runtime}/networkdriver/portmapper/mapper.go | 0 .../{ => runtime}/networkdriver/portmapper/mapper_test.go | 0 components/engine/{ => runtime}/networkdriver/utils.go | 0 components/engine/runtime/runtime.go | 4 ++-- 13 files changed, 9 insertions(+), 9 deletions(-) rename components/engine/{ => runtime}/networkdriver/ipallocator/allocator.go (98%) rename components/engine/{ => runtime}/networkdriver/ipallocator/allocator_test.go (100%) rename components/engine/{ => runtime}/networkdriver/lxc/driver.go (98%) rename components/engine/{ => runtime}/networkdriver/network.go (100%) rename components/engine/{ => runtime}/networkdriver/network_test.go (100%) rename components/engine/{ => runtime}/networkdriver/portallocator/portallocator.go (100%) rename components/engine/{ => runtime}/networkdriver/portallocator/portallocator_test.go (100%) rename components/engine/{ => runtime}/networkdriver/portmapper/mapper.go (100%) rename components/engine/{ => runtime}/networkdriver/portmapper/mapper_test.go (100%) rename components/engine/{ => runtime}/networkdriver/utils.go (100%) diff --git a/components/engine/builtins/builtins.go b/components/engine/builtins/builtins.go index eb4a0be874..86f3973c62 100644 --- a/components/engine/builtins/builtins.go +++ b/components/engine/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/components/engine/daemonconfig/config.go b/components/engine/daemonconfig/config.go index 0aee7e78ba..b26d3eec3a 100644 --- a/components/engine/daemonconfig/config.go +++ b/components/engine/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/components/engine/networkdriver/ipallocator/allocator.go b/components/engine/runtime/networkdriver/ipallocator/allocator.go similarity index 98% rename from components/engine/networkdriver/ipallocator/allocator.go rename to components/engine/runtime/networkdriver/ipallocator/allocator.go index 1c5a7b4cc2..2950e37003 100644 --- a/components/engine/networkdriver/ipallocator/allocator.go +++ b/components/engine/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" diff --git a/components/engine/networkdriver/ipallocator/allocator_test.go b/components/engine/runtime/networkdriver/ipallocator/allocator_test.go similarity index 100% rename from components/engine/networkdriver/ipallocator/allocator_test.go rename to components/engine/runtime/networkdriver/ipallocator/allocator_test.go diff --git a/components/engine/networkdriver/lxc/driver.go b/components/engine/runtime/networkdriver/lxc/driver.go similarity index 98% rename from components/engine/networkdriver/lxc/driver.go rename to components/engine/runtime/networkdriver/lxc/driver.go index 6185c42752..746bcfb5b0 100644 --- a/components/engine/networkdriver/lxc/driver.go +++ b/components/engine/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" diff --git a/components/engine/networkdriver/network.go b/components/engine/runtime/networkdriver/network.go similarity index 100% rename from components/engine/networkdriver/network.go rename to components/engine/runtime/networkdriver/network.go diff --git a/components/engine/networkdriver/network_test.go b/components/engine/runtime/networkdriver/network_test.go similarity index 100% rename from components/engine/networkdriver/network_test.go rename to components/engine/runtime/networkdriver/network_test.go diff --git a/components/engine/networkdriver/portallocator/portallocator.go b/components/engine/runtime/networkdriver/portallocator/portallocator.go similarity index 100% rename from components/engine/networkdriver/portallocator/portallocator.go rename to components/engine/runtime/networkdriver/portallocator/portallocator.go diff --git a/components/engine/networkdriver/portallocator/portallocator_test.go b/components/engine/runtime/networkdriver/portallocator/portallocator_test.go similarity index 100% rename from components/engine/networkdriver/portallocator/portallocator_test.go rename to components/engine/runtime/networkdriver/portallocator/portallocator_test.go diff --git a/components/engine/networkdriver/portmapper/mapper.go b/components/engine/runtime/networkdriver/portmapper/mapper.go similarity index 100% rename from components/engine/networkdriver/portmapper/mapper.go rename to components/engine/runtime/networkdriver/portmapper/mapper.go diff --git a/components/engine/networkdriver/portmapper/mapper_test.go b/components/engine/runtime/networkdriver/portmapper/mapper_test.go similarity index 100% rename from components/engine/networkdriver/portmapper/mapper_test.go rename to components/engine/runtime/networkdriver/portmapper/mapper_test.go diff --git a/components/engine/networkdriver/utils.go b/components/engine/runtime/networkdriver/utils.go similarity index 100% rename from components/engine/networkdriver/utils.go rename to components/engine/runtime/networkdriver/utils.go diff --git a/components/engine/runtime/runtime.go b/components/engine/runtime/runtime.go index 32584cbf6e..092b5a8130 100644 --- a/components/engine/runtime/runtime.go +++ b/components/engine/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" From 68860e9695c202a991580b4ffc1f58457edcd76a Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 14 Mar 2014 14:07:32 -0700 Subject: [PATCH 2/4] Move execdrivers into runtime top level pkg Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: af385151ceedde097eda8a5195b431e8076cf76b Component: engine --- components/engine/runtime/container.go | 2 +- components/engine/{ => runtime}/execdriver/MAINTAINERS | 0 components/engine/{ => runtime}/execdriver/driver.go | 0 .../{ => runtime}/execdriver/execdrivers/execdrivers.go | 6 +++--- components/engine/{ => runtime}/execdriver/lxc/driver.go | 2 +- components/engine/{ => runtime}/execdriver/lxc/info.go | 0 components/engine/{ => runtime}/execdriver/lxc/info_test.go | 0 components/engine/{ => runtime}/execdriver/lxc/init.go | 2 +- .../engine/{ => runtime}/execdriver/lxc/lxc_init_linux.go | 0 .../{ => runtime}/execdriver/lxc/lxc_init_unsupported.go | 0 .../engine/{ => runtime}/execdriver/lxc/lxc_template.go | 2 +- .../{ => runtime}/execdriver/lxc/lxc_template_unit_test.go | 2 +- .../{ => runtime}/execdriver/native/default_template.go | 2 +- components/engine/{ => runtime}/execdriver/native/driver.go | 2 +- components/engine/{ => runtime}/execdriver/native/info.go | 0 components/engine/{ => runtime}/execdriver/native/term.go | 2 +- components/engine/{ => runtime}/execdriver/pipes.go | 0 components/engine/{ => runtime}/execdriver/termconsole.go | 0 components/engine/runtime/runtime.go | 6 +++--- components/engine/runtime/volumes.go | 2 +- components/engine/sysinit/sysinit.go | 6 +++--- 21 files changed, 18 insertions(+), 18 deletions(-) rename components/engine/{ => runtime}/execdriver/MAINTAINERS (100%) rename components/engine/{ => runtime}/execdriver/driver.go (100%) rename components/engine/{ => runtime}/execdriver/execdrivers/execdrivers.go (79%) rename components/engine/{ => runtime}/execdriver/lxc/driver.go (99%) rename components/engine/{ => runtime}/execdriver/lxc/info.go (100%) rename components/engine/{ => runtime}/execdriver/lxc/info_test.go (100%) rename components/engine/{ => runtime}/execdriver/lxc/init.go (98%) rename components/engine/{ => runtime}/execdriver/lxc/lxc_init_linux.go (100%) rename components/engine/{ => runtime}/execdriver/lxc/lxc_init_unsupported.go (100%) rename components/engine/{ => runtime}/execdriver/lxc/lxc_template.go (98%) rename components/engine/{ => runtime}/execdriver/lxc/lxc_template_unit_test.go (98%) rename components/engine/{ => runtime}/execdriver/native/default_template.go (98%) rename components/engine/{ => runtime}/execdriver/native/driver.go (99%) rename components/engine/{ => runtime}/execdriver/native/info.go (100%) rename components/engine/{ => runtime}/execdriver/native/term.go (94%) rename components/engine/{ => runtime}/execdriver/pipes.go (100%) rename components/engine/{ => runtime}/execdriver/termconsole.go (100%) diff --git a/components/engine/runtime/container.go b/components/engine/runtime/container.go index ee545db201..f4de40a16a 100644 --- a/components/engine/runtime/container.go +++ b/components/engine/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" diff --git a/components/engine/execdriver/MAINTAINERS b/components/engine/runtime/execdriver/MAINTAINERS similarity index 100% rename from components/engine/execdriver/MAINTAINERS rename to components/engine/runtime/execdriver/MAINTAINERS diff --git a/components/engine/execdriver/driver.go b/components/engine/runtime/execdriver/driver.go similarity index 100% rename from components/engine/execdriver/driver.go rename to components/engine/runtime/execdriver/driver.go diff --git a/components/engine/execdriver/execdrivers/execdrivers.go b/components/engine/runtime/execdriver/execdrivers/execdrivers.go similarity index 79% rename from components/engine/execdriver/execdrivers/execdrivers.go rename to components/engine/runtime/execdriver/execdrivers/execdrivers.go index 7486d649c1..29fa5b44f9 100644 --- a/components/engine/execdriver/execdrivers/execdrivers.go +++ b/components/engine/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" ) diff --git a/components/engine/execdriver/lxc/driver.go b/components/engine/runtime/execdriver/lxc/driver.go similarity index 99% rename from components/engine/execdriver/lxc/driver.go rename to components/engine/runtime/execdriver/lxc/driver.go index 9abec8ac3f..fa2ecf9d77 100644 --- a/components/engine/execdriver/lxc/driver.go +++ b/components/engine/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" diff --git a/components/engine/execdriver/lxc/info.go b/components/engine/runtime/execdriver/lxc/info.go similarity index 100% rename from components/engine/execdriver/lxc/info.go rename to components/engine/runtime/execdriver/lxc/info.go diff --git a/components/engine/execdriver/lxc/info_test.go b/components/engine/runtime/execdriver/lxc/info_test.go similarity index 100% rename from components/engine/execdriver/lxc/info_test.go rename to components/engine/runtime/execdriver/lxc/info_test.go diff --git a/components/engine/execdriver/lxc/init.go b/components/engine/runtime/execdriver/lxc/init.go similarity index 98% rename from components/engine/execdriver/lxc/init.go rename to components/engine/runtime/execdriver/lxc/init.go index 0f134088a3..946c8c930f 100644 --- a/components/engine/execdriver/lxc/init.go +++ b/components/engine/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" diff --git a/components/engine/execdriver/lxc/lxc_init_linux.go b/components/engine/runtime/execdriver/lxc/lxc_init_linux.go similarity index 100% rename from components/engine/execdriver/lxc/lxc_init_linux.go rename to components/engine/runtime/execdriver/lxc/lxc_init_linux.go diff --git a/components/engine/execdriver/lxc/lxc_init_unsupported.go b/components/engine/runtime/execdriver/lxc/lxc_init_unsupported.go similarity index 100% rename from components/engine/execdriver/lxc/lxc_init_unsupported.go rename to components/engine/runtime/execdriver/lxc/lxc_init_unsupported.go diff --git a/components/engine/execdriver/lxc/lxc_template.go b/components/engine/runtime/execdriver/lxc/lxc_template.go similarity index 98% rename from components/engine/execdriver/lxc/lxc_template.go rename to components/engine/runtime/execdriver/lxc/lxc_template.go index 84cd4e442e..db55287522 100644 --- a/components/engine/execdriver/lxc/lxc_template.go +++ b/components/engine/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/components/engine/execdriver/lxc/lxc_template_unit_test.go b/components/engine/runtime/execdriver/lxc/lxc_template_unit_test.go similarity index 98% rename from components/engine/execdriver/lxc/lxc_template_unit_test.go rename to components/engine/runtime/execdriver/lxc/lxc_template_unit_test.go index 99d6e636f5..ae66371836 100644 --- a/components/engine/execdriver/lxc/lxc_template_unit_test.go +++ b/components/engine/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/components/engine/execdriver/native/default_template.go b/components/engine/runtime/execdriver/native/default_template.go similarity index 98% rename from components/engine/execdriver/native/default_template.go rename to components/engine/runtime/execdriver/native/default_template.go index 5351911427..0c382059e9 100644 --- a/components/engine/execdriver/native/default_template.go +++ b/components/engine/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" diff --git a/components/engine/execdriver/native/driver.go b/components/engine/runtime/execdriver/native/driver.go similarity index 99% rename from components/engine/execdriver/native/driver.go rename to components/engine/runtime/execdriver/native/driver.go index 9b49fd156f..ff6c541cf9 100644 --- a/components/engine/execdriver/native/driver.go +++ b/components/engine/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" diff --git a/components/engine/execdriver/native/info.go b/components/engine/runtime/execdriver/native/info.go similarity index 100% rename from components/engine/execdriver/native/info.go rename to components/engine/runtime/execdriver/native/info.go diff --git a/components/engine/execdriver/native/term.go b/components/engine/runtime/execdriver/native/term.go similarity index 94% rename from components/engine/execdriver/native/term.go rename to components/engine/runtime/execdriver/native/term.go index ec69820f75..0d5298d388 100644 --- a/components/engine/execdriver/native/term.go +++ b/components/engine/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/components/engine/execdriver/pipes.go b/components/engine/runtime/execdriver/pipes.go similarity index 100% rename from components/engine/execdriver/pipes.go rename to components/engine/runtime/execdriver/pipes.go diff --git a/components/engine/execdriver/termconsole.go b/components/engine/runtime/execdriver/termconsole.go similarity index 100% rename from components/engine/execdriver/termconsole.go rename to components/engine/runtime/execdriver/termconsole.go diff --git a/components/engine/runtime/runtime.go b/components/engine/runtime/runtime.go index 092b5a8130..f75a4df048 100644 --- a/components/engine/runtime/runtime.go +++ b/components/engine/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" diff --git a/components/engine/runtime/volumes.go b/components/engine/runtime/volumes.go index 9cb66aae44..1bbb14a369 100644 --- a/components/engine/runtime/volumes.go +++ b/components/engine/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/components/engine/sysinit/sysinit.go b/components/engine/sysinit/sysinit.go index 56508b105d..50c858296f 100644 --- a/components/engine/sysinit/sysinit.go +++ b/components/engine/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" ) From 742b723fc200d1413d740a671e7266c152f6b3e5 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 14 Mar 2014 14:11:43 -0700 Subject: [PATCH 3/4] Move graphdrivers into runtime top level pkg Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: 96c4816cef592a98a235010924bb2417c8451079 Component: engine --- .../engine/contrib/docker-device-tool/device_tool.go | 2 +- components/engine/graph/graph.go | 2 +- components/engine/graph/tags_unit_test.go | 4 ++-- components/engine/image/graph.go | 2 +- components/engine/image/image.go | 2 +- components/engine/integration/graph_test.go | 2 +- components/engine/runtime/container.go | 2 +- .../engine/{ => runtime}/graphdriver/aufs/aufs.go | 2 +- .../engine/{ => runtime}/graphdriver/aufs/aufs_test.go | 2 +- .../engine/{ => runtime}/graphdriver/aufs/dirs.go | 0 .../engine/{ => runtime}/graphdriver/aufs/migrate.go | 0 .../engine/{ => runtime}/graphdriver/aufs/mount.go | 0 .../{ => runtime}/graphdriver/aufs/mount_linux.go | 0 .../graphdriver/aufs/mount_unsupported.go | 0 .../engine/{ => runtime}/graphdriver/btrfs/btrfs.go | 2 +- .../graphdriver/btrfs/dummy_unsupported.go | 0 .../graphdriver/devmapper/attach_loopback.go | 0 .../{ => runtime}/graphdriver/devmapper/deviceset.go | 0 .../{ => runtime}/graphdriver/devmapper/devmapper.go | 0 .../graphdriver/devmapper/devmapper_doc.go | 0 .../graphdriver/devmapper/devmapper_log.go | 0 .../graphdriver/devmapper/devmapper_test.go | 0 .../graphdriver/devmapper/devmapper_wrapper.go | 0 .../{ => runtime}/graphdriver/devmapper/driver.go | 2 +- .../{ => runtime}/graphdriver/devmapper/driver_test.go | 2 +- .../{ => runtime}/graphdriver/devmapper/ioctl.go | 0 .../{ => runtime}/graphdriver/devmapper/mount.go | 0 .../engine/{ => runtime}/graphdriver/devmapper/sys.go | 0 components/engine/{ => runtime}/graphdriver/driver.go | 0 .../engine/{ => runtime}/graphdriver/vfs/driver.go | 2 +- components/engine/runtime/runtime.go | 10 +++++----- 31 files changed, 19 insertions(+), 19 deletions(-) rename components/engine/{ => runtime}/graphdriver/aufs/aufs.go (99%) rename components/engine/{ => runtime}/graphdriver/aufs/aufs_test.go (99%) rename components/engine/{ => runtime}/graphdriver/aufs/dirs.go (100%) rename components/engine/{ => runtime}/graphdriver/aufs/migrate.go (100%) rename components/engine/{ => runtime}/graphdriver/aufs/mount.go (100%) rename components/engine/{ => runtime}/graphdriver/aufs/mount_linux.go (100%) rename components/engine/{ => runtime}/graphdriver/aufs/mount_unsupported.go (100%) rename components/engine/{ => runtime}/graphdriver/btrfs/btrfs.go (98%) rename components/engine/{ => runtime}/graphdriver/btrfs/dummy_unsupported.go (100%) rename components/engine/{ => runtime}/graphdriver/devmapper/attach_loopback.go (100%) rename components/engine/{ => runtime}/graphdriver/devmapper/deviceset.go (100%) rename components/engine/{ => runtime}/graphdriver/devmapper/devmapper.go (100%) rename components/engine/{ => runtime}/graphdriver/devmapper/devmapper_doc.go (100%) rename components/engine/{ => runtime}/graphdriver/devmapper/devmapper_log.go (100%) rename components/engine/{ => runtime}/graphdriver/devmapper/devmapper_test.go (100%) rename components/engine/{ => runtime}/graphdriver/devmapper/devmapper_wrapper.go (100%) rename components/engine/{ => runtime}/graphdriver/devmapper/driver.go (98%) rename components/engine/{ => runtime}/graphdriver/devmapper/driver_test.go (99%) rename components/engine/{ => runtime}/graphdriver/devmapper/ioctl.go (100%) rename components/engine/{ => runtime}/graphdriver/devmapper/mount.go (100%) rename components/engine/{ => runtime}/graphdriver/devmapper/sys.go (100%) rename components/engine/{ => runtime}/graphdriver/driver.go (100%) rename components/engine/{ => runtime}/graphdriver/vfs/driver.go (97%) diff --git a/components/engine/contrib/docker-device-tool/device_tool.go b/components/engine/contrib/docker-device-tool/device_tool.go index 4d1ee0cea5..12c762a7f3 100644 --- a/components/engine/contrib/docker-device-tool/device_tool.go +++ b/components/engine/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/components/engine/graph/graph.go b/components/engine/graph/graph.go index 01659b549f..f71b8a003e 100644 --- a/components/engine/graph/graph.go +++ b/components/engine/graph/graph.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/runconfig" "github.com/dotcloud/docker/utils" diff --git a/components/engine/graph/tags_unit_test.go b/components/engine/graph/tags_unit_test.go index 153f94db3d..cae5c2916e 100644 --- a/components/engine/graph/tags_unit_test.go +++ b/components/engine/graph/tags_unit_test.go @@ -2,8 +2,8 @@ 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/runtime/graphdriver" + _ "github.com/dotcloud/docker/runtime/graphdriver/vfs" // import the vfs driver so it is used in the tests "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" diff --git a/components/engine/image/graph.go b/components/engine/image/graph.go index 857c09edd9..dd0136b00e 100644 --- a/components/engine/image/graph.go +++ b/components/engine/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/components/engine/image/image.go b/components/engine/image/image.go index e091879049..b2ddb03b0b 100644 --- a/components/engine/image/image.go +++ b/components/engine/image/image.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/runconfig" "github.com/dotcloud/docker/utils" "io/ioutil" diff --git a/components/engine/integration/graph_test.go b/components/engine/integration/graph_test.go index e575a252f3..ea9ddc7ae9 100644 --- a/components/engine/integration/graph_test.go +++ b/components/engine/integration/graph_test.go @@ -5,7 +5,7 @@ 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/runtime/graphdriver" "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/utils" "io" diff --git a/components/engine/runtime/container.go b/components/engine/runtime/container.go index f4de40a16a..3c7aa22751 100644 --- a/components/engine/runtime/container.go +++ b/components/engine/runtime/container.go @@ -7,7 +7,7 @@ import ( "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/runtime/execdriver" - "github.com/dotcloud/docker/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/links" "github.com/dotcloud/docker/nat" diff --git a/components/engine/graphdriver/aufs/aufs.go b/components/engine/runtime/graphdriver/aufs/aufs.go similarity index 99% rename from components/engine/graphdriver/aufs/aufs.go rename to components/engine/runtime/graphdriver/aufs/aufs.go index a15cf6b273..83a6579bc6 100644 --- a/components/engine/graphdriver/aufs/aufs.go +++ b/components/engine/runtime/graphdriver/aufs/aufs.go @@ -24,7 +24,7 @@ import ( "bufio" "fmt" "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/graphdriver" + "github.com/dotcloud/docker/runtime/graphdriver" mountpk "github.com/dotcloud/docker/pkg/mount" "github.com/dotcloud/docker/utils" "os" diff --git a/components/engine/graphdriver/aufs/aufs_test.go b/components/engine/runtime/graphdriver/aufs/aufs_test.go similarity index 99% rename from components/engine/graphdriver/aufs/aufs_test.go rename to components/engine/runtime/graphdriver/aufs/aufs_test.go index 6002bec5a1..cb417c3b26 100644 --- a/components/engine/graphdriver/aufs/aufs_test.go +++ b/components/engine/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/components/engine/graphdriver/aufs/dirs.go b/components/engine/runtime/graphdriver/aufs/dirs.go similarity index 100% rename from components/engine/graphdriver/aufs/dirs.go rename to components/engine/runtime/graphdriver/aufs/dirs.go diff --git a/components/engine/graphdriver/aufs/migrate.go b/components/engine/runtime/graphdriver/aufs/migrate.go similarity index 100% rename from components/engine/graphdriver/aufs/migrate.go rename to components/engine/runtime/graphdriver/aufs/migrate.go diff --git a/components/engine/graphdriver/aufs/mount.go b/components/engine/runtime/graphdriver/aufs/mount.go similarity index 100% rename from components/engine/graphdriver/aufs/mount.go rename to components/engine/runtime/graphdriver/aufs/mount.go diff --git a/components/engine/graphdriver/aufs/mount_linux.go b/components/engine/runtime/graphdriver/aufs/mount_linux.go similarity index 100% rename from components/engine/graphdriver/aufs/mount_linux.go rename to components/engine/runtime/graphdriver/aufs/mount_linux.go diff --git a/components/engine/graphdriver/aufs/mount_unsupported.go b/components/engine/runtime/graphdriver/aufs/mount_unsupported.go similarity index 100% rename from components/engine/graphdriver/aufs/mount_unsupported.go rename to components/engine/runtime/graphdriver/aufs/mount_unsupported.go diff --git a/components/engine/graphdriver/btrfs/btrfs.go b/components/engine/runtime/graphdriver/btrfs/btrfs.go similarity index 98% rename from components/engine/graphdriver/btrfs/btrfs.go rename to components/engine/runtime/graphdriver/btrfs/btrfs.go index 592e058458..b0530be92b 100644 --- a/components/engine/graphdriver/btrfs/btrfs.go +++ b/components/engine/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/components/engine/graphdriver/btrfs/dummy_unsupported.go b/components/engine/runtime/graphdriver/btrfs/dummy_unsupported.go similarity index 100% rename from components/engine/graphdriver/btrfs/dummy_unsupported.go rename to components/engine/runtime/graphdriver/btrfs/dummy_unsupported.go diff --git a/components/engine/graphdriver/devmapper/attach_loopback.go b/components/engine/runtime/graphdriver/devmapper/attach_loopback.go similarity index 100% rename from components/engine/graphdriver/devmapper/attach_loopback.go rename to components/engine/runtime/graphdriver/devmapper/attach_loopback.go diff --git a/components/engine/graphdriver/devmapper/deviceset.go b/components/engine/runtime/graphdriver/devmapper/deviceset.go similarity index 100% rename from components/engine/graphdriver/devmapper/deviceset.go rename to components/engine/runtime/graphdriver/devmapper/deviceset.go diff --git a/components/engine/graphdriver/devmapper/devmapper.go b/components/engine/runtime/graphdriver/devmapper/devmapper.go similarity index 100% rename from components/engine/graphdriver/devmapper/devmapper.go rename to components/engine/runtime/graphdriver/devmapper/devmapper.go diff --git a/components/engine/graphdriver/devmapper/devmapper_doc.go b/components/engine/runtime/graphdriver/devmapper/devmapper_doc.go similarity index 100% rename from components/engine/graphdriver/devmapper/devmapper_doc.go rename to components/engine/runtime/graphdriver/devmapper/devmapper_doc.go diff --git a/components/engine/graphdriver/devmapper/devmapper_log.go b/components/engine/runtime/graphdriver/devmapper/devmapper_log.go similarity index 100% rename from components/engine/graphdriver/devmapper/devmapper_log.go rename to components/engine/runtime/graphdriver/devmapper/devmapper_log.go diff --git a/components/engine/graphdriver/devmapper/devmapper_test.go b/components/engine/runtime/graphdriver/devmapper/devmapper_test.go similarity index 100% rename from components/engine/graphdriver/devmapper/devmapper_test.go rename to components/engine/runtime/graphdriver/devmapper/devmapper_test.go diff --git a/components/engine/graphdriver/devmapper/devmapper_wrapper.go b/components/engine/runtime/graphdriver/devmapper/devmapper_wrapper.go similarity index 100% rename from components/engine/graphdriver/devmapper/devmapper_wrapper.go rename to components/engine/runtime/graphdriver/devmapper/devmapper_wrapper.go diff --git a/components/engine/graphdriver/devmapper/driver.go b/components/engine/runtime/graphdriver/devmapper/driver.go similarity index 98% rename from components/engine/graphdriver/devmapper/driver.go rename to components/engine/runtime/graphdriver/devmapper/driver.go index 8c5a19eea0..33c7a0f483 100644 --- a/components/engine/graphdriver/devmapper/driver.go +++ b/components/engine/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/components/engine/graphdriver/devmapper/driver_test.go b/components/engine/runtime/graphdriver/devmapper/driver_test.go similarity index 99% rename from components/engine/graphdriver/devmapper/driver_test.go rename to components/engine/runtime/graphdriver/devmapper/driver_test.go index 68699f208e..9af71a00b3 100644 --- a/components/engine/graphdriver/devmapper/driver_test.go +++ b/components/engine/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/components/engine/graphdriver/devmapper/ioctl.go b/components/engine/runtime/graphdriver/devmapper/ioctl.go similarity index 100% rename from components/engine/graphdriver/devmapper/ioctl.go rename to components/engine/runtime/graphdriver/devmapper/ioctl.go diff --git a/components/engine/graphdriver/devmapper/mount.go b/components/engine/runtime/graphdriver/devmapper/mount.go similarity index 100% rename from components/engine/graphdriver/devmapper/mount.go rename to components/engine/runtime/graphdriver/devmapper/mount.go diff --git a/components/engine/graphdriver/devmapper/sys.go b/components/engine/runtime/graphdriver/devmapper/sys.go similarity index 100% rename from components/engine/graphdriver/devmapper/sys.go rename to components/engine/runtime/graphdriver/devmapper/sys.go diff --git a/components/engine/graphdriver/driver.go b/components/engine/runtime/graphdriver/driver.go similarity index 100% rename from components/engine/graphdriver/driver.go rename to components/engine/runtime/graphdriver/driver.go diff --git a/components/engine/graphdriver/vfs/driver.go b/components/engine/runtime/graphdriver/vfs/driver.go similarity index 97% rename from components/engine/graphdriver/vfs/driver.go rename to components/engine/runtime/graphdriver/vfs/driver.go index 21da63878a..10a7b223a4 100644 --- a/components/engine/graphdriver/vfs/driver.go +++ b/components/engine/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/components/engine/runtime/runtime.go b/components/engine/runtime/runtime.go index f75a4df048..25edd774d8 100644 --- a/components/engine/runtime/runtime.go +++ b/components/engine/runtime/runtime.go @@ -11,11 +11,11 @@ import ( "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" - _ "github.com/dotcloud/docker/graphdriver/btrfs" - _ "github.com/dotcloud/docker/graphdriver/devmapper" - _ "github.com/dotcloud/docker/graphdriver/vfs" + "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/image" _ "github.com/dotcloud/docker/runtime/networkdriver/lxc" "github.com/dotcloud/docker/runtime/networkdriver/portallocator" From 8d099b8012a2b6cf78646c5d31a2c35187fd0556 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 14 Mar 2014 15:07:52 -0700 Subject: [PATCH 4/4] Gofmt imports Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: 2bddcd68b4b927d36ffadd80e098f6d4ae2cf5d6 Component: engine --- components/engine/graph/graph.go | 2 +- components/engine/graph/tags_unit_test.go | 2 +- components/engine/image/image.go | 2 +- components/engine/integration/graph_test.go | 2 +- components/engine/runtime/container.go | 4 ++-- .../runtime/execdriver/execdrivers/execdrivers.go | 2 +- components/engine/runtime/execdriver/lxc/driver.go | 2 +- components/engine/runtime/execdriver/lxc/init.go | 2 +- .../runtime/execdriver/native/default_template.go | 2 +- components/engine/runtime/execdriver/native/driver.go | 2 +- components/engine/runtime/graphdriver/aufs/aufs.go | 2 +- .../runtime/networkdriver/ipallocator/allocator.go | 2 +- components/engine/runtime/networkdriver/lxc/driver.go | 4 ++-- components/engine/runtime/runtime.go | 10 +++++----- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/components/engine/graph/graph.go b/components/engine/graph/graph.go index f71b8a003e..4349cac129 100644 --- a/components/engine/graph/graph.go +++ b/components/engine/graph/graph.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/runtime/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/components/engine/graph/tags_unit_test.go b/components/engine/graph/tags_unit_test.go index cae5c2916e..17773912cf 100644 --- a/components/engine/graph/tags_unit_test.go +++ b/components/engine/graph/tags_unit_test.go @@ -2,9 +2,9 @@ package graph import ( "bytes" + "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/image" "github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io" diff --git a/components/engine/image/image.go b/components/engine/image/image.go index b2ddb03b0b..33503bad5a 100644 --- a/components/engine/image/image.go +++ b/components/engine/image/image.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/runconfig" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/utils" "io/ioutil" "os" diff --git a/components/engine/integration/graph_test.go b/components/engine/integration/graph_test.go index ea9ddc7ae9..5602b3938d 100644 --- a/components/engine/integration/graph_test.go +++ b/components/engine/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/runtime/graphdriver" "github.com/dotcloud/docker/image" + "github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/utils" "io" "io/ioutil" diff --git a/components/engine/runtime/container.go b/components/engine/runtime/container.go index 3c7aa22751..9b138c89c1 100644 --- a/components/engine/runtime/container.go +++ b/components/engine/runtime/container.go @@ -6,12 +6,12 @@ import ( "fmt" "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/runtime/execdriver" - "github.com/dotcloud/docker/runtime/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/components/engine/runtime/execdriver/execdrivers/execdrivers.go b/components/engine/runtime/execdriver/execdrivers/execdrivers.go index 29fa5b44f9..9e277c86df 100644 --- a/components/engine/runtime/execdriver/execdrivers/execdrivers.go +++ b/components/engine/runtime/execdriver/execdrivers/execdrivers.go @@ -2,10 +2,10 @@ package execdrivers import ( "fmt" + "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" - "github.com/dotcloud/docker/pkg/sysinfo" "path" ) diff --git a/components/engine/runtime/execdriver/lxc/driver.go b/components/engine/runtime/execdriver/lxc/driver.go index fa2ecf9d77..b7311cc1ff 100644 --- a/components/engine/runtime/execdriver/lxc/driver.go +++ b/components/engine/runtime/execdriver/lxc/driver.go @@ -2,8 +2,8 @@ package lxc import ( "fmt" - "github.com/dotcloud/docker/runtime/execdriver" "github.com/dotcloud/docker/pkg/cgroups" + "github.com/dotcloud/docker/runtime/execdriver" "github.com/dotcloud/docker/utils" "io/ioutil" "log" diff --git a/components/engine/runtime/execdriver/lxc/init.go b/components/engine/runtime/execdriver/lxc/init.go index 946c8c930f..a64bca15b2 100644 --- a/components/engine/runtime/execdriver/lxc/init.go +++ b/components/engine/runtime/execdriver/lxc/init.go @@ -3,9 +3,9 @@ package lxc import ( "encoding/json" "fmt" - "github.com/dotcloud/docker/runtime/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/components/engine/runtime/execdriver/native/default_template.go b/components/engine/runtime/execdriver/native/default_template.go index 0c382059e9..e76be6ebec 100644 --- a/components/engine/runtime/execdriver/native/default_template.go +++ b/components/engine/runtime/execdriver/native/default_template.go @@ -2,9 +2,9 @@ package native import ( "fmt" - "github.com/dotcloud/docker/runtime/execdriver" "github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/dotcloud/docker/runtime/execdriver" "os" ) diff --git a/components/engine/runtime/execdriver/native/driver.go b/components/engine/runtime/execdriver/native/driver.go index ff6c541cf9..bf7e8ccdec 100644 --- a/components/engine/runtime/execdriver/native/driver.go +++ b/components/engine/runtime/execdriver/native/driver.go @@ -3,12 +3,12 @@ package native import ( "encoding/json" "fmt" - "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" "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/components/engine/runtime/graphdriver/aufs/aufs.go b/components/engine/runtime/graphdriver/aufs/aufs.go index 83a6579bc6..6f05ddd025 100644 --- a/components/engine/runtime/graphdriver/aufs/aufs.go +++ b/components/engine/runtime/graphdriver/aufs/aufs.go @@ -24,8 +24,8 @@ import ( "bufio" "fmt" "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/runtime/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/components/engine/runtime/networkdriver/ipallocator/allocator.go b/components/engine/runtime/networkdriver/ipallocator/allocator.go index 2950e37003..70a7028bbe 100644 --- a/components/engine/runtime/networkdriver/ipallocator/allocator.go +++ b/components/engine/runtime/networkdriver/ipallocator/allocator.go @@ -3,8 +3,8 @@ package ipallocator import ( "encoding/binary" "errors" - "github.com/dotcloud/docker/runtime/networkdriver" "github.com/dotcloud/docker/pkg/collections" + "github.com/dotcloud/docker/runtime/networkdriver" "net" "sync" ) diff --git a/components/engine/runtime/networkdriver/lxc/driver.go b/components/engine/runtime/networkdriver/lxc/driver.go index 746bcfb5b0..827de2a609 100644 --- a/components/engine/runtime/networkdriver/lxc/driver.go +++ b/components/engine/runtime/networkdriver/lxc/driver.go @@ -3,12 +3,12 @@ package lxc import ( "fmt" "github.com/dotcloud/docker/engine" + "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/pkg/iptables" - "github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/utils" "io/ioutil" "log" diff --git a/components/engine/runtime/runtime.go b/components/engine/runtime/runtime.go index 25edd774d8..677d52acc5 100644 --- a/components/engine/runtime/runtime.go +++ b/components/engine/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/graph" + "github.com/dotcloud/docker/image" + "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/graph" "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/image" _ "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" "github.com/dotcloud/docker/utils" "io" "io/ioutil"