diff --git a/libnetwork/ipams/drivers_windows.go b/libnetwork/ipams/drivers.go similarity index 96% rename from libnetwork/ipams/drivers_windows.go rename to libnetwork/ipams/drivers.go index 7fc3c8ee09..b65ea7701a 100644 --- a/libnetwork/ipams/drivers_windows.go +++ b/libnetwork/ipams/drivers.go @@ -1,5 +1,3 @@ -//go:build windows - package ipams import ( diff --git a/libnetwork/ipams/drivers_unix.go b/libnetwork/ipams/drivers_unix.go deleted file mode 100644 index a3ab1e18f1..0000000000 --- a/libnetwork/ipams/drivers_unix.go +++ /dev/null @@ -1,14 +0,0 @@ -//go:build linux || freebsd || darwin - -package ipams - -import ( - "github.com/docker/docker/libnetwork/ipamapi" - "github.com/docker/docker/libnetwork/ipams/defaultipam" - "github.com/docker/docker/libnetwork/ipamutils" -) - -// Register registers the built-in ipam service with libnetwork. -func Register(r ipamapi.Registerer, addressPools []*ipamutils.NetworkToSplit) error { - return defaultipam.Register(r, addressPools) -} diff --git a/libnetwork/ipams/windowsipam/windowsipam.go b/libnetwork/ipams/windowsipam/windowsipam.go index 498b34bb2f..5e4ad2225d 100644 --- a/libnetwork/ipams/windowsipam/windowsipam.go +++ b/libnetwork/ipams/windowsipam/windowsipam.go @@ -1,3 +1,5 @@ +//go:build windows + package windowsipam import ( diff --git a/libnetwork/ipams/windowsipam/windowsipam_other.go b/libnetwork/ipams/windowsipam/windowsipam_other.go new file mode 100644 index 0000000000..777cf1d0fd --- /dev/null +++ b/libnetwork/ipams/windowsipam/windowsipam_other.go @@ -0,0 +1,10 @@ +//go:build !windows + +package windowsipam + +import "github.com/docker/docker/libnetwork/ipamapi" + +// Register is a no-op -- windowsipam is only supported on Windows. +func Register(_ ipamapi.Registerer) error { + return nil +} diff --git a/libnetwork/ipams/windowsipam/windowsipam_test.go b/libnetwork/ipams/windowsipam/windowsipam_test.go index 3b57a657bf..f9abb7fe9f 100644 --- a/libnetwork/ipams/windowsipam/windowsipam_test.go +++ b/libnetwork/ipams/windowsipam/windowsipam_test.go @@ -1,3 +1,5 @@ +//go:build windows + package windowsipam import (