From d0172f80b4d5832b41abe2fbc1c46cbf73600fc8 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 12 Jul 2021 15:27:19 +0200 Subject: [PATCH] Docker: Guard against empty mounts Using empty mounts makes using the container fail. Change-Id: I65041eae3a1ebeec936861b4f85977981bbd84d3 Reviewed-by: hjk --- src/plugins/docker/dockerdevice.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index cffabe40ad4..d048f6e5167 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -354,7 +354,7 @@ public: m_pathsLineEdit->setText(data.mounts.join(';')); connect(m_pathsLineEdit, &QLineEdit::textChanged, this, [dockerDevice](const QString &text) { - dockerDevice->setMounts(text.split(';')); + dockerDevice->setMounts(text.split(';', Qt::SkipEmptyParts)); }); auto logView = new QTextBrowser; @@ -654,8 +654,10 @@ void DockerDevicePrivate::tryCreateLocalFileAccess() dockerRun.addArgs({"-u", QString("%1:%2").arg(getuid()).arg(getgid())}); #endif - for (const QString &mount : qAsConst(m_data.mounts)) - dockerRun.addArgs({"-v", mount + ':' + mount}); + for (const QString &mount : qAsConst(m_data.mounts)) { + if (!mount.isEmpty()) + dockerRun.addArgs({"-v", mount + ':' + mount}); + } dockerRun.addArg(m_data.imageId); dockerRun.addArg("/bin/sh");