Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: fall back to cpuset for trivy when the docker host lacks CFS quota support (#3910)
Kyle Mendell41eae6334d88
diff --git a/backend/internal/vulnerability/vulnerability_trivy.go b/backend/internal/vulnerability/vulnerability_trivy.goindex 4762bcfd6..0527b2de7 100644--- a/backend/internal/vulnerability/vulnerability_trivy.go+++ b/backend/internal/vulnerability/vulnerability_trivy.go@@ -898,23 +898,29 @@ func (s *VulnerabilityService) getTrivyContainerResourceOptionsInternal(ctx cont"ncpu", info.Info.NCPU,)- if !vuln.IsSynologyDockerHost(info.Info.OperatingSystem) {+ if info.Info.CPUCfsQuota && !vuln.IsSynologyDockerHost(info.Info.OperatingSystem) {return resources, "", applyLimits}- cpuSet := vuln.BuildCPUSet(resources.NanoCPUs, info.Info.NCPU)+ cpuSet := ""+ if info.Info.CPUSet {+ cpuSet = vuln.BuildCPUSet(resources.NanoCPUs, info.Info.NCPU)+ }resources.NanoCPUs = 0if cpuSet != "" {slog.InfoContext(ctx,- "detected Synology Docker host; applying Trivy CPU limit via cpuset",+ "docker host does not support CPU CFS quota; applying Trivy CPU limit via cpuset","operatingSystem", info.Info.OperatingSystem,+ "cpuCfsQuota", info.Info.CPUCfsQuota,"cpuset", cpuSet,)} else {slog.InfoContext(ctx,- "detected Synology Docker host; skipping Trivy NanoCPUs limit",+ "docker host does not support CPU CFS quota or cpuset; skipping Trivy CPU limit","operatingSystem", info.Info.OperatingSystem,+ "cpuCfsQuota", info.Info.CPUCfsQuota,+ "cpuSet", info.Info.CPUSet,)}diff --git a/backend/pkg/libarcane/vuln/driver.go b/backend/pkg/libarcane/vuln/driver.goindex 7d3beb2d1..72f182b55 100644--- a/backend/pkg/libarcane/vuln/driver.go+++ b/backend/pkg/libarcane/vuln/driver.go@@ -454,10 +454,11 @@ func ContainerWaitTimeout(trivyTimeoutArg string) time.Duration {func IsSynologyDockerHost(operatingSystem string) bool {// Docker info may return a multi-line OS string on some Synology models.- // e.g. DS925+ (Kernel 5.x) returns "Synology NAS\n (containerized)".- // Check each line independently so a match on any line is sufficient.+ // e.g. DS925+ (Kernel 5.x) returns "Synology NAS\n (containerized)";+ // older DSM builds (e.g. DS1019+, Kernel 4.4) report just "DiskStation".for line := range strings.SplitSeq(operatingSystem, "\n") {- if strings.Contains(strings.ToLower(strings.TrimSpace(line)), "synology") {+ line = strings.ToLower(strings.TrimSpace(line))+ if strings.Contains(line, "synology") || strings.Contains(line, "diskstation") {return true}}diff --git a/backend/pkg/libarcane/vuln/driver_test.go b/backend/pkg/libarcane/vuln/driver_test.goindex f98ef14a7..a8ee87012 100644--- a/backend/pkg/libarcane/vuln/driver_test.go+++ b/backend/pkg/libarcane/vuln/driver_test.go@@ -442,6 +442,8 @@ func TestIsSynologyDockerHostInternal(t *testing.T) {require.True(t, IsSynologyDockerHost("synology nas"))// Padded with spacesrequire.True(t, IsSynologyDockerHost(" Synology NAS "))+ // DS1019+ (Kernel 4.4): OS field is just "DiskStation"+ require.True(t, IsSynologyDockerHost("DiskStation"))// Empty / non-Synologyrequire.False(t, IsSynologyDockerHost(""))require.False(t, IsSynologyDockerHost("Ubuntu 24.04.1 LTS"))