docker_25: add version-specific system plugin dir patch for CLI v25 (#472607)

2025-12-24 12:39:01 +00:00
parent 49c4d9cd18 1678a7cb21
commit 8b53679fd2
2 changed files with 28 additions and 1 deletions
@@ -0,0 +1,22 @@
+diff --git a/cli-plugins/manager/manager_unix.go b/cli-plugins/manager/manager_unix.go
+index 000c058df0..246c427cba 100644
+--- a/cli-plugins/manager/manager_unix.go
+++ b/cli-plugins/manager/manager_unix.go
+@@ -2,7 +2,13 @@
+ 
+ package manager
+ 
+-var defaultSystemPluginDirs = []string{
+-	"/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins",
+-	"/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins",
+import (
+    "os"
+    "path/filepath"
+)
+
+var defaultSystemPluginDirs []string
+
+func init() {
+    defaultSystemPluginDirs = filepath.SplitList(os.Getenv("DOCKER_CLI_PLUGIN_DIRS"))
+ }
+ 
@@ -277,7 +277,12 @@ let
        };

        patches = [
-          ./cli-system-plugin-dir-from-env.patch
+          (
+            if lib.versionOlder version "26.0.0" then
+              ./cli-system-plugin-dir-from-env-25.patch
+            else
+              ./cli-system-plugin-dir-from-env.patch
+          )
        ];

        vendorHash = null;