eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

DockerActionManager: fix setting CMD options for collabora

Browse source 
Signed-off-by: Simon L. <szaimen@e.mail.de>
This commit is contained in:
Simon L. 2025-02-28 15:14:22 +01:00
parent 2942af2a22
commit de053c9b7d
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -976,10 +976,6 @@ class ConfigurationManager
return $config['collabora_additional_options']; return $config['collabora_additional_options'];
} }
public function GetAdditionalCollaboraOptionsArray() : array {
return explode(' ', $this->GetAdditionalCollaboraOptions());
}
public function DeleteAdditionalCollaboraOptions() : void { public function DeleteAdditionalCollaboraOptions() : void {
$config = $this->GetConfig(); $config = $this->GetConfig();
$config['collabora_additional_options'] = ''; $config['collabora_additional_options'] = '';

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

@ -581,7 +581,7 @@ readonly class DockerActionManager {
// Special things for the collabora container which should not be exposed in the containers.json // Special things for the collabora container which should not be exposed in the containers.json
} elseif ($container->GetIdentifier() === 'nextcloud-aio-collabora') { } elseif ($container->GetIdentifier() === 'nextcloud-aio-collabora') {
if ($this->configurationManager->GetAdditionalCollaboraOptions() !== '') { if ($this->configurationManager->GetAdditionalCollaboraOptions() !== '') {
$requestBody['HostConfig']['Config']['Cmd'] = $this->configurationManager->GetAdditionalCollaboraOptionsArray(); $requestBody['Cmd'] = [$this->configurationManager->GetAdditionalCollaboraOptions()];
} }
} }