Add containers schema

Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
nextcloud · Dec 17, 2024 · 66f9cf2 · 66f9cf2
1 parent e2bce7e
commit 66f9cf2
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 10 deletions.
diff --git a/community-containers/jellyfin/jellyfin.json b/community-containers/jellyfin/jellyfin.json
@@ -31,6 +31,7 @@
             "devices": [
                 "/dev/dri"
             ],
+            "nvidia": true,
             "backup_volumes": [
                 "nextcloud_aio_jellyfin"
             ]

diff --git a/community-containers/memories/memories.json b/community-containers/memories/memories.json
@@ -27,6 +27,7 @@
             "devices": [
                 "/dev/dri"
             ],
+            "nvidia": true,
             "nextcloud_exec_commands": [
                 "php /var/www/html/occ app:install memories",
                 "php /var/www/html/occ app:enable memories",

diff --git a/community-containers/plex/plex.json b/community-containers/plex/plex.json
@@ -33,6 +33,7 @@
             "devices": [
                 "/dev/dri"
             ],
+            "nvidia": true,
             "backup_volumes": [
                 "nextcloud_aio_plex"
             ]

diff --git a/php/containers-schema.json b/php/containers-schema.json
@@ -160,6 +160,9 @@
 							"pattern": "^/dev/[a-z]+$"
 						}
 					},
+					"nvidia": {
+						"type": "boolean"
+					},
 					"apparmor_unconfined": {
 						"type": "boolean"
 					},

diff --git a/php/containers.json b/php/containers.json
@@ -263,6 +263,7 @@
       "devices": [
         "/dev/dri"
       ],
+      "nvidia": true,
       "backup_volumes": [
         "nextcloud_aio_nextcloud"
       ],

diff --git a/php/src/Container/Container.php b/php/src/Container/Container.php
@@ -23,6 +23,7 @@ public function __construct(
         private array                         $secrets,
         /** @var string[] */
         private array                         $devices,
+        private bool                          $nvidia,
         /** @var string[] */
         private array                         $capAdd,
         private int                           $shmSize,
@@ -92,6 +93,10 @@ public function GetDevices() : array {
         return $this->devices;
     }
 
+    public function CanUseNvidia() : bool {
+        return $this->nvidia;
+    }
+
     public function GetCapAdds() : array {
         return $this->capAdd;
     }

diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php
@@ -249,6 +249,8 @@ private function GetDefinition(): array
                 $devices = $entry['devices'];
             }
 
+            $nvidia = $entry['nvidia'] === true;
+
             $capAdd = [];
             if (isset($entry['cap_add'])) {
                 $capAdd = $entry['cap_add'];
@@ -312,6 +314,7 @@ private function GetDefinition(): array
                 $dependsOn,
                 $secrets,
                 $devices,
+                $nvidia,
                 $capAdd,
                 $shmSize,
                 $apparmorUnconfined,

diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php
@@ -491,16 +491,18 @@ public function CreateContainer(Container $container) : void {
             $requestBody['HostConfig']['Devices'] = $devices;
         }
 
-        if ($this->configurationManager->isNvidiaRuntimeEnabled()) {
-            $requestBody['HostConfig']['Runtime'] = 'nvidia';
-        } elseif ($this->configurationManager->isNvidiaDeployEnabled()) {
-            $requestBody['HostConfig']['DeviceRequests'] = [
-                [
-                    "Driver" => "nvidia",
-                    "Count" => 1,
-                    "Capabilities" => [["gpu"]],
-                ]
-            ];
+        if ($container->canUseNvidia()) {
+            if ($this->configurationManager->isNvidiaRuntimeEnabled()) {
+                $requestBody['HostConfig']['Runtime'] = 'nvidia';
+            } elseif ($this->configurationManager->isNvidiaDeployEnabled()) {
+                $requestBody['HostConfig']['DeviceRequests'] = [
+                    [
+                        "Driver" => "nvidia",
+                        "Count" => 1,
+                        "Capabilities" => [["gpu"]],
+                    ]
+                ];
+            }
         }
 
         $shmSize = $container->GetShmSize();