From a91b2431a303f919b0737d95639d8e445124cb23 Mon Sep 17 00:00:00 2001 From: bobby abbott Date: Sun, 22 Mar 2015 23:27:04 -0700 Subject: [PATCH] Refactor pkg/networkfs Solves #11591 Signed-off-by: bobby abbott --- api/client/commands.go | 2 +- daemon/container.go | 4 ++-- daemon/daemon.go | 2 +- daemon/networkdriver/bridge/driver.go | 2 +- integration-cli/docker_cli_run_test.go | 2 +- pkg/{networkfs => }/etchosts/etchosts.go | 0 pkg/{networkfs => }/etchosts/etchosts_test.go | 0 pkg/{networkfs => }/resolvconf/resolvconf.go | 0 pkg/{networkfs => }/resolvconf/resolvconf_test.go | 0 9 files changed, 6 insertions(+), 6 deletions(-) rename pkg/{networkfs => }/etchosts/etchosts.go (100%) rename pkg/{networkfs => }/etchosts/etchosts_test.go (100%) rename pkg/{networkfs => }/resolvconf/resolvconf.go (100%) rename pkg/{networkfs => }/resolvconf/resolvconf_test.go (100%) diff --git a/api/client/commands.go b/api/client/commands.go index 2b837596e8..6de8ca01fa 100644 --- a/api/client/commands.go +++ b/api/client/commands.go @@ -37,11 +37,11 @@ import ( "github.com/docker/docker/pkg/fileutils" "github.com/docker/docker/pkg/homedir" flag "github.com/docker/docker/pkg/mflag" - "github.com/docker/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers/filters" "github.com/docker/docker/pkg/progressreader" "github.com/docker/docker/pkg/promise" + "github.com/docker/docker/pkg/resolvconf" "github.com/docker/docker/pkg/signal" "github.com/docker/docker/pkg/symlink" "github.com/docker/docker/pkg/term" diff --git a/daemon/container.go b/daemon/container.go index 0fff3238e9..4b7c58558a 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -31,10 +31,10 @@ import ( "github.com/docker/docker/pkg/broadcastwriter" "github.com/docker/docker/pkg/common" "github.com/docker/docker/pkg/directory" + "github.com/docker/docker/pkg/etchosts" "github.com/docker/docker/pkg/ioutils" - "github.com/docker/docker/pkg/networkfs/etchosts" - "github.com/docker/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/pkg/promise" + "github.com/docker/docker/pkg/resolvconf" "github.com/docker/docker/pkg/symlink" "github.com/docker/docker/pkg/ulimit" "github.com/docker/docker/runconfig" diff --git a/daemon/daemon.go b/daemon/daemon.go index ebb43e2484..6a27a085a0 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -35,9 +35,9 @@ import ( "github.com/docker/docker/pkg/graphdb" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/namesgenerator" - "github.com/docker/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers/kernel" + "github.com/docker/docker/pkg/resolvconf" "github.com/docker/docker/pkg/sysinfo" "github.com/docker/docker/pkg/truncindex" "github.com/docker/docker/runconfig" diff --git a/daemon/networkdriver/bridge/driver.go b/daemon/networkdriver/bridge/driver.go index aa139b9a39..b8dfdf9488 100644 --- a/daemon/networkdriver/bridge/driver.go +++ b/daemon/networkdriver/bridge/driver.go @@ -17,8 +17,8 @@ import ( "github.com/docker/docker/engine" "github.com/docker/docker/nat" "github.com/docker/docker/pkg/iptables" - "github.com/docker/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/pkg/parsers/kernel" + "github.com/docker/docker/pkg/resolvconf" "github.com/docker/libcontainer/netlink" ) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 636ef36e12..f192468e0e 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -20,7 +20,7 @@ import ( "time" "github.com/docker/docker/nat" - "github.com/docker/docker/pkg/networkfs/resolvconf" + "github.com/docker/docker/pkg/resolvconf" ) // "test123" should be printed by docker run diff --git a/pkg/networkfs/etchosts/etchosts.go b/pkg/etchosts/etchosts.go similarity index 100% rename from pkg/networkfs/etchosts/etchosts.go rename to pkg/etchosts/etchosts.go diff --git a/pkg/networkfs/etchosts/etchosts_test.go b/pkg/etchosts/etchosts_test.go similarity index 100% rename from pkg/networkfs/etchosts/etchosts_test.go rename to pkg/etchosts/etchosts_test.go diff --git a/pkg/networkfs/resolvconf/resolvconf.go b/pkg/resolvconf/resolvconf.go similarity index 100% rename from pkg/networkfs/resolvconf/resolvconf.go rename to pkg/resolvconf/resolvconf.go diff --git a/pkg/networkfs/resolvconf/resolvconf_test.go b/pkg/resolvconf/resolvconf_test.go similarity index 100% rename from pkg/networkfs/resolvconf/resolvconf_test.go rename to pkg/resolvconf/resolvconf_test.go