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

Docker: Use mapToDevicePath() in startContainer()

Browse Source 
Change-Id: Iad91144413a176bee036e03192713f5bf4695dcb
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-10-08 11:50:07 +02:00
parent 34b42a4772
commit d75005fbd2
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -833,14 +833,7 @@ void DockerDevicePrivate::startContainer()
for (QString mount : qAsConst(m_data.mounts)) { for (QString mount : qAsConst(m_data.mounts)) {
if (mount.isEmpty()) if (mount.isEmpty())
continue; continue;
// make sure to convert windows style paths to unix style paths with the file system case: mount = q->mapToDevicePath(FilePath::fromUserInput(mount));
// C:/dev/src -> /c/dev/src
if (const FilePath mountPath = FilePath::fromUserInput(mount).normalizedPathName();
mountPath.startsWithDriveLetter()) {
const QChar lowerDriveLetter = mountPath.path().at(0).toLower();
const FilePath path = FilePath::fromUserInput(mountPath.path().mid(2)); // strip C:
mount = '/' + lowerDriveLetter + path.path();
}
dockerCreate.addArgs({"-v", mount + ':' + mount}); dockerCreate.addArgs({"-v", mount + ':' + mount});
} }
@@ -1071,6 +1064,8 @@ FilePath DockerDevice::mapToGlobalPath(const FilePath &pathOnDevice) const
QString DockerDevice::mapToDevicePath(const Utils::FilePath &globalPath) const QString DockerDevice::mapToDevicePath(const Utils::FilePath &globalPath) const
{ {
// make sure to convert windows style paths to unix style paths with the file system case:
// C:/dev/src -> /c/dev/src
const FilePath normalized = globalPath.normalizedPathName(); const FilePath normalized = globalPath.normalizedPathName();
QString path = normalized.path(); QString path = normalized.path();
if (normalized.startsWithDriveLetter()) { if (normalized.startsWithDriveLetter()) {