Merge pull request #3047 from nextcloud/enh/noid/add-executable-bit

add executable bit on tmpfs for nextcloud container
nextcloud · Aug 9, 2023 · afcd9cd · afcd9cd
2 parents dbb395f + 3d868d4
commit afcd9cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/php/containers-schema.json b/php/containers-schema.json
@@ -141,7 +141,7 @@
 						"type": "array",
 						"items": {
 							"type": "string",
-							"pattern": "^/[a-z/_0-9-]+$"
+							"pattern": "^/[a-z/_0-9-:]+$"
 						}
 					},
 					"volumes": {

diff --git a/php/containers.json b/php/containers.json
@@ -211,7 +211,7 @@
         "nextcloud-aio"
       ],
       "tmpfs": [
-        "/tmp"
+        "/tmp:exec"
       ]
     },
     {

diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php
@@ -439,7 +439,11 @@ public function CreateContainer(Container $container) : void {
 
         $tmpfs = [];
         foreach($container->GetTmpfs() as $tmp) {
-            $tmpfs[$tmp] = "";
+            $mode = "";
+            if (str_contains($tmp, ':')) {
+                $mode = explode(':', $tmp)[1];
+            }
+            $tmpfs[$tmp] = $mode;
         }
         if (count($tmpfs) > 0) {
             $requestBody['HostConfig']['Tmpfs'] =  $tmpfs;