Docker: Force a container restart when mounts have changed

Change-Id: Iaddb52b6c4fb27ff9ccc098d76cc6e333e02c7e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/docker/dockerdevice.cpp

@@ -299,6 +299,7 @@ public:
 
     void tryCreateLocalFileAccess();
 
+    void stopCurrentContainer();
     void fetchSystemEnviroment();
 
     DockerDevice *q;
@@ -352,8 +353,8 @@ public:
             "mapped one-to-one into the Docker container."));
         m_pathsLineEdit->setText(data.mounts.join(';'));
 
-        connect(m_pathsLineEdit, &QLineEdit::textChanged, this, [&data](const QString &text) {
-            data.mounts = text.split(';');
+        connect(m_pathsLineEdit, &QLineEdit::textChanged, this, [dockerDevice](const QString &text) {
+            dockerDevice->setMounts(text.split(';'));
         });
 
         auto logView = new QTextBrowser;
@@ -615,6 +616,20 @@ void DockerDevice::tryCreateLocalFileAccess() const
     d->tryCreateLocalFileAccess();
 }
 
+void DockerDevicePrivate::stopCurrentContainer()
+{
+    if (m_container.isEmpty())
+        return;
+
+    QtcProcess proc;
+    proc.setCommand({"docker", {"container", "stop", m_container}});
+
+    m_container.clear();
+    m_mergedDir.clear();
+
+    proc.runBlocking();
+}
+
 void DockerDevicePrivate::tryCreateLocalFileAccess()
 {
     if (!m_container.isEmpty())
@@ -710,6 +725,12 @@ bool DockerDevice::hasLocalFileAccess() const
     return !d->m_mergedDir.isEmpty();
 }
 
+void DockerDevice::setMounts(const QStringList &mounts) const
+{
+    d->m_data.mounts = mounts;
+    d->stopCurrentContainer(); // Force re-start with new mounts.
+}
+
 FilePath DockerDevice::mapToLocalAccess(const FilePath &filePath) const
 {
     QTC_ASSERT(!d->m_mergedDir.isEmpty(), return {});

src/plugins/docker/dockerdevice.h

@@ -105,6 +105,7 @@ public:
 
     void tryCreateLocalFileAccess() const;
     bool hasLocalFileAccess() const;
+    void setMounts(const QStringList &mounts) const;
 
     Utils::FilePath mapToLocalAccess(const Utils::FilePath &filePath) const;
     Utils::FilePath mapFromLocalAccess(const Utils::FilePath &filePath) const;