Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: use configured DOCKER_HOST for trivy containers (#2076)
Kyle Mendell953b3c92df1f
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.goindex 9827050a9..fb96c370c 100644--- a/backend/internal/models/settings.go+++ b/backend/internal/models/settings.go@@ -91,7 +91,7 @@ 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" catmeta:"id=security;title=Security;icon=shield;url=/settings/security;description=Configure vulnerability scanning and runtime security settings"`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"`- TrivyNetwork SettingVariable `key:"trivyNetwork,envOverride" meta:"label=Trivy Network;type=text;keywords=trivy,network,mode,bridge,host,none,scanner,vulnerability,security;category=security;description=Docker network mode/network name used for Trivy scan containers (default: bridge)"`+ TrivyNetwork SettingVariable `key:"trivyNetwork,envOverride" meta:"label=Trivy Network;type=text;keywords=trivy,network,mode,bridge,host,none,scanner,vulnerability,security;category=security;description=Docker network mode/network name used for Trivy scan containers. Leave empty to inherit Arcane's network automatically."`TrivySecurityOpts SettingVariable `key:"trivySecurityOpts,envOverride" meta:"label=Trivy Security Options;type=textarea;keywords=trivy,security,opt,security_opt,selinux,labels,apparmor,scanner;category=security;description=Docker security options applied to Trivy scan containers. Use commas or new lines to separate entries (for example: label=disable)"`TrivyPrivileged SettingVariable `key:"trivyPrivileged,envOverride" meta:"label=Trivy Privileged;type=boolean;keywords=trivy,privileged,security,selinux,scanner;category=security;description=Run Trivy scan containers in privileged mode when required by the host security policy"`TrivyPreserveCacheOnVolumePrune SettingVariable `key:"trivyPreserveCacheOnVolumePrune,envOverride" meta:"label=Preserve Trivy Cache On Volume Prune;type=boolean;keywords=trivy,cache,volume,prune,preserve,cleanup,security;category=security;description=Keep the Trivy cache volume when unused volumes are pruned manually or on a schedule"`diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex 5fd764780..5e41ec087 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -121,7 +121,7 @@ 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"},- TrivyNetwork: models.SettingVariable{Value: "bridge"},+ TrivyNetwork: models.SettingVariable{Value: ""},TrivySecurityOpts: models.SettingVariable{Value: ""},TrivyPrivileged: models.SettingVariable{Value: "false"},TrivyPreserveCacheOnVolumePrune: models.SettingVariable{Value: "true"},diff --git a/backend/internal/services/settings_service_test.go b/backend/internal/services/settings_service_test.goindex 2eef5deea..da2933b60 100644--- a/backend/internal/services/settings_service_test.go+++ b/backend/internal/services/settings_service_test.go@@ -57,7 +57,7 @@ func TestSettingsService_EnsureDefaultSettings_Idempotent(t *testing.T) {case "vulnerabilityScanInterval":require.Equal(t, "0 0 0 * * *", sv.Value)case "trivyNetwork":- require.Equal(t, "bridge", sv.Value)+ require.Equal(t, "", sv.Value)case "trivySecurityOpts":require.Equal(t, "", sv.Value)case "trivyPrivileged":@@ -187,7 +187,7 @@ func TestSettingsService_GetSettings_EnvOverride_TrivyNetwork(t *testing.T) {settings1, err := svc.GetSettings(ctx)require.NoError(t, err)- require.Equal(t, "bridge", settings1.TrivyNetwork.Value)+ require.Equal(t, "", settings1.TrivyNetwork.Value)t.Setenv("TRIVY_NETWORK", "arcane-external")settings2, err := svc.GetSettings(ctx)diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.goindex d83f9a10f..0ad296d28 100644--- a/backend/internal/services/vulnerability_service.go+++ b/backend/internal/services/vulnerability_service.go@@ -11,6 +11,7 @@ import ("log/slog""math""net"+ "net/url""os""sort""strconv"@@ -21,6 +22,7 @@ import (cerrdefs "github.com/containerd/errdefs""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/internal/utils/arcaneupdater"dockerutils "github.com/getarcaneapp/arcane/backend/internal/utils/docker""github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/backend/internal/utils/timeouts"@@ -51,8 +53,15 @@ const (defaultScanSaveRetryDelay = 200 * time.MilliseconddefaultScanSaveRetryMaxDelay = 2 * time.SecondtrivyOutputPathPrefix = "/tmp/arcane-trivy-result-"+ defaultDockerHostURI = "unix:///var/run/docker.sock")+type trivyRuntimeOptions struct {+ ContainerEnv []string+ Mounts []mounttypes.Mount+ NetworkMode string+}+// VulnerabilityService handles vulnerability scanning of container imagestype VulnerabilityService struct {db *database.DB@@ -1264,16 +1273,22 @@ func (s *VulnerabilityService) createBatchTrivyContainer(ctx context.Context, trreturn "", fmt.Errorf("failed to connect to Docker: %w", err)}+ runtimeOptions, err := s.resolveTrivyRuntimeOptionsInternal(ctx, dockerClient)+ if err != nil {+ return "", err+ }+config := &containertypes.Config{Image: trivyImage,Entrypoint: []string{"sh", "-c", "trap 'exit 0' TERM; while :; do sleep 1; done"},+ Env: append([]string(nil), runtimeOptions.ContainerEnv...),Labels: map[string]string{libarcane.InternalResourceLabel: "true",},}securityOpts, privileged := s.getTrivyRuntimeSecurityInternal()- hostConfig := buildTrivyBatchHostConfigInternal(cacheVolume, s.getTrivyNetworkModeInternal(), securityOpts, privileged)+ hostConfig := buildTrivyBatchHostConfigInternal(cacheVolume, runtimeOptions, securityOpts, privileged)resources, cpuSet, applyLimits := s.getTrivyContainerResourceOptionsInternal(ctx, dockerClient)applyTrivyContainerResourcesInternal(hostConfig, resources, cpuSet, applyLimits)@@ -1589,11 +1604,7 @@ func (s *VulnerabilityService) getTrivyImageRef() string {}func normalizeTrivyNetworkModeInternal(networkMode string) string {- networkMode = strings.TrimSpace(networkMode)- if networkMode == "" {- return DefaultTrivyNetworkMode- }- return networkMode+ return strings.TrimSpace(networkMode)}func parseTrivySecurityOptsInternal(value string) []string {@@ -1624,19 +1635,278 @@ func parseTrivySecurityOptsInternal(value string) []string {return opts}-func (s *VulnerabilityService) getTrivyNetworkModeInternal() string {+func (s *VulnerabilityService) getConfiguredTrivyNetworkModeInternal() string {if s.settingsService == nil {- return DefaultTrivyNetworkMode+ return ""}cfg := s.settingsService.GetSettingsConfig()if cfg == nil {- return DefaultTrivyNetworkMode+ return ""}return normalizeTrivyNetworkModeInternal(cfg.TrivyNetwork.Value)}+func (s *VulnerabilityService) getEffectiveDockerHostInternal() string {+ if s.dockerService != nil && s.dockerService.config != nil {+ if host := strings.TrimSpace(s.dockerService.config.DockerHost); host != "" {+ return host+ }+ }++ if s.settingsService != nil {+ if cfg := s.settingsService.GetSettingsConfig(); cfg != nil {+ if host := strings.TrimSpace(cfg.DockerHost.Value); host != "" {+ return host+ }+ }+ }++ return defaultDockerHostURI+}++func parseTrivyDockerHostInternal(dockerHost string) (scheme string, socketPath string, err error) {+ dockerHost = strings.TrimSpace(dockerHost)+ if dockerHost == "" {+ dockerHost = defaultDockerHostURI+ }++ if strings.HasPrefix(dockerHost, "/") {+ return "unix", dockerHost, nil+ }++ parsed, err := url.Parse(dockerHost)+ if err != nil {+ return "", "", fmt.Errorf("parse docker host %q: %w", dockerHost, err)+ }++ scheme = strings.ToLower(strings.TrimSpace(parsed.Scheme))+ switch scheme {+ case "unix":+ socketPath = strings.TrimSpace(parsed.Path)+ if socketPath == "" {+ return "", "", fmt.Errorf("docker host %q is missing a unix socket path", dockerHost)+ }+ return scheme, socketPath, nil+ case "tcp", "http", "https":+ return scheme, "", nil+ default:+ return "", "", fmt.Errorf("unsupported docker host scheme %q", scheme)+ }+}++func buildTrivyDockerHostEnvInternal(dockerHost string) []string {+ dockerHost = strings.TrimSpace(dockerHost)+ if dockerHost == "" {+ return nil+ }++ return []string{"DOCKER_HOST=" + dockerHost}+}++func resolveTrivyUnixSocketSourceInternal(+ ctx context.Context,+ socketPath string,+ discoverHostPath func(context.Context, string) (string, error),+ isRunningInDocker func() bool,+) (string, error) {+ socketPath = strings.TrimSpace(socketPath)+ if socketPath == "" {+ return "", errors.New("unix docker host is missing a socket path")+ }++ if discoverHostPath != nil {+ hostPath, err := discoverHostPath(ctx, socketPath)+ if err == nil && strings.TrimSpace(hostPath) != "" {+ return strings.TrimSpace(hostPath), nil+ }+ if err != nil && (isRunningInDocker == nil || isRunningInDocker()) {+ return "", fmt.Errorf("failed to resolve socket path %q: %w", socketPath, err)+ }+ }++ if isRunningInDocker != nil && isRunningInDocker() {+ return "", fmt.Errorf("failed to resolve socket path %q to a daemon-visible host path", socketPath)+ }++ return socketPath, nil+}++func findArcaneContainerByLabelInternal(ctx context.Context, dockerClient *client.Client) string {+ if dockerClient == nil {+ return ""+ }++ filters := make(client.Filters)+ filters = filters.Add("label", arcaneupdater.LabelArcane+"=true")++ containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{+ All: true,+ Filters: filters,+ })+ if err != nil {+ return ""+ }++ var fallbackID string+ for _, containerSummary := range containerList.Items {+ if value, ok := containerSummary.Labels["com.getarcaneapp.arcane.upgrader"]; ok &&+ strings.EqualFold(strings.TrimSpace(value), "true") {+ continue+ }+ if containerSummary.State == containertypes.StateRunning {+ return containerSummary.ID+ }+ if fallbackID == "" {+ fallbackID = containerSummary.ID+ }+ }++ return fallbackID+}++func (s *VulnerabilityService) inspectCurrentArcaneContainerInternal(+ ctx context.Context,+ dockerClient *client.Client,+) (*containertypes.InspectResponse, error) {+ if dockerClient == nil {+ return nil, errors.New("docker client is not available")+ }++ if containerID, err := dockerutils.GetCurrentContainerID(); err == nil {+ inspect, inspectErr := libarcane.ContainerInspectWithCompatibility(+ ctx,+ dockerClient,+ containerID,+ client.ContainerInspectOptions{},+ )+ if inspectErr == nil {+ return &inspect.Container, nil+ }+ }++ containerID := findArcaneContainerByLabelInternal(ctx, dockerClient)+ if containerID == "" {+ return nil, errors.New("could not detect Arcane container")+ }++ inspect, err := libarcane.ContainerInspectWithCompatibility(+ ctx,+ dockerClient,+ containerID,+ client.ContainerInspectOptions{},+ )+ if err != nil {+ return nil, fmt.Errorf("inspect Arcane container: %w", err)+ }++ return &inspect.Container, nil+}++func selectTrivyAutoNetworkModeInternal(inspect *containertypes.InspectResponse) string {+ if inspect == nil {+ return DefaultTrivyNetworkMode+ }++ if inspect.HostConfig != nil {+ networkMode := normalizeTrivyNetworkModeInternal(string(inspect.HostConfig.NetworkMode))+ if networkMode != "" && networkMode != "default" && networkMode != DefaultTrivyNetworkMode &&+ !containertypes.NetworkMode(networkMode).IsContainer() {+ return networkMode+ }+ }++ if inspect.NetworkSettings != nil && len(inspect.NetworkSettings.Networks) > 0 {+ networkNames := make([]string, 0, len(inspect.NetworkSettings.Networks))+ for networkName := range inspect.NetworkSettings.Networks {+ networkName = normalizeTrivyNetworkModeInternal(networkName)+ if networkName != "" {+ networkNames = append(networkNames, networkName)+ }+ }+ sort.Strings(networkNames)++ for _, networkName := range networkNames {+ if !dockerutils.IsDefaultNetwork(networkName) {+ return networkName+ }+ }++ for _, networkName := range networkNames {+ if containertypes.NetworkMode(networkName).IsContainer() {+ continue+ }+ if networkName == "host" || networkName == "none" || networkName == DefaultTrivyNetworkMode {+ return networkName+ }+ }+ }++ if inspect.HostConfig != nil {+ networkMode := normalizeTrivyNetworkModeInternal(string(inspect.HostConfig.NetworkMode))+ if networkMode != "" && networkMode != "default" && !containertypes.NetworkMode(networkMode).IsContainer() {+ return networkMode+ }+ }++ return DefaultTrivyNetworkMode+}++func (s *VulnerabilityService) resolveTrivyNetworkModeInternal(ctx context.Context, dockerClient *client.Client) string {+ if configuredNetwork := s.getConfiguredTrivyNetworkModeInternal(); configuredNetwork != "" {+ return configuredNetwork+ }++ inspect, err := s.inspectCurrentArcaneContainerInternal(ctx, dockerClient)+ if err == nil {+ return selectTrivyAutoNetworkModeInternal(inspect)+ }++ slog.DebugContext(ctx, "failed to auto-detect Trivy network; falling back to bridge", "error", err)+ return DefaultTrivyNetworkMode+}++func (s *VulnerabilityService) resolveTrivyRuntimeOptionsInternal(ctx context.Context, dockerClient *client.Client) (trivyRuntimeOptions, error) {+ options := trivyRuntimeOptions{+ NetworkMode: s.resolveTrivyNetworkModeInternal(ctx, dockerClient),+ }++ dockerHost := s.getEffectiveDockerHostInternal()+ scheme, socketPath, err := parseTrivyDockerHostInternal(dockerHost)+ if err != nil {+ return trivyRuntimeOptions{}, fmt.Errorf("failed to resolve trivy docker host: %w", err)+ }++ options.ContainerEnv = buildTrivyDockerHostEnvInternal(dockerHost)+ if scheme != "unix" {+ return options, nil+ }++ socketSource, err := resolveTrivyUnixSocketSourceInternal(+ ctx,+ socketPath,+ func(ctx context.Context, containerPath string) (string, error) {+ return dockerutils.GetHostPathForContainerPath(ctx, dockerClient, containerPath)+ },+ func() bool {+ _, err := dockerutils.GetCurrentContainerID()+ return err == nil+ },+ )+ if err != nil {+ return trivyRuntimeOptions{}, fmt.Errorf("failed to resolve trivy docker host: %w", err)+ }++ options.Mounts = append(options.Mounts, mounttypes.Mount{+ Type: mounttypes.TypeBind,+ Source: socketSource,+ Target: socketPath,+ })++ return options, nil+}+func (s *VulnerabilityService) getTrivyRuntimeSecurityInternal() ([]string, bool) {if s.settingsService == nil {return nil, false@@ -1824,31 +2094,33 @@ func (s *VulnerabilityService) buildTrivyCommandArgs(return cmdArgs, tempFiles}-func buildTrivyContainerConfig(trivyImage string, cmdArgs []string) *containertypes.Config {+func buildTrivyContainerConfig(trivyImage string, cmdArgs []string, env []string) *containertypes.Config {return &containertypes.Config{Image: trivyImage,Cmd: cmdArgs,+ Env: append([]string(nil), env...),Labels: map[string]string{libarcane.InternalResourceLabel: "true",},}}-func buildTrivyBatchHostConfigInternal(cacheVolume, networkMode string, securityOpts []string, privileged bool) *containertypes.HostConfig {+func buildTrivyBatchHostConfigInternal(+ cacheVolume string,+ runtimeOptions trivyRuntimeOptions,+ securityOpts []string,+ privileged bool,+) *containertypes.HostConfig {+ mounts := append([]mounttypes.Mount{}, runtimeOptions.Mounts...)+ mounts = append(mounts, mounttypes.Mount{+ Type: mounttypes.TypeVolume,+ Source: cacheVolume,+ Target: trivyCacheMountTarget,+ })+hostConfig := &containertypes.HostConfig{- NetworkMode: containertypes.NetworkMode(normalizeTrivyNetworkModeInternal(networkMode)),- Mounts: []mounttypes.Mount{- {- Type: mounttypes.TypeBind,- Source: "/var/run/docker.sock",- Target: "/var/run/docker.sock",- },- {- Type: mounttypes.TypeVolume,- Source: cacheVolume,- Target: trivyCacheMountTarget,- },- },+ NetworkMode: containertypes.NetworkMode(selectDefaultTrivyNetworkModeInternal(runtimeOptions.NetworkMode)),+ Mounts: mounts,}applyTrivyRuntimeSecurityInternal(hostConfig, securityOpts, privileged)@@ -1861,27 +2133,23 @@ func buildTrivyHostConfig(resources containertypes.Resources,cpuSet string,applyLimits bool,- networkMode string,+ runtimeOptions trivyRuntimeOptions,securityOpts []string,privileged bool,) *containertypes.HostConfig {+ mounts := append([]mounttypes.Mount{}, runtimeOptions.Mounts...)+ mounts = append(mounts, mounttypes.Mount{+ Type: mounttypes.TypeVolume,+ Source: cacheVolume,+ Target: trivyCacheMountTarget,+ })+hostConfig := &containertypes.HostConfig{- NetworkMode: containertypes.NetworkMode(normalizeTrivyNetworkModeInternal(networkMode)),+ NetworkMode: containertypes.NetworkMode(selectDefaultTrivyNetworkModeInternal(runtimeOptions.NetworkMode)),// Keep single-scan containers until explicit cleanup so we can reliably// wait for completion and collect logs across Docker variants.AutoRemove: false,- Mounts: []mounttypes.Mount{- {- Type: mounttypes.TypeBind,- Source: "/var/run/docker.sock",- Target: "/var/run/docker.sock",- },- {- Type: mounttypes.TypeVolume,- Source: cacheVolume,- Target: trivyCacheMountTarget,- },- },+ Mounts: mounts,}applyTrivyRuntimeSecurityInternal(hostConfig, securityOpts, privileged)@@ -1891,6 +2159,14 @@ func buildTrivyHostConfig(return hostConfig}+func selectDefaultTrivyNetworkModeInternal(networkMode string) string {+ networkMode = normalizeTrivyNetworkModeInternal(networkMode)+ if networkMode == "" {+ return DefaultTrivyNetworkMode+ }+ return networkMode+}+func applyTrivyRuntimeSecurityInternal(hostConfig *containertypes.HostConfig, securityOpts []string, privileged bool) {if hostConfig == nil {return@@ -2858,7 +3134,12 @@ func (s *VulnerabilityService) runTrivyScan(ctx context.Context, trivyImage stricmdArgs, tempFiles := s.buildTrivyCommandArgs(ctx, imageName, configContent, ignoreContent, cacheDir, outputPath)defer cleanupTempFiles(ctx, tempFiles)- config := buildTrivyContainerConfig(trivyImage, cmdArgs)+ runtimeOptions, err := s.resolveTrivyRuntimeOptionsInternal(ctx, dockerClient)+ if err != nil {+ return nil, err+ }++ config := buildTrivyContainerConfig(trivyImage, cmdArgs, runtimeOptions.ContainerEnv)resources, cpuSet, applyLimits := s.getTrivyContainerResourceOptionsInternal(ctx, dockerClient)securityOpts, privileged := s.getTrivyRuntimeSecurityInternal()hostConfig := buildTrivyHostConfig(@@ -2867,7 +3148,7 @@ func (s *VulnerabilityService) runTrivyScan(ctx context.Context, trivyImage striresources,cpuSet,applyLimits,- s.getTrivyNetworkModeInternal(),+ runtimeOptions,securityOpts,privileged,)diff --git a/backend/internal/services/vulnerability_service_test.go b/backend/internal/services/vulnerability_service_test.goindex c03dc12bb..667e06120 100644--- a/backend/internal/services/vulnerability_service_test.go+++ b/backend/internal/services/vulnerability_service_test.go@@ -20,6 +20,7 @@ import (glsqlite "github.com/glebarez/sqlite"containertypes "github.com/moby/moby/api/types/container"mounttypes "github.com/moby/moby/api/types/mount"+ networktypes "github.com/moby/moby/api/types/network""github.com/stretchr/testify/require""gorm.io/gorm")@@ -289,6 +290,16 @@ func TestBuildTrivyCommandArgs_WithoutCacheDir(t *testing.T) {require.Equal(t, "alpine:3.20", cmdArgs[len(cmdArgs)-1])}+func TestBuildTrivyContainerConfig_IncludesEnv(t *testing.T) {+ config := buildTrivyContainerConfig(+ "ghcr.io/aquasecurity/trivy:latest",+ []string{"image", "alpine:3.20"},+ []string{"DOCKER_HOST=tcp://docker-socket-proxy:2375"},+ )++ require.Equal(t, []string{"DOCKER_HOST=tcp://docker-socket-proxy:2375"}, config.Env)+}+func TestBuildTrivyHostConfig_ExcludesResourcesWhenLimitsDisabled(t *testing.T) {resources := containertypes.Resources{NanoCPUs: int64(2_000_000_000),@@ -296,7 +307,16 @@ func TestBuildTrivyHostConfig_ExcludesResourcesWhenLimitsDisabled(t *testing.T)MemorySwap: int64(1_073_741_824),}- hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, "", false, "bridge", nil, false)+ hostConfig := buildTrivyHostConfig(+ "cache-volume",+ nil,+ resources,+ "",+ false,+ trivyRuntimeOptions{NetworkMode: "bridge"},+ nil,+ false,+ )require.Equal(t, containertypes.NetworkMode("bridge"), hostConfig.NetworkMode)require.Equal(t, int64(0), hostConfig.Resources.NanoCPUs)require.Equal(t, int64(0), hostConfig.Resources.Memory)@@ -312,7 +332,16 @@ func TestBuildTrivyHostConfig_IncludesResourcesWhenLimitsEnabled(t *testing.T) {MemorySwap: int64(1_073_741_824),}- hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, "", true, "arcane-external", nil, false)+ hostConfig := buildTrivyHostConfig(+ "cache-volume",+ nil,+ resources,+ "",+ true,+ trivyRuntimeOptions{NetworkMode: "arcane-external"},+ nil,+ false,+ )require.Equal(t, containertypes.NetworkMode("arcane-external"), hostConfig.NetworkMode)require.Equal(t, resources.NanoCPUs, hostConfig.Resources.NanoCPUs)require.Equal(t, resources.Memory, hostConfig.Resources.Memory)@@ -326,7 +355,16 @@ func TestBuildTrivyHostConfig_UsesCPUSetAndClearsNanoCPUs(t *testing.T) {MemorySwap: int64(1_073_741_824),}- hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, "0-1", true, "bridge", nil, false)+ hostConfig := buildTrivyHostConfig(+ "cache-volume",+ nil,+ resources,+ "0-1",+ true,+ trivyRuntimeOptions{NetworkMode: "bridge"},+ nil,+ false,+ )require.Equal(t, containertypes.NetworkMode("bridge"), hostConfig.NetworkMode)require.Equal(t, int64(0), hostConfig.Resources.NanoCPUs)require.Equal(t, "0-1", hostConfig.Resources.CpusetCpus)@@ -362,7 +400,7 @@ func TestBuildTrivyHostConfig_AppliesRuntimeSecurity(t *testing.T) {containertypes.Resources{},"",false,- "bridge",+ trivyRuntimeOptions{NetworkMode: "bridge"},[]string{"label=disable", "label=type:container_runtime_t"},true,)@@ -374,7 +412,7 @@ func TestBuildTrivyHostConfig_AppliesRuntimeSecurity(t *testing.T) {func TestBuildTrivyBatchHostConfig_AppliesRuntimeSecurity(t *testing.T) {hostConfig := buildTrivyBatchHostConfigInternal("cache-volume",- "arcane-external",+ trivyRuntimeOptions{NetworkMode: "arcane-external"},[]string{"label=disable"},true,)@@ -382,7 +420,35 @@ func TestBuildTrivyBatchHostConfig_AppliesRuntimeSecurity(t *testing.T) {require.Equal(t, containertypes.NetworkMode("arcane-external"), hostConfig.NetworkMode)require.Equal(t, []string{"label=disable"}, hostConfig.SecurityOpt)require.True(t, hostConfig.Privileged)+ require.Len(t, hostConfig.Mounts, 1)+ require.Equal(t, "cache-volume", hostConfig.Mounts[0].Source)+}++func TestBuildTrivyHostConfig_IncludesInheritedSocketMount(t *testing.T) {+ hostConfig := buildTrivyHostConfig(+ "cache-volume",+ nil,+ containertypes.Resources{},+ "",+ false,+ trivyRuntimeOptions{+ NetworkMode: "bridge",+ Mounts: []mounttypes.Mount{+ {+ Type: mounttypes.TypeBind,+ Source: "/run/user/1000/podman/podman.sock",+ Target: "/run/user/1000/podman/podman.sock",+ },+ },+ },+ nil,+ false,+ )+require.Len(t, hostConfig.Mounts, 2)+ require.Equal(t, "/run/user/1000/podman/podman.sock", hostConfig.Mounts[0].Source)+ require.Equal(t, "/run/user/1000/podman/podman.sock", hostConfig.Mounts[0].Target)+ require.Equal(t, "cache-volume", hostConfig.Mounts[1].Source)}func TestApplyTrivyRuntimeSecurityInternal(t *testing.T) {@@ -395,11 +461,130 @@ func TestApplyTrivyRuntimeSecurityInternal(t *testing.T) {}func TestNormalizeTrivyNetworkModeInternal(t *testing.T) {- require.Equal(t, DefaultTrivyNetworkMode, normalizeTrivyNetworkModeInternal(""))- require.Equal(t, DefaultTrivyNetworkMode, normalizeTrivyNetworkModeInternal(" \t\n "))+ require.Equal(t, "", normalizeTrivyNetworkModeInternal(""))+ require.Equal(t, "", normalizeTrivyNetworkModeInternal(" \t\n "))require.Equal(t, "arcane-external", normalizeTrivyNetworkModeInternal("arcane-external"))}+func TestSelectDefaultTrivyNetworkModeInternal(t *testing.T) {+ require.Equal(t, DefaultTrivyNetworkMode, selectDefaultTrivyNetworkModeInternal(""))+ require.Equal(t, DefaultTrivyNetworkMode, selectDefaultTrivyNetworkModeInternal(" \t\n "))+ require.Equal(t, "arcane-external", selectDefaultTrivyNetworkModeInternal("arcane-external"))+}++func TestParseTrivyDockerHostInternal(t *testing.T) {+ tests := []struct {+ name string+ dockerHost string+ wantScheme string+ wantSocketPath string+ wantErr string+ }{+ {name: "default unix", dockerHost: "", wantScheme: "unix", wantSocketPath: "/var/run/docker.sock"},+ {name: "explicit unix", dockerHost: "unix:///run/user/1000/podman/podman.sock", wantScheme: "unix", wantSocketPath: "/run/user/1000/podman/podman.sock"},+ {name: "tcp host", dockerHost: "tcp://docker-socket-proxy:2375", wantScheme: "tcp"},+ {name: "http host", dockerHost: "http://docker-socket-proxy:2375", wantScheme: "http"},+ {name: "https host", dockerHost: "https://docker.example.com", wantScheme: "https"},+ {name: "unsupported scheme", dockerHost: "ssh://docker.example.com", wantErr: "unsupported docker host scheme"},+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ scheme, socketPath, err := parseTrivyDockerHostInternal(tt.dockerHost)+ if tt.wantErr != "" {+ require.Error(t, err)+ require.Contains(t, err.Error(), tt.wantErr)+ return+ }++ require.NoError(t, err)+ require.Equal(t, tt.wantScheme, scheme)+ require.Equal(t, tt.wantSocketPath, socketPath)+ })+ }+}++func TestResolveTrivyUnixSocketSourceInternal(t *testing.T) {+ t.Run("uses resolved host path", func(t *testing.T) {+ source, err := resolveTrivyUnixSocketSourceInternal(+ context.Background(),+ "/run/user/1000/podman/podman.sock",+ func(context.Context, string) (string, error) {+ return "/host/podman/podman.sock", nil+ },+ func() bool { return true },+ )++ require.NoError(t, err)+ require.Equal(t, "/host/podman/podman.sock", source)+ })++ t.Run("fails when socket cannot be resolved in docker", func(t *testing.T) {+ _, err := resolveTrivyUnixSocketSourceInternal(+ context.Background(),+ "/run/user/1000/podman/podman.sock",+ func(context.Context, string) (string, error) {+ return "", nil+ },+ func() bool { return true },+ )++ require.Error(t, err)+ require.Contains(t, err.Error(), "daemon-visible host path")+ })++ t.Run("falls back to original path outside docker", func(t *testing.T) {+ source, err := resolveTrivyUnixSocketSourceInternal(+ context.Background(),+ "/var/run/docker.sock",+ func(context.Context, string) (string, error) {+ return "", errors.New("not running in docker")+ },+ func() bool { return false },+ )++ require.NoError(t, err)+ require.Equal(t, "/var/run/docker.sock", source)+ })+}++func TestSelectTrivyAutoNetworkModeInternal(t *testing.T) {+ t.Run("prefers explicit host network mode", func(t *testing.T) {+ mode := selectTrivyAutoNetworkModeInternal(&containertypes.InspectResponse{+ HostConfig: &containertypes.HostConfig{NetworkMode: "host"},+ })++ require.Equal(t, "host", mode)+ })++ t.Run("prefers attached custom network over bridge", func(t *testing.T) {+ mode := selectTrivyAutoNetworkModeInternal(&containertypes.InspectResponse{+ HostConfig: &containertypes.HostConfig{NetworkMode: "bridge"},+ NetworkSettings: &containertypes.NetworkSettings{+ Networks: map[string]*networktypes.EndpointSettings{+ "bridge": {},+ "arcane-internal": {},+ },+ },+ })++ require.Equal(t, "arcane-internal", mode)+ })++ t.Run("falls back to bridge when no custom network is attached", func(t *testing.T) {+ mode := selectTrivyAutoNetworkModeInternal(&containertypes.InspectResponse{+ HostConfig: &containertypes.HostConfig{NetworkMode: "bridge"},+ NetworkSettings: &containertypes.NetworkSettings{+ Networks: map[string]*networktypes.EndpointSettings{+ "bridge": {},+ },+ },+ })++ require.Equal(t, "bridge", mode)+ })+}+func TestIsSynologyDockerHostInternal(t *testing.T) {// DS220+ (Kernel 4.x): single-linerequire.True(t, isSynologyDockerHostInternal("Synology NAS"))diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex ca8b0b190..3d1111578 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1012,7 +1012,9 @@"security_trivy_image_note": "Note: This must be a Trivy image (for example, ghcr.io/aquasecurity/trivy:latest).","security_trivy_network_label": "Trivy Network","security_trivy_network_description": "Docker network mode/network name used for Trivy scan containers.",- "security_trivy_network_help": "Default is bridge. Use host, none, or a custom Docker network with internet access if needed.",+ "security_trivy_network_help": "Leave this on Auto to inherit Arcane's network. Choose host, none, bridge, or a custom Docker network only when you need to override it.",+ "security_trivy_network_auto_label": "Auto",+ "security_trivy_network_auto_description": "Inherit Arcane's network","security_trivy_network_current_value_note": "Current configured value","security_trivy_security_opts_label": "Trivy Security Options","security_trivy_security_opts_description": "Docker security options applied to Trivy scan containers.",diff --git a/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte b/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelteindex 031e96217..4e070b9ba 100644--- a/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte+++ b/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte@@ -15,7 +15,7 @@import { debounced } from '$lib/utils/utils';import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';import { tick } from 'svelte';- import { EnvironmentsIcon, RemoteEnvironmentIcon, AddIcon, SearchIcon, CloseIcon } from '$lib/icons';+ import { EnvironmentsIcon, RemoteEnvironmentIcon, AddIcon, SearchIcon, CloseIcon, SettingsIcon } from '$lib/icons';import { useQueryClient } from '@tanstack/svelte-query';type Props = {@@ -225,6 +225,11 @@}}+ function handleOpenSettings(env: Environment) {+ closeDialog();+ goto(`/environments/${env.id}`);+ }+function getConnectionString(env: Environment): string {if (env.id === '0') {const host = $settingsStore ? $settingsStore.dockerHost : 'unix:///var/run/docker.sock';@@ -281,39 +286,60 @@{#each environments as env (env.id)}{@const isActive = environmentStore.selected?.id === env.id}{@const isDisabled = !env.enabled}- <button- type="button"- onclick={() => !isActive && !isDisabled && handleSelect(env)}- disabled={isDisabled}+ <divclass={cn(- 'flex w-full items-center gap-3 rounded-lg p-3 text-left transition-colors',- isActive && 'bg-primary/10 border-primary border font-medium',+ 'flex items-center gap-2 rounded-lg border p-1 transition-colors',+ isActive && 'bg-primary/10 border-primary font-medium',!isActive && !isDisabled && 'hover:bg-muted/50',- isDisabled && 'cursor-not-allowed opacity-50'+ !isActive && isDisabled && 'opacity-50')}>- <div+ <button+ type="button"+ onclick={() => !isActive && !isDisabled && handleSelect(env)}+ disabled={isDisabled}class={cn(- 'flex size-8 shrink-0 items-center justify-center rounded-md border',- isActive ? 'bg-primary border-primary' : 'border-border'+ 'flex min-w-0 flex-1 items-center gap-3 rounded-md p-2 text-left',+ isDisabled && 'cursor-not-allowed')}>- {#if env.id === '0'}- <EnvironmentsIcon class={cn('size-4', isActive && 'text-primary-foreground')} />- {:else}- <RemoteEnvironmentIcon class={cn('size-4', isActive && 'text-primary-foreground')} />+ <div+ class={cn(+ 'flex size-8 shrink-0 items-center justify-center rounded-md border',+ isActive ? 'bg-primary border-primary' : 'border-border'+ )}+ >+ {#if env.id === '0'}+ <EnvironmentsIcon class={cn('size-4', isActive && 'text-primary-foreground')} />+ {:else}+ <RemoteEnvironmentIcon class={cn('size-4', isActive && 'text-primary-foreground')} />+ {/if}+ </div>+ <div class="flex min-w-0 flex-1 flex-col">+ <span class="truncate">{env.name}</span>+ <span class={cn('truncate text-xs', isActive ? 'text-primary/70' : 'text-muted-foreground')}>+ {getConnectionString(env)}+ </span>+ </div>+ </button>+ <div class="flex shrink-0 items-center gap-2 pr-2">+ {#if isActive}+ <span class="text-primary hidden text-xs font-medium sm:inline">+ {m.environments_current_environment()}+ </span>{/if}+ <ArcaneButton+ action="base"+ tone="ghost"+ size="icon"+ class="size-8"+ icon={SettingsIcon}+ showLabel={false}+ customLabel={m.settings_title()}+ onclick={() => handleOpenSettings(env)}+ /></div>- <div class="flex min-w-0 flex-1 flex-col">- <span class="truncate">{env.name}</span>- <span class={cn('truncate text-xs', isActive ? 'text-primary/70' : 'text-muted-foreground')}>- {getConnectionString(env)}- </span>- </div>- {#if isActive}- <span class="text-primary text-xs font-medium">{m.environments_current_environment()}</span>- {/if}- </button>+ </div>{/each}{#if isLoadingMore}diff --git a/frontend/src/lib/components/settings/trivy-security-settings.svelte b/frontend/src/lib/components/settings/trivy-security-settings.sveltenew file mode 100644index 000000000..391382655--- /dev/null+++ b/frontend/src/lib/components/settings/trivy-security-settings.svelte@@ -0,0 +1,293 @@+<script lang="ts">+ import { onMount } from 'svelte';+ import * as Card from '$lib/components/ui/card/index.js';+ import { Label } from '$lib/components/ui/label';+ import { Switch } from '$lib/components/ui/switch/index.js';+ import { Textarea } from '$lib/components/ui/textarea/index.js';+ import * as Alert from '$lib/components/ui/alert';+ import SearchableSelect from '$lib/components/form/searchable-select.svelte';+ import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';+ import { SecurityIcon, InfoIcon } from '$lib/icons';+ import { m } from '$lib/paraglide/messages';+ import { toast } from 'svelte-sonner';+ import { networkService } from '$lib/services/network-service';+ import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';+ import type { Readable } from 'svelte/store';++ type TrivySecurityFormValues = {+ trivyImage: string;+ trivyNetwork: string;+ trivySecurityOpts: string;+ trivyPrivileged: boolean;+ trivyPreserveCacheOnVolumePrune: boolean;+ trivyResourceLimitsEnabled: boolean;+ trivyCpuLimit: number;+ trivyMemoryLimitMb: number;+ trivyConcurrentScanContainers: number;+ };++ type FormField<T> = {+ value: T;+ error: string | null;+ };++ type TrivySecurityFormInputs = Readable<+ Record<string, FormField<unknown>> & {+ [K in keyof TrivySecurityFormValues]: FormField<TrivySecurityFormValues[K]>;+ }+ >;++ let {+ formInputs,+ environmentId = undefined+ }: {+ formInputs: TrivySecurityFormInputs;+ environmentId?: string;+ } = $props();++ type TrivyNetworkOption = {+ value: string;+ label: string;+ description?: string;+ };++ const baseTrivyNetworkOptions: TrivyNetworkOption[] = [+ {+ value: '',+ label: m.security_trivy_network_auto_label(),+ description: m.security_trivy_network_auto_description()+ },+ { value: 'bridge', label: 'bridge' },+ { value: 'host', label: 'host' },+ { value: 'none', label: 'none' }+ ];++ let customTrivyNetworkOptions = $state<TrivyNetworkOption[]>([]);++ const trivyNetworkOptions = $derived.by(() => {+ const options = [...baseTrivyNetworkOptions];++ for (const option of customTrivyNetworkOptions) {+ if (!options.some((existing) => existing.value === option.value)) {+ options.push(option);+ }+ }++ const selectedNetwork = ($formInputs.trivyNetwork.value || '').trim();+ if (selectedNetwork && !options.some((option) => option.value === selectedNetwork)) {+ options.push({+ value: selectedNetwork,+ label: selectedNetwork,+ description: m.security_trivy_network_current_value_note()+ });+ }++ return options;+ });++ async function loadTrivyNetworkOptions() {+ try {+ const request: SearchPaginationSortRequest = {+ pagination: {+ page: 1,+ limit: 1000+ },+ sort: {+ column: 'name',+ direction: 'asc'+ }+ };+ const response = environmentId+ ? await networkService.getNetworksForEnvironment(environmentId, request)+ : await networkService.getNetworks(request);++ const networkNames = [+ ...new Set(+ response.data+ .map((network) => network.name)+ .filter((name) => !!name && !baseTrivyNetworkOptions.some((option) => option.value === name))+ )+ ].sort((a, b) => a.localeCompare(b));++ customTrivyNetworkOptions = networkNames.map((name) => ({+ value: name,+ label: name+ }));+ } catch (error) {+ console.warn('Failed to load Trivy network options:', error);+ toast.info(m.security_trivy_network_fetch_failed());+ }+ }++ function handleTrivyResourceLimitsChange(checked: boolean) {+ $formInputs.trivyResourceLimitsEnabled.value = checked;+ if (!checked) {+ $formInputs.trivyCpuLimit.value = 0;+ $formInputs.trivyMemoryLimitMb.value = 0;+ }+ }++ onMount(() => {+ void loadTrivyNetworkOptions();+ });+</script>++<Card.Root class="flex flex-col">+ <Card.Header icon={SecurityIcon}>+ <div class="flex flex-col space-y-1.5">+ <Card.Title>+ <h2>{m.security_vulnerability_scanning_heading()}</h2>+ </Card.Title>+ </div>+ </Card.Header>+ <Card.Content class="space-y-6 p-4">+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">+ <div>+ <Label class="text-base">{m.security_trivy_image_label()}</Label>+ <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_image_description()}</p>+ <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_image_note()}</p>+ </div>+ <div class="max-w-xs">+ <TextInputWithLabel+ bind:value={$formInputs.trivyImage.value}+ error={$formInputs.trivyImage.error}+ label={m.security_trivy_image_label()}+ placeholder="ghcr.io/aquasecurity/trivy:latest"+ type="text"+ />+ </div>+ </div>++ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">+ <div>+ <Label class="text-base">{m.security_trivy_network_label()}</Label>+ <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_network_description()}</p>+ <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_network_help()}</p>+ </div>+ <div class="max-w-xs">+ <SearchableSelect+ triggerId="trivyNetwork"+ items={trivyNetworkOptions.map((option) => ({+ value: option.value,+ label: option.label,+ hint: option.description+ }))}+ bind:value={$formInputs.trivyNetwork.value}+ onSelect={(value) => ($formInputs.trivyNetwork.value = value)}+ placeholder={false}+ class="w-full justify-between"+ />+ {#if $formInputs.trivyNetwork.error}+ <p class="text-destructive mt-2 text-sm">{$formInputs.trivyNetwork.error}</p>+ {/if}+ </div>+ </div>++ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">+ <div>+ <Label class="text-base">{m.security_trivy_security_opts_label()}</Label>+ <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_security_opts_description()}</p>+ <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_security_opts_help()}</p>+ </div>+ <div class="space-y-2">+ <Textarea+ bind:value={$formInputs.trivySecurityOpts.value}+ aria-label={m.security_trivy_security_opts_label()}+ class="min-h-28 font-mono text-sm"+ placeholder={m.security_trivy_security_opts_placeholder()}+ rows={4}+ />+ {#if $formInputs.trivySecurityOpts.error}+ <p class="text-destructive text-sm">{$formInputs.trivySecurityOpts.error}</p>+ {/if}+ </div>+ </div>++ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">+ <div>+ <Label class="text-base">{m.security_trivy_privileged_label()}</Label>+ <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_privileged_description()}</p>+ <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_privileged_note()}</p>+ </div>+ <div class="space-y-3">+ <div class="flex items-center gap-2">+ <Switch id="trivyPrivilegedSwitch" bind:checked={$formInputs.trivyPrivileged.value} />+ <Label for="trivyPrivilegedSwitch" class="font-normal">+ {$formInputs.trivyPrivileged.value ? m.common_enabled() : m.common_disabled()}+ </Label>+ </div>+ {#if $formInputs.trivyPrivileged.value}+ <Alert.Root variant="default" class="border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-950">+ <InfoIcon class="h-4 w-4 text-amber-900 dark:text-amber-100" />+ <Alert.Description class="text-amber-800 dark:text-amber-200">+ {m.security_trivy_privileged_note()}+ </Alert.Description>+ </Alert.Root>+ {/if}+ </div>+ </div>++ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">+ <div>+ <Label class="text-base">{m.security_trivy_preserve_cache_on_volume_prune_label()}</Label>+ <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_preserve_cache_on_volume_prune_description()}</p>+ <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_preserve_cache_on_volume_prune_note()}</p>+ </div>+ <div class="space-y-3">+ <div class="flex items-center gap-2">+ <Switch id="trivyPreserveCacheOnVolumePruneSwitch" bind:checked={$formInputs.trivyPreserveCacheOnVolumePrune.value} />+ <Label for="trivyPreserveCacheOnVolumePruneSwitch" class="font-normal">+ {$formInputs.trivyPreserveCacheOnVolumePrune.value ? m.common_enabled() : m.common_disabled()}+ </Label>+ </div>+ </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 class="max-w-xs pt-2">+ <TextInputWithLabel+ bind:value={$formInputs.trivyConcurrentScanContainers.value}+ error={$formInputs.trivyConcurrentScanContainers.error}+ label={m.security_trivy_concurrent_scan_containers_label()}+ helpText={m.security_trivy_concurrent_scan_containers_help()}+ type="number"+ />+ </div>+ </div>+ </div>+ </Card.Content>+</Card.Root>diff --git a/frontend/src/lib/config/navigation-config.ts b/frontend/src/lib/config/navigation-config.tsindex 1f6544290..217fd11c2 100644--- a/frontend/src/lib/config/navigation-config.ts+++ b/frontend/src/lib/config/navigation-config.ts@@ -3,7 +3,6 @@ import {ApperanceIcon,JobsIcon,UsersIcon,- SecurityIcon,LockIcon,NotificationsIcon,DashboardIcon,@@ -73,7 +72,6 @@ export const navigationItems: Record<string, NavigationItem[]> = {icon: NotificationsIcon,shortcut: ['mod', 'shift', '4']},- { title: m.security_title(), url: '/settings/security', icon: SecurityIcon, shortcut: ['mod', 'shift', '5'] },{ title: m.builds(), url: '/settings/builds', icon: HammerIcon, shortcut: ['mod', 'shift', '6'] },{ title: m.timeouts_settings(), url: '/settings/timeouts', icon: JobsIcon, shortcut: ['mod', 'shift', '7'] },{ title: m.users_title(), url: '/settings/users', icon: UsersIcon, shortcut: ['mod', 'shift', '8'] }diff --git a/frontend/src/lib/utils/settings-form.util.ts b/frontend/src/lib/utils/settings-form.util.tsindex 807f3f9b0..336910ee5 100644--- a/frontend/src/lib/utils/settings-form.util.ts+++ b/frontend/src/lib/utils/settings-form.util.ts@@ -4,8 +4,8 @@ import { UseSettingsForm } from '$lib/hooks/use-settings-form.svelte';import { toast } from 'svelte-sonner';import type { Settings } from '$lib/types/settings.type';-type FormInput<T> = { value: T; error: string | null };-type FormInputs<T> = { [K in keyof T]: FormInput<T[K]> };+export type FormInput<T> = { value: T; error: string | null };+export type FormInputs<T> = { [K in keyof T]: FormInput<T[K]> };type SettingsPayload = Partial<Settings> & Record<string, unknown>;export interface SettingsFormConfig<T extends z.ZodType<SettingsPayload, any>> {diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelteindex a69bdad24..60b967e67 100644--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte@@ -22,6 +22,7 @@import DockerTab from './components/DockerTab.svelte';import JobsTab from './components/JobsTab.svelte';import AgentTab from './components/AgentTab.svelte';+ import TrivySecuritySettings from '$lib/components/settings/trivy-security-settings.svelte';import {ArrowLeftIcon,EnvironmentsIcon,@@ -29,6 +30,7 @@RefreshIcon,ApiKeyIcon,DockerBrandIcon,+ SecurityIcon,SettingsIcon,GitBranchIcon,JobsIcon@@ -63,6 +65,11 @@label: m.environments_docker_settings_title(),icon: DockerBrandIcon},+ {+ value: 'security',+ label: m.security_title(),+ icon: SecurityIcon+ },{value: 'jobs',label: m.jobs_title(),@@ -156,6 +163,15 @@scheduledPruneNetworks: z.boolean(),scheduledPruneBuildCache: z.boolean(),vulnerabilityScanEnabled: z.boolean(),+ trivyImage: z.string(),+ trivyNetwork: z.string(),+ trivySecurityOpts: z.string(),+ trivyPrivileged: z.boolean(),+ trivyPreserveCacheOnVolumePrune: z.boolean(),+ trivyResourceLimitsEnabled: z.boolean(),+ trivyCpuLimit: z.coerce.number().int(m.security_session_timeout_integer()).nonnegative(),+ trivyMemoryLimitMb: z.coerce.number().int().nonnegative(),+ trivyConcurrentScanContainers: z.coerce.number().int().min(1, m.security_trivy_concurrent_scan_containers_min()),autoUpdateExcludedContainers: z.string(),autoHealEnabled: z.boolean(),autoHealExcludedContainers: z.string(),@@ -185,6 +201,15 @@scheduledPruneNetworks: settings?.scheduledPruneNetworks ?? true,scheduledPruneBuildCache: settings?.scheduledPruneBuildCache ?? false,vulnerabilityScanEnabled: settings?.vulnerabilityScanEnabled ?? false,+ trivyImage: settings?.trivyImage || '',+ trivyNetwork: settings?.trivyNetwork || '',+ trivySecurityOpts: settings?.trivySecurityOpts || '',+ trivyPrivileged: settings?.trivyPrivileged ?? false,+ trivyPreserveCacheOnVolumePrune: settings?.trivyPreserveCacheOnVolumePrune ?? true,+ trivyResourceLimitsEnabled: settings?.trivyResourceLimitsEnabled ?? true,+ trivyCpuLimit: settings?.trivyCpuLimit ?? 1,+ trivyMemoryLimitMb: settings?.trivyMemoryLimitMb ?? 0,+ trivyConcurrentScanContainers: settings?.trivyConcurrentScanContainers ?? 1,autoUpdateExcludedContainers: settings?.autoUpdateExcludedContainers || '',autoHealEnabled: settings?.autoHealEnabled ?? false,autoHealExcludedContainers: settings?.autoHealExcludedContainers || '',@@ -221,6 +246,15 @@scheduledPruneNetworks: formData.scheduledPruneNetworks,scheduledPruneBuildCache: formData.scheduledPruneBuildCache,vulnerabilityScanEnabled: formData.vulnerabilityScanEnabled,+ trivyImage: formData.trivyImage,+ trivyNetwork: formData.trivyNetwork,+ trivySecurityOpts: formData.trivySecurityOpts,+ trivyPrivileged: formData.trivyPrivileged,+ trivyPreserveCacheOnVolumePrune: formData.trivyPreserveCacheOnVolumePrune,+ trivyResourceLimitsEnabled: formData.trivyResourceLimitsEnabled,+ trivyCpuLimit: formData.trivyResourceLimitsEnabled ? formData.trivyCpuLimit : 0,+ trivyMemoryLimitMb: formData.trivyResourceLimitsEnabled ? formData.trivyMemoryLimitMb : 0,+ trivyConcurrentScanContainers: formData.trivyConcurrentScanContainers,autoUpdateExcludedContainers: formData.autoUpdateExcludedContainers,autoHealEnabled: formData.autoHealEnabled,autoHealExcludedContainers: formData.autoHealExcludedContainers,@@ -542,6 +576,10 @@/></Tabs.Content>+ <Tabs.Content value="security">+ <TrivySecuritySettings {formInputs} environmentId={environment.id} />+ </Tabs.Content>+<Tabs.Content value="jobs"><JobsTab {formInputs} environmentId={environment.id} /></Tabs.Content>diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelteindex 2658a19ec..c5f4fcb2b 100644--- a/frontend/src/routes/(app)/settings/+page.svelte+++ b/frontend/src/routes/(app)/settings/+page.svelte@@ -32,6 +32,7 @@let isSearching = $state(false);let settingsCategories = $state<SettingsCategory[]>([]);let currentSearchRequest = $state(0);+ const hiddenCategoryUrls = new Set(['/settings/security']);const iconMap: Record<string, any> = {settings: SettingsIcon,@@ -48,7 +49,7 @@onMount(async () => {try {- settingsCategories = await settingsSearchService.getCategories();+ settingsCategories = sortCategories((await settingsSearchService.getCategories()).filter(isVisibleCategory));} catch (error) {console.error('Failed to load categories:', error);}@@ -73,7 +74,7 @@try {const response = await settingsSearchService.search(trimmedQuery);if (requestId === currentSearchRequest) {- searchResults = response.results || [];+ searchResults = sortCategories((response.results || []).filter(isVisibleCategory));isSearching = false;}} catch (error) {@@ -93,6 +94,14 @@goto(categoryUrl);}+ function isVisibleCategory(category: SettingsCategory) {+ return !hiddenCategoryUrls.has(category.url);+ }++ function sortCategories(categories: SettingsCategory[]) {+ return [...categories].sort((a, b) => a.title.localeCompare(b.title));+ }+function clearSearch() {searchQuery = '';showSearchResults = false;diff --git a/frontend/src/routes/(app)/settings/security/+page.svelte b/frontend/src/routes/(app)/settings/security/+page.sveltedeleted file mode 100644index 4e9194af0..000000000--- a/frontend/src/routes/(app)/settings/security/+page.svelte+++ /dev/null@@ -1,364 +0,0 @@-<script lang="ts">- import { z } from 'zod/v4';- import { getContext, onMount } from 'svelte';- import { Label } from '$lib/components/ui/label';- import { Switch } from '$lib/components/ui/switch/index.js';- import { Textarea } from '$lib/components/ui/textarea/index.js';- import { toast } from 'svelte-sonner';- import type { PageData } from './$types';- import type { Settings } from '$lib/types/settings.type';- import { m } from '$lib/paraglide/messages';- import { SecurityIcon, InfoIcon } from '$lib/icons';- import SearchableSelect from '$lib/components/form/searchable-select.svelte';- import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';- import settingsStore from '$lib/stores/config-store';- import { SettingsPageLayout } from '$lib/layouts';- import { createSettingsForm } from '$lib/utils/settings-form.util';- import * as Alert from '$lib/components/ui/alert';- import { networkService } from '$lib/services/network-service';-- let { data }: { data: PageData } = $props();- const currentSettings = $derived<Settings>($settingsStore || data.settings!);- const isReadOnly = $derived.by(() => $settingsStore.uiConfigDisabled);-- const formSchema = z.object({- trivyImage: z.string(),- trivyNetwork: z.string(),- trivySecurityOpts: z.string(),- trivyPrivileged: z.boolean(),- trivyPreserveCacheOnVolumePrune: z.boolean(),- trivyResourceLimitsEnabled: z.boolean(),- trivyCpuLimit: z.coerce.number().int(m.security_session_timeout_integer()).nonnegative(),- trivyMemoryLimitMb: z.coerce.number().int().nonnegative(),- trivyConcurrentScanContainers: z.coerce.number().int().min(1, m.security_trivy_concurrent_scan_containers_min())- });-- const formDefaults = $derived({- trivyImage: currentSettings.trivyImage,- trivyNetwork: currentSettings.trivyNetwork || 'bridge',- trivySecurityOpts: currentSettings.trivySecurityOpts || '',- trivyPrivileged: currentSettings.trivyPrivileged ?? false,- trivyPreserveCacheOnVolumePrune: currentSettings.trivyPreserveCacheOnVolumePrune ?? true,- trivyResourceLimitsEnabled: currentSettings.trivyResourceLimitsEnabled ?? true,- trivyCpuLimit: currentSettings.trivyCpuLimit ?? 1,- trivyMemoryLimitMb: currentSettings.trivyMemoryLimitMb ?? 0,- trivyConcurrentScanContainers: currentSettings.trivyConcurrentScanContainers ?? 1- });-- let { formInputs, form, settingsForm } = $derived(- createSettingsForm({- schema: formSchema,- currentSettings: formDefaults,- getCurrentSettings: () => ({- trivyImage: ($settingsStore || data.settings!).trivyImage,- trivyNetwork: ($settingsStore || data.settings!).trivyNetwork || 'bridge',- trivySecurityOpts: ($settingsStore || data.settings!).trivySecurityOpts || '',- trivyPrivileged: ($settingsStore || data.settings!).trivyPrivileged ?? false,- trivyPreserveCacheOnVolumePrune: ($settingsStore || data.settings!).trivyPreserveCacheOnVolumePrune ?? true,- trivyResourceLimitsEnabled: ($settingsStore || data.settings!).trivyResourceLimitsEnabled ?? true,- trivyCpuLimit: ($settingsStore || data.settings!).trivyCpuLimit ?? 1,- trivyMemoryLimitMb: ($settingsStore || data.settings!).trivyMemoryLimitMb ?? 0,- trivyConcurrentScanContainers: ($settingsStore || data.settings!).trivyConcurrentScanContainers ?? 1- }),- successMessage: m.security_settings_saved()- })- );-- const hasSecurityChanges = $derived(- $formInputs.trivyImage.value !== currentSettings.trivyImage ||- $formInputs.trivyNetwork.value !== (currentSettings.trivyNetwork || 'bridge') ||- $formInputs.trivySecurityOpts.value !== (currentSettings.trivySecurityOpts || '') ||- $formInputs.trivyPrivileged.value !== (currentSettings.trivyPrivileged ?? false) ||- $formInputs.trivyPreserveCacheOnVolumePrune.value !== (currentSettings.trivyPreserveCacheOnVolumePrune ?? true) ||- $formInputs.trivyResourceLimitsEnabled.value !== (currentSettings.trivyResourceLimitsEnabled ?? true) ||- $formInputs.trivyCpuLimit.value !== (currentSettings.trivyCpuLimit ?? 1) ||- $formInputs.trivyMemoryLimitMb.value !== (currentSettings.trivyMemoryLimitMb ?? 0) ||- $formInputs.trivyConcurrentScanContainers.value !== (currentSettings.trivyConcurrentScanContainers ?? 1)- );-- const baseTrivyNetworkOptions = [- { value: 'bridge', label: 'bridge' },- { value: 'host', label: 'host' },- { value: 'none', label: 'none' }- ];- let customTrivyNetworkOptions = $state<{ value: string; label: string; description?: string }[]>([]);-- const trivyNetworkOptions = $derived.by(() => {- const options = new Map<string, { value: string; label: string; description?: string }>();- for (const option of baseTrivyNetworkOptions) {- options.set(option.value, option);- }- for (const option of customTrivyNetworkOptions) {- options.set(option.value, option);- }-- const selectedNetwork = ($formInputs.trivyNetwork.value || '').trim();- if (selectedNetwork && !options.has(selectedNetwork)) {- options.set(selectedNetwork, {- value: selectedNetwork,- label: selectedNetwork,- description: m.security_trivy_network_current_value_note()- });- }-- return [...options.values()];- });-- async function loadTrivyNetworkOptions() {- try {- const response = await networkService.getNetworks({- pagination: {- page: 1,- limit: 1000- },- sort: {- column: 'name',- direction: 'asc'- }- });-- const networkNames = [- ...new Set(- response.data- .map((network) => network.name)- .filter((name) => !!name && !baseTrivyNetworkOptions.some((option) => option.value === name))- )- ].sort((a, b) => a.localeCompare(b));-- customTrivyNetworkOptions = networkNames.map((name) => ({- value: name,- label: name- }));- } catch (error) {- console.warn('Failed to load Trivy network options:', error);- toast.info(m.security_trivy_network_fetch_failed());- }- }-- async function customSubmit() {- const formData = form.validate();- if (!formData) {- toast.error(m.security_form_validation_error());- return;- }-- const trivyCpuLimit = formData.trivyResourceLimitsEnabled ? formData.trivyCpuLimit : 0;- const trivyMemoryLimitMb = formData.trivyResourceLimitsEnabled ? formData.trivyMemoryLimitMb : 0;-- settingsForm.setLoading(true);-- try {- await settingsForm.updateSettings({- trivyImage: formData.trivyImage,- trivyNetwork: formData.trivyNetwork,- trivySecurityOpts: formData.trivySecurityOpts,- trivyPrivileged: formData.trivyPrivileged,- trivyPreserveCacheOnVolumePrune: formData.trivyPreserveCacheOnVolumePrune,- trivyResourceLimitsEnabled: formData.trivyResourceLimitsEnabled,- trivyCpuLimit,- trivyMemoryLimitMb,- trivyConcurrentScanContainers: formData.trivyConcurrentScanContainers- });- toast.success(m.security_settings_saved());- } catch (error: any) {- console.error('Failed to save settings:', error);- toast.error(m.security_settings_save_failed());- } finally {- settingsForm.setLoading(false);- }- }-- function customReset() {- form.reset();- }-- function handleTrivyResourceLimitsChange(checked: boolean) {- $formInputs.trivyResourceLimitsEnabled.value = checked;- if (!checked) {- $formInputs.trivyCpuLimit.value = 0;- $formInputs.trivyMemoryLimitMb.value = 0;- }- }-- onMount(() => {- void loadTrivyNetworkOptions();- });-- $effect(() => {- settingsForm.registerFormActions(customSubmit, customReset);- const formState = getContext('settingsFormState') as any;- if (formState) {- formState.hasChanges = hasSecurityChanges;- }- });-</script>--<SettingsPageLayout- title={m.security_title()}- description={m.security_description()}- icon={SecurityIcon}- pageType="form"- showReadOnlyTag={isReadOnly}->- {#snippet mainContent()}- <fieldset disabled={isReadOnly} class="relative space-y-8">- <div class="space-y-4">- <h3 class="text-lg font-medium">{m.security_vulnerability_scanning_heading()}</h3>- <div class="bg-card rounded-lg border shadow-sm">- <div class="space-y-6 p-6">- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">- <div>- <Label class="text-base">{m.security_trivy_image_label()}</Label>- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_image_description()}</p>- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_image_note()}</p>- </div>- <div class="max-w-xs">- <TextInputWithLabel- bind:value={$formInputs.trivyImage.value}- error={$formInputs.trivyImage.error}- label={m.security_trivy_image_label()}- placeholder="ghcr.io/aquasecurity/trivy:latest"- type="text"- />- </div>- </div>-- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">- <div>- <Label class="text-base">{m.security_trivy_network_label()}</Label>- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_network_description()}</p>- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_network_help()}</p>- </div>- <div class="max-w-xs">- <SearchableSelect- triggerId="trivyNetwork"- items={trivyNetworkOptions.map((option) => ({- value: option.value,- label: option.label,- hint: option.description- }))}- bind:value={$formInputs.trivyNetwork.value}- onSelect={(value) => ($formInputs.trivyNetwork.value = value)}- class="w-full justify-between"- />- {#if $formInputs.trivyNetwork.error}- <p class="text-destructive mt-2 text-sm">{$formInputs.trivyNetwork.error}</p>- {/if}- </div>- </div>-- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">- <div>- <Label class="text-base">{m.security_trivy_security_opts_label()}</Label>- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_security_opts_description()}</p>- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_security_opts_help()}</p>- </div>- <div class="space-y-2">- <Textarea- bind:value={$formInputs.trivySecurityOpts.value}- aria-label={m.security_trivy_security_opts_label()}- class="min-h-28 font-mono text-sm"- placeholder={m.security_trivy_security_opts_placeholder()}- rows={4}- />- {#if $formInputs.trivySecurityOpts.error}- <p class="text-destructive text-sm">{$formInputs.trivySecurityOpts.error}</p>- {/if}- </div>- </div>-- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">- <div>- <Label class="text-base">{m.security_trivy_privileged_label()}</Label>- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_privileged_description()}</p>- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_privileged_note()}</p>- </div>- <div class="space-y-3">- <div class="flex items-center gap-2">- <Switch id="trivyPrivilegedSwitch" bind:checked={$formInputs.trivyPrivileged.value} />- <Label for="trivyPrivilegedSwitch" class="font-normal">- {$formInputs.trivyPrivileged.value ? m.common_enabled() : m.common_disabled()}- </Label>- </div>- {#if $formInputs.trivyPrivileged.value}- <Alert.Root variant="default" class="border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-950">- <InfoIcon class="h-4 w-4 text-amber-900 dark:text-amber-100" />- <Alert.Description class="text-amber-800 dark:text-amber-200">- {m.security_trivy_privileged_note()}- </Alert.Description>- </Alert.Root>- {/if}- </div>- </div>-- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">- <div>- <Label class="text-base">{m.security_trivy_preserve_cache_on_volume_prune_label()}</Label>- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_preserve_cache_on_volume_prune_description()}</p>- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_preserve_cache_on_volume_prune_note()}</p>- </div>- <div class="space-y-3">- <div class="flex items-center gap-2">- <Switch- id="trivyPreserveCacheOnVolumePruneSwitch"- bind:checked={$formInputs.trivyPreserveCacheOnVolumePrune.value}- />- <Label for="trivyPreserveCacheOnVolumePruneSwitch" class="font-normal">- {$formInputs.trivyPreserveCacheOnVolumePrune.value ? m.common_enabled() : m.common_disabled()}- </Label>- </div>- </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 class="max-w-xs pt-2">- <TextInputWithLabel- bind:value={$formInputs.trivyConcurrentScanContainers.value}- error={$formInputs.trivyConcurrentScanContainers.error}- label={m.security_trivy_concurrent_scan_containers_label()}- helpText={m.security_trivy_concurrent_scan_containers_help()}- type="number"- />- </div>- </div>- </div>- </div>- </div>- </div>- </fieldset>- {/snippet}-</SettingsPageLayout>diff --git a/tests/spec/environment-settings.spec.ts b/tests/spec/environment-settings.spec.tsindex c8b3df59c..1d2df3cad 100644--- a/tests/spec/environment-settings.spec.ts+++ b/tests/spec/environment-settings.spec.ts@@ -67,7 +67,10 @@ async function saveAndWaitForPut(page: Page, expectedPath: string) {async function selectSettingOption(page: Page, trigger: Locator, optionText: string) {await expect(trigger).toBeVisible();await trigger.click();- const option = page.locator('[data-slot="select-item"]').filter({ hasText: optionText }).first();+ const option = page+ .locator('[data-slot="select-item"], [data-slot="command-item"]')+ .filter({ hasText: optionText })+ .first();await expect(option).toBeVisible();await option.click();}@@ -243,4 +246,50 @@ test.describe('Environment Settings UI', () => {}}});++ test('should update and save the trivy network mode including auto', async ({ page }) => {+ await openLocalEnvironment(page);+ await page.getByRole('tab', { name: 'Security', exact: true }).click();++ const trivyNetworkTrigger = page.locator('#trivyNetwork');+ await expect(trivyNetworkTrigger).toBeVisible();++ const originalValue = ((await trivyNetworkTrigger.textContent()) || '').trim();+ const updatedValue = originalValue.includes('bridge') ? 'Auto' : 'bridge';++ try {+ await selectSettingOption(page, trivyNetworkTrigger, updatedValue);+ await expect(trivyNetworkTrigger).toContainText(updatedValue);++ const saveButton = page.getByRole('button', { name: 'Save', exact: true }).first();+ await expect(saveButton).toBeEnabled();++ const responsePromise = page.waitForResponse((response) => {+ const request = response.request();+ if (request.method() !== 'PUT') return false;+ const url = new URL(response.url());+ return url.pathname === `/api/environments/${LOCAL_ENV_ID}/settings`;+ });++ await saveButton.click();+ const response = await responsePromise;+ expect(response.ok()).toBeTruthy();++ const payload = response.request().postDataJSON() as Record<string, string>;+ expect(payload.trivyNetwork).toBe(updatedValue === 'Auto' ? '' : updatedValue);++ await page.reload();+ await page.getByRole('tab', { name: 'Security', exact: true }).click();+ await expect(page.locator('#trivyNetwork')).toContainText(updatedValue);+ } finally {+ if (!page.isClosed()) {+ await page.getByRole('tab', { name: 'Security', exact: true }).click();+ const currentValue = ((await page.locator('#trivyNetwork').textContent()) || '').trim();+ if (!currentValue.includes(originalValue)) {+ await selectSettingOption(page, page.locator('#trivyNetwork'), originalValue);+ await saveAndWaitForPut(page, `/api/environments/${LOCAL_ENV_ID}/settings`);+ }+ }+ }+ });});diff --git a/types/settings/settings.go b/types/settings/settings.goindex 371ff2d61..4338dbd87 100644--- a/types/settings/settings.go+++ b/types/settings/settings.go@@ -188,7 +188,7 @@ type Update struct {TrivyImage *string `json:"trivyImage,omitempty"`// TrivyNetwork sets the Docker network mode/network name for Trivy scan containers.- // Defaults to "bridge".+ // Leave empty to inherit Arcane's network automatically, with bridge as the final fallback.//// Required: falseTrivyNetwork *string `json:"trivyNetwork,omitempty"`