fixed conflicts

Author: dnsi0

docs/env.md

@@ -136,6 +136,7 @@ The `DOCKER_COMPUTE_ENVIRONMENTS` environment variable should be a JSON array of
 [
   {
     "socketPath": "/var/run/docker.sock",
+    "scanImages": true,
     "imageRetentionDays": 7,
     "imageCleanupInterval": 86400,
     "resources": [
@@ -194,6 +195,7 @@ The `DOCKER_COMPUTE_ENVIRONMENTS` environment variable should be a JSON array of
 #### Configuration Options
 
 - **socketPath**: Path to the Docker socket (e.g., docker.sock).
+- **scanImages**: If the docker images should be scan for vulnerabilities using trivy. If yes and critical vulnerabilities are found, then C2D job is refused
 - **imageRetentionDays** - how long docker images are kept, in days. Default: 7
 - **imageCleanupInterval** - how often to run cleanup for docker images, in seconds. Min: 3600 (1hour), Default: 86400 (24 hours)
 - **paymentClaimInterval** - how often to run payment claiming, in seconds. Default: 3600 (1 hour)

package-lock.json

@@ -163,7 +163,9 @@ export interface C2DDockerConfig {
   keyPath: string
   imageRetentionDays?: number // Default: 7 days
   imageCleanupInterval?: number // Default: 86400 seconds (24 hours)
-  paymentClaimInterval?: number // Default: 3600 seconds (1 hour)
+  paymentClaimInterval?: number // Default: 3600 seconds (1 hours)
+  scanImages?: boolean
+  scanImageDBUpdateInterval?: number // Default: 12 hours
   environments: C2DEnvironmentConfig[]
 }
 
@@ -308,6 +310,8 @@ export enum C2DStatusNumber {
   // eslint-disable-next-line no-unused-vars
   BuildImageFailed = 13,
   // eslint-disable-next-line no-unused-vars
+  VulnerableImage = 14,
+  // eslint-disable-next-line no-unused-vars
   ConfiguringVolumes = 20,
   // eslint-disable-next-line no-unused-vars
   VolumeCreationFailed = 21,
@@ -356,6 +360,8 @@ export enum C2DStatusText {
   // eslint-disable-next-line no-unused-vars
   BuildImageFailed = 'Building algorithm image failed',
   // eslint-disable-next-line no-unused-vars
+  VulnerableImage = 'Image has vulnerabilities',
+  // eslint-disable-next-line no-unused-vars
   ConfiguringVolumes = 'Configuring volumes',
   // eslint-disable-next-line no-unused-vars
   VolumeCreationFailed = 'Volume creation failed',