feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Docker: Fix cmdbridge init when docker is remote

Browse Source 
If the user has specified a remote path for the "docker" executable
it is not possible to simply bind the cmdbridge as its on a different device.

We fall back to copying the cmdbridge in this case.

Task-number: QTCREATORBUG-31364
Change-Id: I03b5594c1c942fe6539a45a32d2a31e24f2a493b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-08-01 07:10:32 +02:00
parent 86b130f7c0
commit 3cb03be0fd
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/docker/dockerdevice.cpp
View File

@@ -604,8 +604,12 @@ DockerDevice::DockerDevice(std::unique_ptr<DockerDeviceSettings> deviceSettings)
return make_unexpected(cmdBridgePath.error()); return make_unexpected(cmdBridgePath.error());
auto fAccess = std::make_unique<DockerDeviceFileAccess>(d); auto fAccess = std::make_unique<DockerDeviceFileAccess>(d);
expected_str<void> initResult = fAccess->init( expected_str<void> initResult;
rootPath().withNewPath("/tmp/_qtc_cmdbridge")); if (!cmdBridgePath->isSameDevice(Docker::Internal::settings().dockerBinaryPath())) {
initResult = fAccess->deployAndInit(Core::ICore::libexecPath(), rootPath());
} else {
initResult = fAccess->init(rootPath().withNewPath("/tmp/_qtc_cmdbridge"));
}
if (!initResult) if (!initResult)
return make_unexpected(initResult.error()); return make_unexpected(initResult.error());
@@ -873,7 +877,7 @@ QStringList DockerDevicePrivate::createMountArgs() const
for (const FilePath &m : deviceSettings->mounts()) for (const FilePath &m : deviceSettings->mounts())
mounts.append({m, m}); mounts.append({m, m});
if (cmdBridgePath) if (cmdBridgePath && cmdBridgePath->isSameDevice(settings().dockerBinaryPath()))
mounts.append({cmdBridgePath.value(), FilePath("/tmp/_qtc_cmdbridge")}); mounts.append({cmdBridgePath.value(), FilePath("/tmp/_qtc_cmdbridge")});
for (const MountPair &mi : mounts) { for (const MountPair &mi : mounts) {