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

Docker: Guard against empty mounts

Browse Source 
Using empty mounts makes using the container fail.

Change-Id: I65041eae3a1ebeec936861b4f85977981bbd84d3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2021-07-12 15:27:19 +02:00
parent 5b21b3bca5
commit d0172f80b4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,7 +354,7 @@ public:
m_pathsLineEdit->setText(data.mounts.join(';')); m_pathsLineEdit->setText(data.mounts.join(';'));
connect(m_pathsLineEdit, &QLineEdit::textChanged, this, [dockerDevice](const QString &text) { connect(m_pathsLineEdit, &QLineEdit::textChanged, this, [dockerDevice](const QString &text) {
dockerDevice->setMounts(text.split(';')); dockerDevice->setMounts(text.split(';', Qt::SkipEmptyParts));
}); });
auto logView = new QTextBrowser; auto logView = new QTextBrowser;
@@ -654,8 +654,10 @@ void DockerDevicePrivate::tryCreateLocalFileAccess()
dockerRun.addArgs({"-u", QString("%1:%2").arg(getuid()).arg(getgid())}); dockerRun.addArgs({"-u", QString("%1:%2").arg(getuid()).arg(getgid())});
#endif #endif
for (const QString &mount : qAsConst(m_data.mounts)) for (const QString &mount : qAsConst(m_data.mounts)) {
if (!mount.isEmpty())
dockerRun.addArgs({"-v", mount + ':' + mount}); dockerRun.addArgs({"-v", mount + ':' + mount});
}
dockerRun.addArg(m_data.imageId); dockerRun.addArg(m_data.imageId);
dockerRun.addArg("/bin/sh"); dockerRun.addArg("/bin/sh");