moby: Don't set DOCKER_HOST in current process

mook-as · jandubois · commit 8b2507ec42fd · 2025-08-20T11:26:47.000-07:00
We were accidentally setting DOCKER_HOST in the current process when spawning the docker CLI; fix things so that no longer happens. This fixes an issue where we'd report an diagnostics issue because that is set. Signed-off-by: Mark Yen <mark.yen@suse.com> (cherry picked from commit 105025f)
diff --git a/pkg/rancher-desktop/backend/containerClient/mobyClient.ts b/pkg/rancher-desktop/backend/containerClient/mobyClient.ts
@@ -502,7 +502,7 @@ export class MobyClient implements ContainerEngineClient {
       dirsToAdd.push(executableDir);
     }
 
-    const opts = _.merge({ env: process.env }, options ?? {}, {
+    const opts = _.merge({ env: _.merge({}, process.env) }, options ?? {}, {
       env: {
         DOCKER_HOST: this.endpoint,
         PATH:        `${ process.env.PATH }${ path.delimiter }${ dirsToAdd.join(path.delimiter) }`,

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ export class MobyClient implements ContainerEngineClient {`
`502`	`502`	`dirsToAdd.push(executableDir);`
`503`	`503`	`}`
`504`	`504`
`505`		`- const opts = _.merge({ env: process.env }, options ?? {}, {`
	`505`	`+ const opts = _.merge({ env: _.merge({}, process.env) }, options ?? {}, {`
`506`	`506`	`env: {`
`507`	`507`	`DOCKER_HOST: this.endpoint,`
`508`	`508`	PATH: `${ process.env.PATH }${ path.delimiter }${ dirsToAdd.join(path.delimiter) }`,