diff options
author | Brian Goff <cpuguy83@gmail.com> | 2021-04-06 00:24:47 +0000 |
---|---|---|
committer | Brian Goff <cpuguy83@gmail.com> | 2021-06-01 21:51:23 +0000 |
commit | a0a473125bad04b66042aaafb331243dfd2d77f9 (patch) | |
tree | 164f96375408f0221d26ed2acfb3dc0a8b7e574c /libnetwork/cmd | |
parent | 51650935705f1dc93ff9e363fd1b6c98e67b48c5 (diff) | |
download | docker-a0a473125bad04b66042aaafb331243dfd2d77f9.tar.gz |
Fix libnetwork imports
After moving libnetwork to this repo, we need to update all the import
paths for libnetwork to point to docker/docker/libnetwork instead of
docker/libnetwork.
This change implements that.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Diffstat (limited to 'libnetwork/cmd')
-rw-r--r-- | libnetwork/cmd/diagnostic/main.go | 8 | ||||
-rw-r--r-- | libnetwork/cmd/dnet/cmd.go | 2 | ||||
-rw-r--r-- | libnetwork/cmd/dnet/dnet.go | 20 | ||||
-rw-r--r-- | libnetwork/cmd/networkdb-test/dbserver/ndbServer.go | 6 | ||||
-rw-r--r-- | libnetwork/cmd/networkdb-test/dummyclient/dummyClient.go | 4 | ||||
-rw-r--r-- | libnetwork/cmd/networkdb-test/testMain.go | 4 | ||||
-rw-r--r-- | libnetwork/cmd/ovrouter/ovrouter.go | 8 | ||||
-rw-r--r-- | libnetwork/cmd/proxy/network_proxy_test.go | 2 | ||||
-rw-r--r-- | libnetwork/cmd/readme_test/readme.go | 8 |
9 files changed, 31 insertions, 31 deletions
diff --git a/libnetwork/cmd/diagnostic/main.go b/libnetwork/cmd/diagnostic/main.go index 869089d256..c223975094 100644 --- a/libnetwork/cmd/diagnostic/main.go +++ b/libnetwork/cmd/diagnostic/main.go @@ -12,9 +12,9 @@ import ( "os" "strings" - "github.com/docker/libnetwork" - "github.com/docker/libnetwork/diagnostic" - "github.com/docker/libnetwork/drivers/overlay" + "github.com/docker/docker/libnetwork" + "github.com/docker/docker/libnetwork/diagnostic" + "github.com/docker/docker/libnetwork/drivers/overlay" "github.com/sirupsen/logrus" ) @@ -56,7 +56,7 @@ func main() { if _, ok := os.LookupEnv("DIND_CLIENT"); !ok && *joinPtr { logrus.Fatal("you are not using the client in docker in docker mode, the use of the -a flag can be disruptive, " + - "please remove it (doc:https://github.com/docker/libnetwork/blob/master/cmd/diagnostic/README.md)") + "please remove it (doc:https://github.com/docker/docker/libnetwork/blob/master/cmd/diagnostic/README.md)") } logrus.Infof("Connecting to %s:%d checking ready", *ipPtr, *portPtr) diff --git a/libnetwork/cmd/dnet/cmd.go b/libnetwork/cmd/dnet/cmd.go index 1f79d38e12..848f76dada 100644 --- a/libnetwork/cmd/dnet/cmd.go +++ b/libnetwork/cmd/dnet/cmd.go @@ -8,7 +8,7 @@ import ( "net/http" "os" - "github.com/docker/libnetwork/client" + "github.com/docker/docker/libnetwork/client" "github.com/moby/term" "github.com/urfave/cli" ) diff --git a/libnetwork/cmd/dnet/dnet.go b/libnetwork/cmd/dnet/dnet.go index 8bb2dcb404..f43e49180f 100644 --- a/libnetwork/cmd/dnet/dnet.go +++ b/libnetwork/cmd/dnet/dnet.go @@ -23,16 +23,16 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/pkg/discovery" "github.com/docker/docker/pkg/reexec" - "github.com/docker/libnetwork" - "github.com/docker/libnetwork/api" - "github.com/docker/libnetwork/cluster" - "github.com/docker/libnetwork/config" - "github.com/docker/libnetwork/datastore" - "github.com/docker/libnetwork/driverapi" - "github.com/docker/libnetwork/netlabel" - "github.com/docker/libnetwork/netutils" - "github.com/docker/libnetwork/options" - "github.com/docker/libnetwork/types" + "github.com/docker/docker/libnetwork" + "github.com/docker/docker/libnetwork/api" + "github.com/docker/docker/libnetwork/cluster" + "github.com/docker/docker/libnetwork/config" + "github.com/docker/docker/libnetwork/datastore" + "github.com/docker/docker/libnetwork/driverapi" + "github.com/docker/docker/libnetwork/netlabel" + "github.com/docker/docker/libnetwork/netutils" + "github.com/docker/docker/libnetwork/options" + "github.com/docker/docker/libnetwork/types" "github.com/gorilla/mux" "github.com/moby/term" "github.com/sirupsen/logrus" diff --git a/libnetwork/cmd/networkdb-test/dbserver/ndbServer.go b/libnetwork/cmd/networkdb-test/dbserver/ndbServer.go index 322228270f..fc836bd22e 100644 --- a/libnetwork/cmd/networkdb-test/dbserver/ndbServer.go +++ b/libnetwork/cmd/networkdb-test/dbserver/ndbServer.go @@ -9,9 +9,9 @@ import ( "os" "strconv" - "github.com/docker/libnetwork/cmd/networkdb-test/dummyclient" - "github.com/docker/libnetwork/diagnostic" - "github.com/docker/libnetwork/networkdb" + "github.com/docker/docker/libnetwork/cmd/networkdb-test/dummyclient" + "github.com/docker/docker/libnetwork/diagnostic" + "github.com/docker/docker/libnetwork/networkdb" "github.com/sirupsen/logrus" ) diff --git a/libnetwork/cmd/networkdb-test/dummyclient/dummyClient.go b/libnetwork/cmd/networkdb-test/dummyclient/dummyClient.go index 7bec1c8b02..ccb68146bf 100644 --- a/libnetwork/cmd/networkdb-test/dummyclient/dummyClient.go +++ b/libnetwork/cmd/networkdb-test/dummyclient/dummyClient.go @@ -6,8 +6,8 @@ import ( "net/http" events "github.com/docker/go-events" - "github.com/docker/libnetwork/diagnostic" - "github.com/docker/libnetwork/networkdb" + "github.com/docker/docker/libnetwork/diagnostic" + "github.com/docker/docker/libnetwork/networkdb" "github.com/sirupsen/logrus" ) diff --git a/libnetwork/cmd/networkdb-test/testMain.go b/libnetwork/cmd/networkdb-test/testMain.go index 76cc406af1..8731e3440d 100644 --- a/libnetwork/cmd/networkdb-test/testMain.go +++ b/libnetwork/cmd/networkdb-test/testMain.go @@ -4,8 +4,8 @@ import ( "log" "os" - "github.com/docker/libnetwork/cmd/networkdb-test/dbclient" - "github.com/docker/libnetwork/cmd/networkdb-test/dbserver" + "github.com/docker/docker/libnetwork/cmd/networkdb-test/dbclient" + "github.com/docker/docker/libnetwork/cmd/networkdb-test/dbserver" "github.com/sirupsen/logrus" ) diff --git a/libnetwork/cmd/ovrouter/ovrouter.go b/libnetwork/cmd/ovrouter/ovrouter.go index 0a4673c8af..bdce1f5708 100644 --- a/libnetwork/cmd/ovrouter/ovrouter.go +++ b/libnetwork/cmd/ovrouter/ovrouter.go @@ -8,10 +8,10 @@ import ( "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/reexec" - "github.com/docker/libnetwork/driverapi" - "github.com/docker/libnetwork/drivers/overlay" - "github.com/docker/libnetwork/netlabel" - "github.com/docker/libnetwork/types" + "github.com/docker/docker/libnetwork/driverapi" + "github.com/docker/docker/libnetwork/drivers/overlay" + "github.com/docker/docker/libnetwork/netlabel" + "github.com/docker/docker/libnetwork/types" "github.com/vishvananda/netlink" ) diff --git a/libnetwork/cmd/proxy/network_proxy_test.go b/libnetwork/cmd/proxy/network_proxy_test.go index f0da09f3ca..9d70216b01 100644 --- a/libnetwork/cmd/proxy/network_proxy_test.go +++ b/libnetwork/cmd/proxy/network_proxy_test.go @@ -12,7 +12,7 @@ import ( "github.com/ishidawataru/sctp" // this takes care of the incontainer flag - _ "github.com/docker/libnetwork/testutils" + _ "github.com/docker/docker/libnetwork/testutils" ) var testBuf = []byte("Buffalo buffalo Buffalo buffalo buffalo buffalo Buffalo buffalo") diff --git a/libnetwork/cmd/readme_test/readme.go b/libnetwork/cmd/readme_test/readme.go index 5529f7c6fd..800eec3258 100644 --- a/libnetwork/cmd/readme_test/readme.go +++ b/libnetwork/cmd/readme_test/readme.go @@ -5,10 +5,10 @@ import ( "log" "github.com/docker/docker/pkg/reexec" - "github.com/docker/libnetwork" - "github.com/docker/libnetwork/config" - "github.com/docker/libnetwork/netlabel" - "github.com/docker/libnetwork/options" + "github.com/docker/docker/libnetwork" + "github.com/docker/docker/libnetwork/config" + "github.com/docker/docker/libnetwork/netlabel" + "github.com/docker/docker/libnetwork/options" ) func main() { |