MobyClient: Resolve docker CLI plugins

The plugins have been moved, so we need to provide a different directory if they are called for. This is used to locate `docker-compose` during extension installation. Signed-off-by: Mark Yen <[email protected]>
rancher-sandbox · Sep 9, 2024 · 6b38b5a · 6b38b5a
1 parent 3900234
commit 6b38b5a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/rancher-desktop/backend/containerClient/mobyClient.ts b/pkg/rancher-desktop/backend/containerClient/mobyClient.ts
@@ -470,8 +470,10 @@ export class MobyClient implements ContainerEngineClient {
   runClient(args: string[], stdio: 'pipe', options?: runClientOptions): Promise<{ stdout: string; stderr: string; }>;
   runClient(args: string[], stdio: 'stream', options?: runClientOptions): ReadableProcess;
   runClient(args: string[], stdio?: 'ignore' | 'pipe' | 'stream' | Log, options?: runClientOptions) {
-    const binDir = path.join(paths.resources, process.platform, 'bin');
-    const executable = path.resolve(binDir, options?.executable ?? this.executable);
+    const executableName = options?.executable ?? this.executable;
+    const binType = executableName.startsWith('docker-') ? 'docker-cli-plugins' : 'bin';
+    const binDir = path.join(paths.resources, process.platform, binType);
+    const executable = path.resolve(binDir, executableName);
     const opts = _.merge({}, options ?? {}, {
       env: {
         DOCKER_HOST: this.endpoint,