0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnet/ipams/builtin: move to libnet/ipams

Browse source 
Packages in libnet/ipams are drivers, except builtin -- it's used
to register drivers. Move files one level up and delete this pkg.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
This commit is contained in:
Albin Kerouanton 2024-04-18 10:52:34 +02:00
parent cf516e17de
commit 53f80762b8
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/cnmallocator/drivers_ipam.go
View file

@ -7,7 +7,7 @@ import (
"github.com/containerd/log"
"github.com/docker/docker/libnetwork/ipamapi"
builtinIpam "github.com/docker/docker/libnetwork/ipams/builtin"
builtinIpam "github.com/docker/docker/libnetwork/ipams"
nullIpam "github.com/docker/docker/libnetwork/ipams/null"
"github.com/docker/docker/libnetwork/ipamutils"
"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"

2
libnetwork/drivers_ipam.go
View file

@ -2,7 +2,7 @@ package libnetwork
import (
"github.com/docker/docker/libnetwork/ipamapi"
builtinIpam "github.com/docker/docker/libnetwork/ipams/builtin"
builtinIpam "github.com/docker/docker/libnetwork/ipams"
nullIpam "github.com/docker/docker/libnetwork/ipams/null"
remoteIpam "github.com/docker/docker/libnetwork/ipams/remote"
"github.com/docker/docker/libnetwork/ipamutils"

2
libnetwork/drvregistry/ipams_test.go
View file

@ -6,7 +6,7 @@ import (
"testing"
"github.com/docker/docker/libnetwork/ipamapi"
builtinIpam "github.com/docker/docker/libnetwork/ipams/builtin"
builtinIpam "github.com/docker/docker/libnetwork/ipams"
nullIpam "github.com/docker/docker/libnetwork/ipams/null"
remoteIpam "github.com/docker/docker/libnetwork/ipams/remote"
"github.com/docker/docker/libnetwork/ipamutils"

2
libnetwork/ipams/builtin/builtin.go → libnetwork/ipams/drivers.go
View file

@ -1,4 +1,4 @@
package builtin
package ipams
import (
"github.com/docker/docker/libnetwork/ipamapi"

2
libnetwork/ipams/builtin/builtin_unix.go → libnetwork/ipams/drivers_unix.go
View file

@ -1,6 +1,6 @@
//go:build linux || freebsd || darwin
package builtin
package ipams
import (
"github.com/docker/docker/libnetwork/ipamapi"

2
libnetwork/ipams/builtin/builtin_windows.go → libnetwork/ipams/drivers_windows.go
View file

@ -1,6 +1,6 @@
//go:build windows
package builtin
package ipams
import (
"github.com/docker/docker/libnetwork/ipamapi"