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/drvregistry | |
| 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/drvregistry')
| -rw-r--r-- | libnetwork/drvregistry/drvregistry.go | 6 | ||||
| -rw-r--r-- | libnetwork/drvregistry/drvregistry_test.go | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libnetwork/drvregistry/drvregistry.go b/libnetwork/drvregistry/drvregistry.go index cc336fa5a8..ab80012969 100644 --- a/libnetwork/drvregistry/drvregistry.go +++ b/libnetwork/drvregistry/drvregistry.go @@ -7,9 +7,9 @@ import ( "sync" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/libnetwork/driverapi" - "github.com/docker/libnetwork/ipamapi" - "github.com/docker/libnetwork/types" + "github.com/docker/docker/libnetwork/driverapi" + "github.com/docker/docker/libnetwork/ipamapi" + "github.com/docker/docker/libnetwork/types" ) type driverData struct { diff --git a/libnetwork/drvregistry/drvregistry_test.go b/libnetwork/drvregistry/drvregistry_test.go index f1716df149..31efc7efaf 100644 --- a/libnetwork/drvregistry/drvregistry_test.go +++ b/libnetwork/drvregistry/drvregistry_test.go @@ -4,18 +4,18 @@ import ( "sort" "testing" - "github.com/docker/libnetwork/datastore" - "github.com/docker/libnetwork/discoverapi" - "github.com/docker/libnetwork/driverapi" - "github.com/docker/libnetwork/ipamapi" - builtinIpam "github.com/docker/libnetwork/ipams/builtin" - nullIpam "github.com/docker/libnetwork/ipams/null" - remoteIpam "github.com/docker/libnetwork/ipams/remote" + "github.com/docker/docker/libnetwork/datastore" + "github.com/docker/docker/libnetwork/discoverapi" + "github.com/docker/docker/libnetwork/driverapi" + "github.com/docker/docker/libnetwork/ipamapi" + builtinIpam "github.com/docker/docker/libnetwork/ipams/builtin" + nullIpam "github.com/docker/docker/libnetwork/ipams/null" + remoteIpam "github.com/docker/docker/libnetwork/ipams/remote" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" // this takes care of the incontainer flag - _ "github.com/docker/libnetwork/testutils" + _ "github.com/docker/docker/libnetwork/testutils" ) const mockDriverName = "mock-driver" |