From de053c9b7d5fd38ff50ab67c17ee1abdef47df84 Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Fri, 28 Feb 2025 15:14:22 +0100 Subject: [PATCH] DockerActionManager: fix setting CMD options for collabora Signed-off-by: Simon L. --- php/src/Data/ConfigurationManager.php | 4 ---- php/src/Docker/DockerActionManager.php | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/php/src/Data/ConfigurationManager.php b/php/src/Data/ConfigurationManager.php index 038e9e10..60a95761 100644 --- a/php/src/Data/ConfigurationManager.php +++ b/php/src/Data/ConfigurationManager.php @@ -976,10 +976,6 @@ class ConfigurationManager return $config['collabora_additional_options']; } - public function GetAdditionalCollaboraOptionsArray() : array { - return explode(' ', $this->GetAdditionalCollaboraOptions()); - } - public function DeleteAdditionalCollaboraOptions() : void { $config = $this->GetConfig(); $config['collabora_additional_options'] = ''; diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php index d3eace3d..48903d54 100644 --- a/php/src/Docker/DockerActionManager.php +++ b/php/src/Docker/DockerActionManager.php @@ -581,7 +581,7 @@ readonly class DockerActionManager { // Special things for the collabora container which should not be exposed in the containers.json } elseif ($container->GetIdentifier() === 'nextcloud-aio-collabora') { if ($this->configurationManager->GetAdditionalCollaboraOptions() !== '') { - $requestBody['HostConfig']['Config']['Cmd'] = $this->configurationManager->GetAdditionalCollaboraOptionsArray(); + $requestBody['Cmd'] = [$this->configurationManager->GetAdditionalCollaboraOptions()]; } }