Merge pull request #6102 from nextcloud/enh/noid/fix-cmd-options

DockerActionManager: fix setting CMD options for collabora
nextcloud · Feb 28, 2025 · 2ca49f8 · 2ca49f8
2 parents 2942af2 + de053c9
commit 2ca49f8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/php/src/Data/ConfigurationManager.php b/php/src/Data/ConfigurationManager.php
@@ -976,10 +976,6 @@ public function GetAdditionalCollaboraOptions() : string {
         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
@@ -581,7 +581,7 @@ public function CreateContainer(Container $container) : void {
         // 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()];
             }
         }