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

Docker: Force a container restart when mounts have changed

Browse Source 
Change-Id: Iaddb52b6c4fb27ff9ccc098d76cc6e333e02c7e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-07-09 13:18:22 +02:00
parent d603654aca
commit 1936006a91
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
src/plugins/docker/dockerdevice.h
View File

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