Merge pull request #60 from open-runtimes/fix-6362-fix-docker-conflict

Fix docker conflict error

Author: Meldiron

app/http.php

@@ -92,7 +92,6 @@
 $register->set('activeRuntimes', function () {
     $table = new Table(4096);
 
-    $table->column('id', Table::TYPE_STRING, 1024);
     $table->column('created', Table::TYPE_FLOAT);
     $table->column('updated', Table::TYPE_FLOAT);
     $table->column('name', Table::TYPE_STRING, 1024);
@@ -407,14 +406,12 @@ function removeAllRuntimes(Table $activeRuntimes, Orchestration $orchestration):
         }
 
         $container = [];
-        $containerId = '';
         $output = '';
         $startTime = \microtime(true);
 
         $secret = \bin2hex(\random_bytes(16));
 
         $activeRuntimes->set($activeRuntimeId, [
-            'id' => $containerId,
             'name' => $activeRuntimeId,
             'hostname' => $runtimeHostname,
             'created' => $startTime,
@@ -567,7 +564,6 @@ function removeAllRuntimes(Table $activeRuntimes, Orchestration $orchestration):
             ]);
 
             $activeRuntimes->set($activeRuntimeId, [
-                'id' => $containerId,
                 'name' => $activeRuntimeId,
                 'hostname' => $runtimeHostname,
                 'created' => $startTime,
@@ -603,7 +599,7 @@ function removeAllRuntimes(Table $activeRuntimes, Orchestration $orchestration):
 
             // Silently try to kill container
             try {
-                $orchestration->remove($containerId, true);
+                $orchestration->remove($activeRuntimeId, true);
             } catch (Throwable $th) {
             }
 
@@ -620,7 +616,7 @@ function removeAllRuntimes(Table $activeRuntimes, Orchestration $orchestration):
 
             // Silently try to kill container
             try {
-                $orchestration->remove($containerId, true);
+                $orchestration->remove($activeRuntimeId, true);
             } catch (Throwable $th) {
             }
 
@@ -1217,7 +1213,7 @@ function (string $runtimeId, ?string $payload, string $path, string $method, arr
             if ($runtime['updated'] < $inactiveThreshold) {
                 go(function () use ($activeRuntimeId, $runtime, $orchestration, $activeRuntimes) {
                     try {
-                        $orchestration->remove($runtime['id'], true);
+                        $orchestration->remove($runtime['name'], true);
                         Console::success("Successfully removed {$runtime['name']}");
                     } catch (\Throwable $th) {
                         Console::error('Inactive Runtime deletion failed: ' . $th->getMessage());