eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-16 10:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make 'enableNvidiaGpu' an attribute

Browse source 
Signed-off-by: Pablo Zmdl <pablo@nextcloud.com>
This commit is contained in:
Pablo Zmdl 2026-01-26 10:27:31 +01:00
parent 5fc4951ba0
commit 5bdcfd67eb
3 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
php/public/index.php
View file

@ -133,7 +133,7 @@ $app->get('/containers', function (Request $request, Response $response, array $
'nextcloud_max_time' => $configurationManager->nextcloudMaxTime, 'nextcloud_max_time' => $configurationManager->nextcloudMaxTime,
'nextcloud_memory_limit' => $configurationManager->nextcloudMemoryLimit, 'nextcloud_memory_limit' => $configurationManager->nextcloudMemoryLimit,
'is_dri_device_enabled' => $configurationManager->nextcloudEnableDriDevice, 'is_dri_device_enabled' => $configurationManager->nextcloudEnableDriDevice,
'is_nvidia_gpu_enabled' => $configurationManager->isNvidiaGpuEnabled(), 'is_nvidia_gpu_enabled' => $configurationManager->enableNvidiaGpu,
'is_talk_recording_enabled' => $configurationManager->isTalkRecordingEnabled, 'is_talk_recording_enabled' => $configurationManager->isTalkRecordingEnabled,
'is_docker_socket_proxy_enabled' => $configurationManager->isDockerSocketProxyEnabled, 'is_docker_socket_proxy_enabled' => $configurationManager->isDockerSocketProxyEnabled,
'is_whiteboard_enabled' => $configurationManager->isWhiteboardEnabled, 'is_whiteboard_enabled' => $configurationManager->isWhiteboardEnabled,

12
php/src/Data/ConfigurationManager.php
View file

@ -924,15 +924,9 @@ class ConfigurationManager
set { $this->set('nextcloud_enable_dri_device', $value); } set { $this->set('nextcloud_enable_dri_device', $value); }
} }
private function GetEnabledNvidiaGpu() : string { public bool $enableNvidiaGpu {
$envVariableName = 'NEXTCLOUD_ENABLE_NVIDIA_GPU'; get => booleanize($this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_ENABLE_NVIDIA_GPU', 'enable_nvidia_gpu', ''));
$configName = 'enable_nvidia_gpu'; set { $this->set('enable_nvidia_gpu', $value); }
$defaultValue = '';
return $this->GetEnvironmentalVariableOrConfig($envVariableName, $configName, $defaultValue);
}
public function isNvidiaGpuEnabled() : bool {
return $this->GetEnabledNvidiaGpu() === 'true';
} }
private function GetKeepDisabledApps() : string { private function GetKeepDisabledApps() : string {

2
php/src/Docker/DockerActionManager.php
View file

@ -317,7 +317,7 @@ readonly class DockerActionManager {
$requestBody['HostConfig']['Devices'] = $devices; $requestBody['HostConfig']['Devices'] = $devices;
} }
if ($container->enableNvidiaGpu && $this->configurationManager->isNvidiaGpuEnabled()) { if ($container->enableNvidiaGpu && $this->configurationManager->enableNvidiaGpu) {
$requestBody['HostConfig']['Runtime'] = 'nvidia'; $requestBody['HostConfig']['Runtime'] = 'nvidia';
$requestBody['HostConfig']['DeviceRequests'] = [ $requestBody['HostConfig']['DeviceRequests'] = [
[ [