From 0caa8cbd6071afeb4af7cb6f26a896c2bb14237a Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 9 Sep 2021 09:54:11 +0200 Subject: [PATCH] Docker: reset process working directory if it needs a device Change-Id: Ided00a328279b7b82814dcbb79434063ed7ec5f6 Reviewed-by: hjk --- src/plugins/docker/dockerdevice.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 2446dfc68b5..d1f22f3a9b7 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -1436,8 +1436,11 @@ void DockerDevice::runProcess(QtcProcess &process) const const Environment env = process.environment(); CommandLine cmd{"docker", {"exec"}}; - if (!workingDir.isEmpty()) + if (!workingDir.isEmpty()) { cmd.addArgs({"-w", workingDir.path()}); + if (QTC_GUARD(workingDir.needsDevice())) // warn on local working directory for docker cmd + process.setWorkingDirectory(FileUtils::homePath()); // reset working dir for docker exec + } if (process.processMode() == ProcessMode::Writer) cmd.addArg("-i"); if (env.size() != 0 && hasLocalFileAccess()) {