Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / src / models / container.ts

diff --git a/src/models/container.ts b/src/models/container.ts
index 6f847b19b8626c92265718fd00ece51dd7953de7..c86f11cee1b4ebeadd33f2dbd01ee042ff2bb693 100644 (file)
--- a/src/models/container.ts
+++ b/src/models/container.ts
@@ -3,6 +3,10 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Resource, ResourceKind } from "./resource";
+import { MountType } from 'models/mount-types';
+import { RuntimeConstraints } from "models/runtime-constraints";
+import { SchedulingParameters } from './scheduling-parameters';
+import { RuntimeStatus } from "./runtime-status";
 
 export enum ContainerState {
     QUEUED = 'Queued',
@@ -15,21 +19,24 @@ export enum ContainerState {
 export interface ContainerResource extends Resource {
     kind: ResourceKind.CONTAINER;
     state: string;
-    startedAt: string;
-    finishedAt: string;
-    log: string;
+    startedAt: string | null;
+    finishedAt: string | null;
+    log: string | null;
     environment: {};
     cwd: string;
     command: string[];
+    cost: number;
     outputPath: string;
-    mounts: {};
-    runtimeConstraints: {};
-    schedulingParameters: {};
-    output: string;
+    mounts: MountType[];
+    runtimeConstraints: RuntimeConstraints;
+    runtimeStatus: RuntimeStatus;
+    runtimeUserUuid: string;
+    schedulingParameters: SchedulingParameters;
+    output: string | null;
     containerImage: string;
     progress: number;
     priority: number;
-    exitCode: number;
-    authUuid: string;
-    lockedByUuid: string;
+    exitCode: number | null;
+    authUuid: string | null;
+    lockedByUuid: string | null;
 }