From d84de31384c6c4abac0f402f58b7e4fbb56eaa02 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Mon, 18 Oct 2021 12:09:55 +0200 Subject: [PATCH] Docker: Map command executables to device path Change-Id: Ia8edf686a546f57b42ed0141e2986eded6f96ec1 Reviewed-by: hjk --- src/plugins/docker/dockerdevice.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 4461c7a1e86..6efa7fac557 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -147,7 +147,10 @@ void DockerDeviceProcess::start(const Runnable &runnable) disconnect(&m_process); - m_process.setCommand(runnable.command); + CommandLine command = runnable.command; + command.setExecutable( + command.executable().withNewPath(dockerDevice->mapToDevicePath(command.executable()))); + m_process.setCommand(command); m_process.setEnvironment(runnable.environment); m_process.setWorkingDirectory(runnable.workingDirectory); connect(&m_process, &QtcProcess::errorOccurred, this, &DeviceProcess::error); @@ -158,7 +161,7 @@ void DockerDeviceProcess::start(const Runnable &runnable) this, &DeviceProcess::readyReadStandardError); connect(&m_process, &QtcProcess::started, this, &DeviceProcess::started); - LOG("Running process:" << runnable.command.toUserOutput() + LOG("Running process:" << command.toUserOutput() << "in" << runnable.workingDirectory.toUserOutput()); dockerDevice->runProcess(m_process); }