libnet/ipams: Unconditionally call windowsipam.Register

This function is made a no-op on non-windows platform. Signed-off-by: Albin Kerouanton <albinker@gmail.com>
dmcgowan · Apr 26, 2024 · eda4750 · eda4750
1 parent ae9e431
commit eda4750
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/libnetwork/ipams/drivers_windows.go → libnetwork/ipams/drivers.go b/libnetwork/ipams/drivers_windows.go → 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
diff --git 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
@@ -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
@@ -1,3 +1,5 @@
+//go:build windows
+
 package windowsipam
 
 import (