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

Docker: Make usage of UID and GID configurable

Browse Source 
Make it optional to use UID and GID of the current user.

Change-Id: I1a7eeaba0cfae204b05f0ab4d409d965b8fc09ef
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2021-06-29 10:47:48 +02:00
committed by hjk
parent d5182a890a
commit 75ffccad0b
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,7 @@
#include <utils/treemodel.h> #include <utils/treemodel.h>
#include <QApplication> #include <QApplication>
#include <QCheckBox>
#include <QDateTime> #include <QDateTime>
#include <QDialog> #include <QDialog>
#include <QDialogButtonBox> #include <QDialogButtonBox>
@@ -302,6 +303,12 @@ public:
m_repoLineEdit->setText(dockerDevice->data().repo); m_repoLineEdit->setText(dockerDevice->data().repo);
m_repoLineEdit->setEnabled(false); m_repoLineEdit->setEnabled(false);
m_runAsOutsideUser = new QCheckBox(tr("Run as outside user"));
m_runAsOutsideUser->setToolTip(tr("Use user id and group id of the user running Qt Creator "
"in the docker container."));
m_runAsOutsideUser->setChecked(dockerDevice->data().useLocalUidGid);
m_runAsOutsideUser->setEnabled(HostOsInfo::isLinuxHost());
auto logView = new QTextBrowser; auto logView = new QTextBrowser;
auto autoDetectButton = new QPushButton(tr("Auto-detect Kit Items")); auto autoDetectButton = new QPushButton(tr("Auto-detect Kit Items"));
@@ -322,6 +329,7 @@ public:
Form { Form {
m_idLabel, m_idLineEdit, Break(), m_idLabel, m_idLineEdit, Break(),
m_repoLabel, m_repoLineEdit, Break(), m_repoLabel, m_repoLineEdit, Break(),
m_runAsOutsideUser, Break(),
Column { Column {
Space(20), Space(20),
Row { autoDetectButton, undoAutoDetectButton, Stretch() }, Row { autoDetectButton, undoAutoDetectButton, Stretch() },
@@ -338,6 +346,7 @@ private:
QLineEdit *m_idLineEdit; QLineEdit *m_idLineEdit;
QLabel *m_repoLabel; QLabel *m_repoLabel;
QLineEdit *m_repoLineEdit; QLineEdit *m_repoLineEdit;
QCheckBox *m_runAsOutsideUser;
}; };
IDeviceWidget *DockerDevice::createWidget() IDeviceWidget *DockerDevice::createWidget()
@@ -584,7 +593,8 @@ void DockerDevicePrivate::tryCreateLocalFileAccess()
"--net", "host"}}; "--net", "host"}};
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
dockerRun.addArgs({"-u", QString("%1:%2").arg(getuid()).arg(getgid())}); if (m_data.useLocalUidGid)
dockerRun.addArgs({"-u", QString("%1:%2").arg(getuid()).arg(getgid())});
#endif #endif
for (const QString &mount : qAsConst(m_mounts)) for (const QString &mount : qAsConst(m_mounts))
@@ -677,6 +687,7 @@ const char DockerDeviceDataImageIdKey[] = "DockerDeviceDataImageId";
const char DockerDeviceDataRepoKey[] = "DockerDeviceDataRepo"; const char DockerDeviceDataRepoKey[] = "DockerDeviceDataRepo";
const char DockerDeviceDataTagKey[] = "DockerDeviceDataTag"; const char DockerDeviceDataTagKey[] = "DockerDeviceDataTag";
const char DockerDeviceDataSizeKey[] = "DockerDeviceDataSize"; const char DockerDeviceDataSizeKey[] = "DockerDeviceDataSize";
const char DockerDeviceUseOutsideUser[] = "DockerDeviceUseUidGid";
void DockerDevice::fromMap(const QVariantMap &map) void DockerDevice::fromMap(const QVariantMap &map)
{ {
@@ -685,6 +696,8 @@ void DockerDevice::fromMap(const QVariantMap &map)
d->m_data.repo = map.value(DockerDeviceDataRepoKey).toString(); d->m_data.repo = map.value(DockerDeviceDataRepoKey).toString();
d->m_data.tag = map.value(DockerDeviceDataTagKey).toString(); d->m_data.tag = map.value(DockerDeviceDataTagKey).toString();
d->m_data.size = map.value(DockerDeviceDataSizeKey).toString(); d->m_data.size = map.value(DockerDeviceDataSizeKey).toString();
d->m_data.useLocalUidGid = map.value(DockerDeviceUseOutsideUser,
HostOsInfo::isLinuxHost()).toBool();
} }
QVariantMap DockerDevice::toMap() const QVariantMap DockerDevice::toMap() const
@@ -694,6 +707,7 @@ QVariantMap DockerDevice::toMap() const
map.insert(DockerDeviceDataRepoKey, d->m_data.repo); map.insert(DockerDeviceDataRepoKey, d->m_data.repo);
map.insert(DockerDeviceDataTagKey, d->m_data.tag); map.insert(DockerDeviceDataTagKey, d->m_data.tag);
map.insert(DockerDeviceDataSizeKey, d->m_data.size); map.insert(DockerDeviceDataSizeKey, d->m_data.size);
map.insert(DockerDeviceUseOutsideUser, d->m_data.useLocalUidGid);
return map; return map;
} }

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

@@ -43,6 +43,7 @@ public:
QString repo; QString repo;
QString tag; QString tag;
QString size; QString size;
bool useLocalUidGid = true;
}; };
class DockerDevice : public ProjectExplorer::IDevice class DockerDevice : public ProjectExplorer::IDevice