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

Docker: Use a variable to list directories to mount

Browse Source 
Baby step on the path from hard coded to user defined.

Change-Id: I2536924c5ba07dadcbe3c94304d55db25f876987
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-06-17 10:34:46 +02:00
parent 93d7821eae
commit c533e5c43c
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,6 +234,10 @@ class DockerDevicePrivate : public QObject
public: public:
DockerDevicePrivate(DockerDevice *parent) : q(parent) DockerDevicePrivate(DockerDevice *parent) : q(parent)
{ {
// FIXME: Make mounts flexible
m_mounts.append("/opt");
m_mounts.append("/data");
connect(&m_mergedDirWatcher, &QFileSystemWatcher::fileChanged, this, [](const QString &path) { connect(&m_mergedDirWatcher, &QFileSystemWatcher::fileChanged, this, [](const QString &path) {
Q_UNUSED(path) Q_UNUSED(path)
LOG("Container watcher change, file: " << path); LOG("Container watcher change, file: " << path);
@@ -266,6 +270,7 @@ public:
QPointer<QtcProcess> m_shell; QPointer<QtcProcess> m_shell;
QString m_container; QString m_container;
QString m_mergedDir; QString m_mergedDir;
QStringList m_mounts;
QFileSystemWatcher m_mergedDirWatcher; QFileSystemWatcher m_mergedDirWatcher;
Environment m_cachedEnviroment; Environment m_cachedEnviroment;
@@ -538,26 +543,35 @@ void DockerDevicePrivate::tryCreateLocalFileAccess()
tempFileName = temp.fileName(); tempFileName = temp.fileName();
} }
m_shell = new QtcProcess; CommandLine dockerRun{"docker", {"run", "-i", "--cidfile=" + tempFileName,
// FIXME: Make mounts flexible
m_shell->setCommand({"docker", {"run", "-i", "--cidfile=" + tempFileName,
"-v", "/opt:/opt",
"-v", "/data:/data",
"-e", "DISPLAY=:0", "-e", "DISPLAY=:0",
"-e", "XAUTHORITY=/.Xauthority", "-e", "XAUTHORITY=/.Xauthority",
"--net", "host", "--net", "host"}};
m_data.imageId, "/bin/sh"}});
LOG("RUNNING: " << m_shell->commandLine().toUserOutput()); for (const QString &mount : qAsConst(m_mounts))
dockerRun.addArgs({"-v", mount + ':' + mount});
dockerRun.addArg(m_data.imageId);
dockerRun.addArg("/bin/sh");
LOG("RUNNING: " << dockerRun.toUserOutput());
m_shell = new QtcProcess;
m_shell->setCommand(dockerRun);
m_shell->start(); m_shell->start();
m_shell->waitForStarted(); m_shell->waitForStarted();
if (m_shell->state() != QProcess::Running) {
LOG("DOCKER SHELL FAILED");
return;
}
LOG("CHECKING: " << tempFileName); LOG("CHECKING: " << tempFileName);
for (int i = 0; i <= 10; ++i) { for (int i = 0; i <= 10; ++i) {
QFile file(tempFileName); QFile file(tempFileName);
file.open(QIODevice::ReadOnly); file.open(QIODevice::ReadOnly);
m_container = QString::fromUtf8(file.readAll()).trimmed(); m_container = QString::fromUtf8(file.readAll()).trimmed();
if (!m_container.isEmpty()) { if (!m_container.isEmpty()) {
LOG("Container: " << d->m_container); LOG("Container: " << m_container);
break; break;
} }
if (i == 10) { if (i == 10) {
@@ -597,6 +611,10 @@ FilePath DockerDevice::mapToLocalAccess(const FilePath &filePath) const
{ {
QTC_ASSERT(!d->m_mergedDir.isEmpty(), return {}); QTC_ASSERT(!d->m_mergedDir.isEmpty(), return {});
QString path = filePath.path(); QString path = filePath.path();
for (const QString &mount : qAsConst(d->m_mounts)) {
if (path.startsWith(mount + '/'))
return FilePath::fromString(path);
}
if (path.startsWith('/')) if (path.startsWith('/'))
return FilePath::fromString(d->m_mergedDir + path); return FilePath::fromString(d->m_mergedDir + path);
return FilePath::fromString(d->m_mergedDir + '/' + path); return FilePath::fromString(d->m_mergedDir + '/' + path);