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

Docker: Add network option to settings

Browse Source 
Change-Id: Idb18435aa668f9219ae0eb2db6bd55d040ba5243
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-09-15 14:17:11 +02:00
parent 881c48fbe7
commit 189cf8054f
5 changed files with 136 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,6 +69,7 @@
#include <QPushButton>
#include <QRandomGenerator>
#include <QRegularExpression>
#include <QStandardItem>
#include <QTextBrowser>
#include <QThread>
#include <QToolButton>
@@ -109,8 +110,8 @@ public:
private:
void setupShellProcess(Process *shellProcess) final
{
shellProcess->setCommand({settings().dockerBinaryPath(),
{"container", "start", "-i", "-a", m_containerId}});
shellProcess->setCommand(
{settings().dockerBinaryPath(), {"container", "start", "-i", "-a", m_containerId}});
}
CommandLine createFallbackCommand(const CommandLine &cmdLine)
@@ -132,8 +133,7 @@ public:
: m_dev(dev)
{}
RunResult runInShell(const CommandLine &cmdLine,
const QByteArray &stdInData) const override;
RunResult runInShell(const CommandLine &cmdLine, const QByteArray &stdInData) const override;
QString mapToDevicePath(const QString &hostPath) const override;
DockerDevicePrivate *m_dev = nullptr;
@@ -191,6 +191,40 @@ DockerDeviceSettings::DockerDeviceSettings()
clangdExecutable.setLabelText(Tr::tr("Clangd Executable:"));
clangdExecutable.setAllowPathFromDevice(true);
network.setSettingsKey("Network");
network.setLabelText(Tr::tr("Network:"));
network.setDefaultValue("bridge");
network.setFillCallback([this](const StringSelectionAspect::ResultCallback &cb) {
auto future = DockerApi::instance()->networks();
auto watcher = new QFutureWatcher<expected_str<QList<Network>>>(this);
watcher->setFuture(future);
QObject::connect(watcher,
&QFutureWatcher<expected_str<QList<Network>>>::finished,
this,
[watcher, cb]() {
expected_str<QList<Network>> result = watcher->result();
if (result) {
auto items = Utils::transform(*result, [](const Network &network) {
QStandardItem *item = new QStandardItem(network.name);
item->setData(network.name);
item->setToolTip(network.toString());
return item;
});
cb(items);
} else {
QStandardItem *errorItem = new QStandardItem(Tr::tr("Error!"));
errorItem->setToolTip(result.error());
cb({errorItem});
}
});
});
connect(DockerApi::instance(),
&DockerApi::dockerDaemonAvailableChanged,
&network,
&StringSelectionAspect::refill);
clangdExecutable.setValidationFunction(
[](const QString &newValue) -> FancyLineEdit::AsyncValidationFuture {
return Utils::asyncRun([newValue]() -> expected_str<QString> {
@@ -757,9 +791,7 @@ expected_str<QString> DockerDevicePrivate::createContainer()
"-e",
QString("DISPLAY=%1").arg(display),
"-e",
"XAUTHORITY=/.Xauthority",
"--net",
"host"}};
"XAUTHORITY=/.Xauthority"}};
#ifdef Q_OS_UNIX
// no getuid() and getgid() on Windows.
@@ -767,6 +799,11 @@ expected_str<QString> DockerDevicePrivate::createContainer()
dockerCreate.addArgs({"-u", QString("%1:%2").arg(getuid()).arg(getgid())});
#endif
if (!deviceSettings->network().isEmpty()) {
dockerCreate.addArg("--network");
dockerCreate.addArg(deviceSettings->network());
}
dockerCreate.addArgs(createMountArgs());
if (!deviceSettings->keepEntryPoint())
@@ -1206,9 +1243,8 @@ bool DockerDevicePrivate::addTemporaryMount(const FilePath &path, const FilePath
if (alreadyAdded)
return false;
const bool alreadyManuallyAdded = anyOf(deviceSettings->mounts(), [path](const FilePath &mount) {
return mount == path;
});
const bool alreadyManuallyAdded = anyOf(deviceSettings->mounts(),
[path](const FilePath &mount) { return mount == path; });
if (alreadyManuallyAdded)
return false;