Skip to content

Modern Docker Management, Designed for Everyone

fix: allow trivy container limits to be configured (#1778)

Kyle Mendell087331cfd15f
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go
index 18f715de5..639292a2b 100644
--- a/backend/internal/models/settings.go
+++ b/backend/internal/models/settings.go
@@ -79,6 +79,9 @@ type Settings struct {
VulnerabilityScanEnabled SettingVariable `key:"vulnerabilityScanEnabled" meta:"label=Scheduled Vulnerability Scan;type=boolean;keywords=vulnerability,scan,security,trivy,schedule,automatic,cve;category=security;description=Enable scheduled vulnerability scanning of all Docker images"`
VulnerabilityScanInterval SettingVariable `key:"vulnerabilityScanInterval" meta:"label=Vulnerability Scan Interval;type=cron;keywords=vulnerability,scan,interval,schedule,frequency,trivy,cve;category=security;description=How often to run scheduled vulnerability scans (cron expression)"`
TrivyImage SettingVariable `key:"trivyImage,envOverride" meta:"label=Trivy Image;type=text;keywords=trivy,scanner,vulnerability,security,image;category=security;description=Override the Trivy image used for vulnerability scans"`
+ TrivyResourceLimitsEnabled SettingVariable `key:"trivyResourceLimitsEnabled,envOverride" meta:"label=Trivy Resource Limits;type=boolean;keywords=trivy,resources,limits,cpu,memory,ram,security,scan;category=security;description=Enable CPU and memory limits for Trivy scan containers"`
+ TrivyCpuLimit SettingVariable `key:"trivyCpuLimit,envOverride" meta:"label=Trivy CPU Limit (cores);type=number;keywords=trivy,cpu,cores,limit,scanner,resources;category=security;description=Maximum CPU cores for Trivy scan containers (supports decimals, e.g. 1.5). Set 0 to disable CPU limit"`
+ TrivyMemoryLimitMb SettingVariable `key:"trivyMemoryLimitMb,envOverride" meta:"label=Trivy Memory Limit (MB);type=number;keywords=trivy,memory,ram,mb,limit,scanner,resources;category=security;description=Maximum memory for Trivy scan containers in MB. Set 0 to disable memory limit"`
TrivyConfig SettingVariable `key:"trivyConfig" meta:"label=Trivy Config (YAML);type=textarea;keywords=trivy,config,yaml,configuration,scanner,settings;category=security;description=Trivy configuration file content in YAML format"`
TrivyIgnore SettingVariable `key:"trivyIgnore" meta:"label=.trivyignore;type=textarea;keywords=trivy,ignore,ignorefile,vulnerabilities,exceptions,exclusions;category=security;description=Trivy ignore file content - one vulnerability ID per line"`
AuthOidcConfig SettingVariable `key:"authOidcConfig,sensitive,deprecated" meta:"label=OIDC Config;type=text;keywords=oidc,config,client,id,issuer,secret,oauth;category=security;description=OIDC provider configuration (deprecated - use individual fields)"`
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index b7a71fa4d..d82c8f7a5 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -113,6 +113,9 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {
VulnerabilityScanEnabled: models.SettingVariable{Value: "false"},
VulnerabilityScanInterval: models.SettingVariable{Value: "0 0 0 * * *"},
TrivyImage: models.SettingVariable{Value: "ghcr.io/aquasecurity/trivy:latest"},
+ TrivyResourceLimitsEnabled: models.SettingVariable{Value: "true"},
+ TrivyCpuLimit: models.SettingVariable{Value: "1"},
+ TrivyMemoryLimitMb: models.SettingVariable{Value: "0"},
// AuthOidcConfig DEPRECATED will be removed in a future release
AuthOidcConfig: models.SettingVariable{Value: "{}"},
OidcEnabled: models.SettingVariable{Value: "false"},
@@ -509,7 +512,8 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates settings.U
return settings.ToSettingVariableSlice(false, false), nil
}
-// timeoutSettingKeys defines the keys for timeout settings that should be synced to agents
+// timeoutSettingKeys defines settings keys that should be synced to agents.
+// This currently includes timeout settings and Trivy runtime resource limits.
var timeoutSettingKeys = []string{
"dockerApiTimeout",
"dockerImagePullTimeout",
@@ -518,6 +522,9 @@ var timeoutSettingKeys = []string{
"httpClientTimeout",
"registryTimeout",
"proxyRequestTimeout",
+ "trivyResourceLimitsEnabled",
+ "trivyCpuLimit",
+ "trivyMemoryLimitMb",
}
func (s *SettingsService) prepareUpdateValues(updates settings.Update, cfg, defaultCfg *models.Settings) ([]models.SettingVariable, bool, bool, bool, bool, map[string]string, error) {
@@ -583,7 +590,7 @@ func (s *SettingsService) prepareUpdateValues(updates settings.Update, cfg, defa
changedAutoUpdate = true
case "scheduledPruneEnabled", "scheduledPruneInterval", "scheduledPruneContainers", "scheduledPruneImages", "scheduledPruneVolumes", "scheduledPruneNetworks", "scheduledPruneBuildCache":
changedScheduledPrune = true
- case "vulnerabilityScanEnabled", "vulnerabilityScanInterval":
+ case "vulnerabilityScanEnabled", "vulnerabilityScanInterval", "trivyResourceLimitsEnabled", "trivyCpuLimit", "trivyMemoryLimitMb":
changedVulnerabilityScan = true
}
diff --git a/backend/internal/services/settings_service_test.go b/backend/internal/services/settings_service_test.go
index 3f168f001..9abaf5786 100644
--- a/backend/internal/services/settings_service_test.go
+++ b/backend/internal/services/settings_service_test.go
@@ -43,7 +43,7 @@ func TestSettingsService_EnsureDefaultSettings_Idempotent(t *testing.T) {
require.Equal(t, count1, count2)
// Spot-check core and automation defaults exist with correct values
- for _, key := range []string{"authLocalEnabled", "projectsDirectory", "autoUpdateExcludedContainers", "vulnerabilityScanEnabled", "vulnerabilityScanInterval"} {
+ for _, key := range []string{"authLocalEnabled", "projectsDirectory", "autoUpdateExcludedContainers", "vulnerabilityScanEnabled", "vulnerabilityScanInterval", "trivyResourceLimitsEnabled", "trivyCpuLimit", "trivyMemoryLimitMb"} {
var sv models.SettingVariable
err := svc.db.WithContext(ctx).Where("key = ?", key).First(&sv).Error
require.NoErrorf(t, err, "missing default key %s", key)
@@ -55,6 +55,12 @@ func TestSettingsService_EnsureDefaultSettings_Idempotent(t *testing.T) {
require.Equal(t, "false", sv.Value)
case "vulnerabilityScanInterval":
require.Equal(t, "0 0 0 * * *", sv.Value)
+ case "trivyResourceLimitsEnabled":
+ require.Equal(t, "true", sv.Value)
+ case "trivyCpuLimit":
+ require.Equal(t, "1", sv.Value)
+ case "trivyMemoryLimitMb":
+ require.Equal(t, "0", sv.Value)
}
}
}
@@ -135,6 +141,31 @@ func TestSettingsService_GetSettings_EnvOverride_TrivyScanTimeout(t *testing.T)
require.Equal(t, 1800, settings2.TrivyScanTimeout.AsInt())
}
+func TestSettingsService_GetSettings_EnvOverride_TrivyResourceLimits(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ settings1, err := svc.GetSettings(ctx)
+ require.NoError(t, err)
+ require.True(t, settings1.TrivyResourceLimitsEnabled.IsTrue())
+ require.Equal(t, "1", settings1.TrivyCpuLimit.Value)
+ require.Equal(t, 0, settings1.TrivyMemoryLimitMb.AsInt())
+
+ t.Setenv("TRIVY_RESOURCE_LIMITS_ENABLED", "false")
+ t.Setenv("TRIVY_CPU_LIMIT", "2.5")
+ t.Setenv("TRIVY_MEMORY_LIMIT_MB", "2048")
+
+ settings2, err := svc.GetSettings(ctx)
+ require.NoError(t, err)
+ require.False(t, settings2.TrivyResourceLimitsEnabled.IsTrue())
+ require.Equal(t, "2.5", settings2.TrivyCpuLimit.Value)
+ require.Equal(t, 2048, settings2.TrivyMemoryLimitMb.AsInt())
+}
+
func TestSettingsService_isEnvOverrideActiveInternal(t *testing.T) {
ctx := context.Background()
db := setupSettingsTestDB(t)
@@ -340,6 +371,34 @@ func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyScanTimeout(
require.Equal(t, "1200", callbackPayload["trivyScanTimeout"])
}
+func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyResourceLimits(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ var callbackPayload map[string]string
+ svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings map[string]string) {
+ callbackPayload = timeoutSettings
+ }
+
+ limitsEnabled := "false"
+ cpuLimit := "2.5"
+ memoryLimit := "3072"
+ _, err = svc.UpdateSettings(ctx, settings.Update{
+ TrivyResourceLimitsEnabled: &limitsEnabled,
+ TrivyCpuLimit: &cpuLimit,
+ TrivyMemoryLimitMb: &memoryLimit,
+ })
+ require.NoError(t, err)
+
+ require.NotNil(t, callbackPayload)
+ require.Equal(t, "false", callbackPayload["trivyResourceLimitsEnabled"])
+ require.Equal(t, "2.5", callbackPayload["trivyCpuLimit"])
+ require.Equal(t, "3072", callbackPayload["trivyMemoryLimitMb"])
+}
+
func TestSettingsService_LoadDatabaseSettings_InternalKeys_EnvMode(t *testing.T) {
// Set env + disable flag
t.Setenv("UI_CONFIGURATION_DISABLED", "true")
diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.go
index f21a7f895..de3eb486e 100644
--- a/backend/internal/services/vulnerability_service.go
+++ b/backend/internal/services/vulnerability_service.go
@@ -9,6 +9,7 @@ import (
"log/slog"
"net"
"os"
+ "strconv"
"strings"
"sync"
"time"
@@ -30,13 +31,15 @@ import (
)
const (
- DefaultTrivyImage = "ghcr.io/aquasecurity/trivy:latest"
- trivyCacheVolumeName = "arcane-trivy-cache"
- trivyCacheMountTarget = "/root/.cache"
- scanStaleTimeout = 30 * time.Minute
- trivyMaxCPUNano = int64(1_000_000_000) // 1 CPU core
- trivyMaxMemoryBytes = int64(512 * 1024 * 1024)
- trivyErrorExcerptSize = int64(32 * 1024)
+ DefaultTrivyImage = "ghcr.io/aquasecurity/trivy:latest"
+ trivyCacheVolumeName = "arcane-trivy-cache"
+ trivyCacheMountTarget = "/root/.cache"
+ scanStaleTimeout = 30 * time.Minute
+ defaultTrivyCPULimitCores = 1.0
+ defaultTrivyMemoryLimitMB int64 = 0
+ trivyNanoCPUsPerCore = int64(1_000_000_000)
+ trivyBytesPerMB = int64(1024 * 1024)
+ trivyErrorExcerptSize = int64(32 * 1024)
)
// VulnerabilityService handles vulnerability scanning of container images
@@ -887,11 +890,10 @@ func (s *VulnerabilityService) createBatchTrivyContainer(ctx context.Context, tr
Target: trivyCacheMountTarget,
},
},
- Resources: containertypes.Resources{
- NanoCPUs: trivyMaxCPUNano,
- Memory: trivyMaxMemoryBytes,
- MemorySwap: trivyMaxMemoryBytes,
- },
+ }
+
+ if resources, applyLimits := s.getTrivyContainerResourcesInternal(); applyLimits {
+ hostConfig.Resources = resources
}
resp, err := dockerClient.ContainerCreate(ctx, config, hostConfig, nil, nil, "")
@@ -966,10 +968,7 @@ func (s *VulnerabilityService) execTrivyScanInContainer(ctx context.Context, con
errMsg = fmt.Sprintf("exit status %d", execInspect.ExitCode)
}
logTrivyScanFailureDiagnosticsInternal(ctx, imageName, imageID, int64(execInspect.ExitCode), stdoutFile, stderrFile, "exec non-zero exit")
- if strings.Contains(strings.ToLower(errMsg), "deadline exceeded") {
- return nil, fmt.Errorf("trivy scan timed out for %s (increase TRIVY_SCAN_TIMEOUT or trivyScanTimeout setting)", imageName)
- }
- return nil, fmt.Errorf("trivy scan failed: %s", errMsg)
+ return nil, formatTrivyExitErrorInternal(int64(execInspect.ExitCode), errMsg, imageName)
}
trivyReport, err := decodeTrivyReportFromFileInternal(stdoutFile)
@@ -1329,7 +1328,7 @@ func buildTrivyContainerConfig(trivyImage string, cmdArgs []string) *containerty
}
}
-func buildTrivyHostConfig(cacheVolume string, tempFiles []string) *containertypes.HostConfig {
+func buildTrivyHostConfig(cacheVolume string, tempFiles []string, resources containertypes.Resources, applyLimits bool) *containertypes.HostConfig {
hostConfig := &containertypes.HostConfig{
AutoRemove: true,
Mounts: []mounttypes.Mount{
@@ -1344,11 +1343,10 @@ func buildTrivyHostConfig(cacheVolume string, tempFiles []string) *containertype
Target: trivyCacheMountTarget,
},
},
- Resources: containertypes.Resources{
- NanoCPUs: trivyMaxCPUNano,
- Memory: trivyMaxMemoryBytes,
- MemorySwap: trivyMaxMemoryBytes,
- },
+ }
+
+ if applyLimits {
+ hostConfig.Resources = resources
}
addTrivyTempFileMounts(hostConfig, tempFiles)
@@ -1422,6 +1420,51 @@ func waitForDockerLogCopyInternal(logDone <-chan error) error {
return err
}
+func parseTrivyCPULimitInternal(raw string, fallback float64) float64 {
+ raw = strings.TrimSpace(raw)
+ if raw == "" {
+ return fallback
+ }
+
+ limit, err := strconv.ParseFloat(raw, 64)
+ if err != nil {
+ return fallback
+ }
+
+ if limit < 0 {
+ return 0
+ }
+
+ return limit
+}
+
+func parseTrivyMemoryLimitMBInternal(raw string, fallback int64) int64 {
+ raw = strings.TrimSpace(raw)
+ if raw == "" {
+ return fallback
+ }
+
+ limit, err := strconv.ParseInt(raw, 10, 64)
+ if err != nil {
+ return fallback
+ }
+
+ if limit < 0 {
+ return 0
+ }
+
+ return limit
+}
+
+func (s *VulnerabilityService) getTrivyContainerResourcesInternal() (containertypes.Resources, bool) {
+ var cfg *models.Settings
+ if s.settingsService != nil {
+ cfg = s.settingsService.GetSettingsConfig()
+ }
+
+ return buildTrivyContainerResourcesInternal(cfg)
+}
+
func isExpectedDockerStreamEndErrorInternal(err error) bool {
if err == nil {
return false
@@ -1510,6 +1553,52 @@ func logTrivyScanFailureDiagnosticsInternal(ctx context.Context, imageName, imag
)
}
+func formatTrivyExitErrorInternal(exitCode int64, errMsg, imageName string) error {
+ errMsg = strings.TrimSpace(errMsg)
+
+ if exitCode == 137 {
+ if errMsg == "" || errMsg == fmt.Sprintf("exit status %d", exitCode) {
+ return fmt.Errorf("trivy scan failed: process killed with exit status 137 (likely out of memory while scanning %s)", imageName)
+ }
+ return fmt.Errorf("trivy scan failed: %s (process killed with exit status 137; likely out of memory)", errMsg)
+ }
+
+ if strings.Contains(strings.ToLower(errMsg), "deadline exceeded") {
+ return fmt.Errorf("trivy scan timed out for %s (increase TRIVY_SCAN_TIMEOUT or trivyScanTimeout setting)", imageName)
+ }
+
+ return fmt.Errorf("trivy scan failed: %s", errMsg)
+}
+
+func buildTrivyContainerResourcesInternal(cfg *models.Settings) (containertypes.Resources, bool) {
+ limitsEnabled := true
+ cpuLimitCores := defaultTrivyCPULimitCores
+ memoryLimitMB := defaultTrivyMemoryLimitMB
+
+ if cfg != nil {
+ limitsEnabled = cfg.TrivyResourceLimitsEnabled.IsTrue()
+ cpuLimitCores = parseTrivyCPULimitInternal(cfg.TrivyCpuLimit.Value, defaultTrivyCPULimitCores)
+ memoryLimitMB = parseTrivyMemoryLimitMBInternal(cfg.TrivyMemoryLimitMb.Value, defaultTrivyMemoryLimitMB)
+ }
+
+ if !limitsEnabled {
+ return containertypes.Resources{}, false
+ }
+
+ resources := containertypes.Resources{}
+ if cpuLimitCores > 0 {
+ resources.NanoCPUs = int64(cpuLimitCores * float64(trivyNanoCPUsPerCore))
+ }
+
+ if memoryLimitMB > 0 {
+ memoryBytes := memoryLimitMB * trivyBytesPerMB
+ resources.Memory = memoryBytes
+ resources.MemorySwap = memoryBytes
+ }
+
+ return resources, true
+}
+
func (s *VulnerabilityService) runTrivyContainer(
ctx context.Context,
dockerClient *client.Client,
@@ -1631,7 +1720,8 @@ func (s *VulnerabilityService) runTrivyScan(ctx context.Context, trivyImage stri
defer cleanupTempFiles(ctx, tempFiles)
config := buildTrivyContainerConfig(trivyImage, cmdArgs)
- hostConfig := buildTrivyHostConfig(cacheVolume, tempFiles)
+ resources, applyLimits := s.getTrivyContainerResourcesInternal()
+ hostConfig := buildTrivyHostConfig(cacheVolume, tempFiles, resources, applyLimits)
stdoutFile, stderrFile, duration, statusCode, err := s.runTrivyContainer(ctx, dockerClient, config, hostConfig)
if err != nil {
@@ -1648,10 +1738,7 @@ func (s *VulnerabilityService) runTrivyScan(ctx context.Context, trivyImage stri
errMsg = fmt.Sprintf("exit status %d", statusCode)
}
logTrivyScanFailureDiagnosticsInternal(ctx, imageName, imageID, statusCode, stdoutFile, stderrFile, "container non-zero exit")
- if strings.Contains(strings.ToLower(errMsg), "deadline exceeded") {
- return nil, fmt.Errorf("trivy scan timed out for %s (increase TRIVY_SCAN_TIMEOUT or trivyScanTimeout setting)", imageName)
- }
- return nil, fmt.Errorf("trivy scan failed: %s", errMsg)
+ return nil, formatTrivyExitErrorInternal(statusCode, errMsg, imageName)
}
trivyReport, err := decodeTrivyReportFromFileInternal(stdoutFile)
diff --git a/backend/internal/services/vulnerability_service_test.go b/backend/internal/services/vulnerability_service_test.go
index e78d00462..806ad1e76 100644
--- a/backend/internal/services/vulnerability_service_test.go
+++ b/backend/internal/services/vulnerability_service_test.go
@@ -10,6 +10,8 @@ import (
"os"
"testing"
+ containertypes "github.com/docker/docker/api/types/container"
+ "github.com/getarcaneapp/arcane/backend/internal/models"
"github.com/getarcaneapp/arcane/types/vulnerability"
"github.com/stretchr/testify/require"
)
@@ -108,3 +110,68 @@ func TestCleanupTrivyLogTempFilesInternal_RemovesFiles(t *testing.T) {
require.Error(t, err)
require.True(t, os.IsNotExist(err))
}
+
+func TestBuildTrivyContainerResourcesInternal_Defaults(t *testing.T) {
+ resources, applyLimits := buildTrivyContainerResourcesInternal(nil)
+
+ require.True(t, applyLimits)
+ require.Equal(t, int64(1_000_000_000), resources.NanoCPUs)
+ require.Equal(t, int64(0), resources.Memory)
+ require.Equal(t, int64(0), resources.MemorySwap)
+}
+
+func TestBuildTrivyContainerResourcesInternal_LimitsDisabled(t *testing.T) {
+ cfg := &models.Settings{
+ TrivyResourceLimitsEnabled: models.SettingVariable{Value: "false"},
+ TrivyCpuLimit: models.SettingVariable{Value: "2"},
+ TrivyMemoryLimitMb: models.SettingVariable{Value: "2048"},
+ }
+
+ resources, applyLimits := buildTrivyContainerResourcesInternal(cfg)
+
+ require.False(t, applyLimits)
+ require.Equal(t, int64(0), resources.NanoCPUs)
+ require.Equal(t, int64(0), resources.Memory)
+ require.Equal(t, int64(0), resources.MemorySwap)
+}
+
+func TestBuildTrivyContainerResourcesInternal_CustomLimits(t *testing.T) {
+ cfg := &models.Settings{
+ TrivyResourceLimitsEnabled: models.SettingVariable{Value: "true"},
+ TrivyCpuLimit: models.SettingVariable{Value: "2.5"},
+ TrivyMemoryLimitMb: models.SettingVariable{Value: "2048"},
+ }
+
+ resources, applyLimits := buildTrivyContainerResourcesInternal(cfg)
+
+ require.True(t, applyLimits)
+ require.Equal(t, int64(2_500_000_000), resources.NanoCPUs)
+ require.Equal(t, int64(2_147_483_648), resources.Memory)
+ require.Equal(t, int64(2_147_483_648), resources.MemorySwap)
+}
+
+func TestBuildTrivyHostConfig_ExcludesResourcesWhenLimitsDisabled(t *testing.T) {
+ resources := containertypes.Resources{
+ NanoCPUs: int64(2_000_000_000),
+ Memory: int64(1_073_741_824),
+ MemorySwap: int64(1_073_741_824),
+ }
+
+ hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, false)
+ require.Equal(t, int64(0), hostConfig.Resources.NanoCPUs)
+ require.Equal(t, int64(0), hostConfig.Resources.Memory)
+ require.Equal(t, int64(0), hostConfig.Resources.MemorySwap)
+}
+
+func TestBuildTrivyHostConfig_IncludesResourcesWhenLimitsEnabled(t *testing.T) {
+ resources := containertypes.Resources{
+ NanoCPUs: int64(2_000_000_000),
+ Memory: int64(1_073_741_824),
+ MemorySwap: int64(1_073_741_824),
+ }
+
+ hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, true)
+ require.Equal(t, resources.NanoCPUs, hostConfig.Resources.NanoCPUs)
+ require.Equal(t, resources.Memory, hostConfig.Resources.Memory)
+ require.Equal(t, resources.MemorySwap, hostConfig.Resources.MemorySwap)
+}
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 2a6a55466..9cd688ab0 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -977,6 +977,12 @@
"security_trivy_image_label": "Trivy Image",
"security_trivy_image_description": "Container image used for vulnerability scans.",
"security_trivy_image_note": "Note: This must be a Trivy image (for example, ghcr.io/aquasecurity/trivy:latest).",
+ "security_trivy_resource_limits_label": "Trivy Resource Limits",
+ "security_trivy_resource_limits_description": "Configure CPU and memory limits for Trivy scan containers.",
+ "security_trivy_resource_limits_note": "Disable this to run scans without CPU or memory limits.",
+ "security_trivy_cpu_limit_label": "CPU Limit (cores)",
+ "security_trivy_cpu_limit_help": "Supports decimals (for example: 1.5).",
+ "security_trivy_memory_limit_label": "Memory Limit (MB)",
"security_enable_one_provider": "Enable at least one authentication provider.",
"security_enable_one_provider_error": "At least one authentication provider must be enabled.",
"security_form_validation_error": "Please check the form for errors.",
diff --git a/frontend/src/lib/components/form/text-input-with-label.svelte b/frontend/src/lib/components/form/text-input-with-label.svelte
index c30944a5f..9d72d7039 100644
--- a/frontend/src/lib/components/form/text-input-with-label.svelte
+++ b/frontend/src/lib/components/form/text-input-with-label.svelte
@@ -10,6 +10,7 @@
placeholder = '',
description,
helpText,
+ reserveHelpTextSpace = false,
error,
disabled = false,
type = 'text',
@@ -24,6 +25,7 @@
placeholder?: string;
description?: string;
helpText?: string;
+ reserveHelpTextSpace?: boolean;
error?: string | null;
disabled?: boolean;
type?: 'text' | 'email' | 'password' | 'number' | 'url';
@@ -69,7 +71,7 @@
{#if description}
<p class="text-muted-foreground text-[0.8rem]">{description}</p>
{/if}
- {#if helpText}
- <p class="text-muted-foreground text-[0.7rem]">{helpText}</p>
+ {#if helpText || reserveHelpTextSpace}
+ <p class="text-muted-foreground min-h-[1rem] text-[0.7rem]">{helpText}</p>
{/if}
</div>
diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.ts
index 2c16719df..db3b02882 100644
--- a/frontend/src/lib/types/settings.type.ts
+++ b/frontend/src/lib/types/settings.type.ts
@@ -33,6 +33,9 @@ export type Settings = {
authSessionTimeout: number;
authPasswordPolicy: 'basic' | 'standard' | 'strong';
trivyImage: string;
+ trivyResourceLimitsEnabled: boolean;
+ trivyCpuLimit: number;
+ trivyMemoryLimitMb: number;
oidcEnabled: boolean;
oidcClientId: string;
oidcClientSecret?: string;
diff --git a/frontend/src/routes/(app)/settings/security/+page.svelte b/frontend/src/routes/(app)/settings/security/+page.svelte
index bf85f7e86..f11d900a3 100644
--- a/frontend/src/routes/(app)/settings/security/+page.svelte
+++ b/frontend/src/routes/(app)/settings/security/+page.svelte
@@ -35,6 +35,9 @@
.max(1440, m.security_session_timeout_max()),
authPasswordPolicy: z.enum(['basic', 'standard', 'strong']),
trivyImage: z.string(),
+ trivyResourceLimitsEnabled: z.boolean(),
+ trivyCpuLimit: z.coerce.number().nonnegative(),
+ trivyMemoryLimitMb: z.coerce.number().int().nonnegative(),
oidcEnabled: z.boolean(),
oidcMergeAccounts: z.boolean(),
oidcSkipTlsVerify: z.boolean(),
@@ -67,6 +70,9 @@
authSessionTimeout: currentSettings.authSessionTimeout,
authPasswordPolicy: currentSettings.authPasswordPolicy,
trivyImage: currentSettings.trivyImage,
+ trivyResourceLimitsEnabled: currentSettings.trivyResourceLimitsEnabled ?? true,
+ trivyCpuLimit: currentSettings.trivyCpuLimit ?? 1,
+ trivyMemoryLimitMb: currentSettings.trivyMemoryLimitMb ?? 0,
oidcEnabled: currentSettings.oidcEnabled,
oidcMergeAccounts: currentSettings.oidcMergeAccounts,
oidcSkipTlsVerify: currentSettings.oidcSkipTlsVerify,
@@ -91,6 +97,9 @@
authSessionTimeout: ($settingsStore || data.settings!).authSessionTimeout,
authPasswordPolicy: ($settingsStore || data.settings!).authPasswordPolicy,
trivyImage: ($settingsStore || data.settings!).trivyImage,
+ trivyResourceLimitsEnabled: ($settingsStore || data.settings!).trivyResourceLimitsEnabled ?? true,
+ trivyCpuLimit: ($settingsStore || data.settings!).trivyCpuLimit ?? 1,
+ trivyMemoryLimitMb: ($settingsStore || data.settings!).trivyMemoryLimitMb ?? 0,
oidcEnabled: ($settingsStore || data.settings!).oidcEnabled,
oidcMergeAccounts: ($settingsStore || data.settings!).oidcMergeAccounts,
oidcSkipTlsVerify: ($settingsStore || data.settings!).oidcSkipTlsVerify,
@@ -114,6 +123,9 @@
$formInputs.authSessionTimeout.value !== currentSettings.authSessionTimeout ||
$formInputs.authPasswordPolicy.value !== currentSettings.authPasswordPolicy ||
$formInputs.trivyImage.value !== currentSettings.trivyImage ||
+ $formInputs.trivyResourceLimitsEnabled.value !== (currentSettings.trivyResourceLimitsEnabled ?? true) ||
+ $formInputs.trivyCpuLimit.value !== (currentSettings.trivyCpuLimit ?? 1) ||
+ $formInputs.trivyMemoryLimitMb.value !== (currentSettings.trivyMemoryLimitMb ?? 0) ||
$formInputs.oidcEnabled.value !== currentSettings.oidcEnabled ||
$formInputs.oidcMergeAccounts.value !== currentSettings.oidcMergeAccounts ||
$formInputs.oidcSkipTlsVerify.value !== currentSettings.oidcSkipTlsVerify ||
@@ -144,6 +156,9 @@
return;
}
+ const trivyCpuLimit = formData.trivyResourceLimitsEnabled ? formData.trivyCpuLimit : 0;
+ const trivyMemoryLimitMb = formData.trivyResourceLimitsEnabled ? formData.trivyMemoryLimitMb : 0;
+
if (formData.oidcEnabled && !isOidcEnvForced) {
if (!formData.oidcClientId || !formData.oidcIssuerUrl) {
toast.error(m.security_oidc_required_fields());
@@ -159,6 +174,9 @@
authSessionTimeout: formData.authSessionTimeout,
authPasswordPolicy: formData.authPasswordPolicy,
trivyImage: formData.trivyImage,
+ trivyResourceLimitsEnabled: formData.trivyResourceLimitsEnabled,
+ trivyCpuLimit,
+ trivyMemoryLimitMb,
oidcEnabled: formData.oidcEnabled,
oidcMergeAccounts: formData.oidcMergeAccounts,
oidcSkipTlsVerify: formData.oidcSkipTlsVerify,
@@ -212,6 +230,14 @@
}
}
+ function handleTrivyResourceLimitsChange(checked: boolean) {
+ $formInputs.trivyResourceLimitsEnabled.value = checked;
+ if (!checked) {
+ $formInputs.trivyCpuLimit.value = 0;
+ $formInputs.trivyMemoryLimitMb.value = 0;
+ }
+ }
+
function confirmMergeAccounts() {
$formInputs.oidcMergeAccounts.value = true;
showMergeAccountsAlert = false;
@@ -638,6 +664,44 @@
/>
</div>
</div>
+
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.security_trivy_resource_limits_label()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_resource_limits_description()}</p>
+ <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_resource_limits_note()}</p>
+ </div>
+ <div class="space-y-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="trivyResourceLimitsEnabledSwitch"
+ bind:checked={$formInputs.trivyResourceLimitsEnabled.value}
+ onCheckedChange={handleTrivyResourceLimitsChange}
+ />
+ <Label for="trivyResourceLimitsEnabledSwitch" class="font-normal">
+ {$formInputs.trivyResourceLimitsEnabled.value ? m.common_enabled() : m.common_disabled()}
+ </Label>
+ </div>
+ <div class="grid gap-4 sm:grid-cols-2">
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyCpuLimit.value}
+ error={$formInputs.trivyCpuLimit.error}
+ disabled={!$formInputs.trivyResourceLimitsEnabled.value}
+ label={m.security_trivy_cpu_limit_label()}
+ helpText={m.security_trivy_cpu_limit_help()}
+ type="number"
+ />
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyMemoryLimitMb.value}
+ error={$formInputs.trivyMemoryLimitMb.error}
+ disabled={!$formInputs.trivyResourceLimitsEnabled.value}
+ label={m.security_trivy_memory_limit_label()}
+ reserveHelpTextSpace={true}
+ type="number"
+ />
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/types/settings/settings.go b/types/settings/settings.go
index eb761229e..8596dda4b 100644
--- a/types/settings/settings.go
+++ b/types/settings/settings.go
@@ -182,6 +182,23 @@ type Update struct {
// Required: false
TrivyImage *string `json:"trivyImage,omitempty"`
+ // TrivyResourceLimitsEnabled controls whether CPU and memory limits are applied to Trivy scan containers.
+ //
+ // Required: false
+ TrivyResourceLimitsEnabled *string `json:"trivyResourceLimitsEnabled,omitempty"`
+
+ // TrivyCpuLimit is the CPU limit in cores for Trivy scan containers.
+ // Supports decimals (for example: "1.5"). Set to "0" to disable the CPU limit.
+ //
+ // Required: false
+ TrivyCpuLimit *string `json:"trivyCpuLimit,omitempty"`
+
+ // TrivyMemoryLimitMb is the memory limit in megabytes for Trivy scan containers.
+ // Set to "0" to disable the memory limit.
+ //
+ // Required: false
+ TrivyMemoryLimitMb *string `json:"trivyMemoryLimitMb,omitempty"`
+
// AuthOidcConfig is deprecated and will be removed in a future release.
//
// Required: false