Skip to content

Modern Docker Management, Designed for Everyone

feat: inline container exclusion list (#1693)

Alessandroe3592974cde9
diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.go
index 9fc7864f1..f19d163be 100644
--- a/backend/internal/services/vulnerability_service.go
+++ b/backend/internal/services/vulnerability_service.go
@@ -762,58 +762,98 @@ func (s *VulnerabilityService) ScanAllImages(ctx context.Context, envID string,
return 0, 0, fmt.Errorf("failed to list images: %w", err)
}
+ containerID, cleanup, err := s.setupTrivyBatchContainer(ctx)
+ if err != nil {
+ return 0, 0, err
+ }
+ defer cleanup()
+
+ scannerVersion := s.GetTrivyVersion(ctx)
+ notificationSummary := newScheduledScanNotificationSummary()
+
+ for _, img := range images {
+ if ctx.Err() != nil {
+ return scanned, failed, ctx.Err()
+ }
+
+ switch s.scanSingleImage(ctx, containerID, img, scannerVersion, envID, user, notificationSummary) {
+ case scanStatusSuccess:
+ scanned++
+ case scanStatusFailed:
+ failed++
+ case scanStatusSkipped:
+ // no-op
+ }
+ }
+
+ s.sendScheduledVulnerabilitySummaryInternal(ctx, scanned, notificationSummary)
+
+ return scanned, failed, nil
+}
+
+type scanResultStatus int
+
+const (
+ scanStatusSkipped scanResultStatus = iota
+ scanStatusSuccess
+ scanStatusFailed
+)
+
+func (s *VulnerabilityService) setupTrivyBatchContainer(ctx context.Context) (string, func(), error) {
+ dockerClient, err := s.dockerService.GetClient()
+ if err != nil {
+ return "", nil, fmt.Errorf("failed to connect to Docker: %w", err)
+ }
+
trivyImage, err := s.ensureTrivyImageInternal(ctx)
if err != nil {
- return 0, 0, fmt.Errorf("trivy scanner not available: %w", err)
+ return "", nil, fmt.Errorf("trivy scanner not available: %w", err)
}
cacheVolume, err := s.ensureTrivyCacheVolumeInternal(ctx)
if err != nil {
- return 0, 0, fmt.Errorf("failed to ensure trivy cache volume: %w", err)
+ return "", nil, fmt.Errorf("failed to ensure trivy cache volume: %w", err)
}
- // Create a single long-running Trivy container for the entire batch.
containerID, err := s.createBatchTrivyContainer(ctx, trivyImage, cacheVolume)
if err != nil {
- return 0, 0, fmt.Errorf("failed to create batch trivy container: %w", err)
+ return "", nil, fmt.Errorf("failed to create batch trivy container: %w", err)
}
- defer func() {
+
+ cleanup := func() {
cleanupCtx := context.WithoutCancel(ctx)
if rmErr := dockerClient.ContainerRemove(cleanupCtx, containerID, containertypes.RemoveOptions{Force: true}); rmErr != nil {
slog.WarnContext(cleanupCtx, "failed to remove batch trivy container", "containerId", containerID, "error", rmErr)
}
- }()
-
- scannerVersion := s.GetTrivyVersion(ctx)
- notificationSummary := newScheduledScanNotificationSummary()
-
- for _, img := range images {
- if ctx.Err() != nil {
- return scanned, failed, ctx.Err()
- }
+ }
- imageID, imageName, shouldScan := scheduledScanImageTargetInternal(img)
- if !shouldScan {
- continue
- }
+ return containerID, cleanup, nil
+}
- slog.InfoContext(ctx, "scheduled vulnerability scan: scanning image", "image", imageName, "imageId", imageID)
+func (s *VulnerabilityService) scanSingleImage(
+ ctx context.Context,
+ containerID string,
+ img imagetypes.Summary,
+ scannerVersion, envID string,
+ user models.User,
+ notificationSummary *scheduledScanNotificationSummary,
+) scanResultStatus {
+ imageID, imageName, shouldScan := scheduledScanImageTargetInternal(img)
+ if !shouldScan {
+ return scanStatusSkipped
+ }
- result, duration, scanErr := s.runScheduledImageScanInternal(ctx, containerID, imageName, imageID, scannerVersion)
- if scanErr != nil {
- failed++
- s.saveScheduledFailedScanInternal(ctx, envID, imageID, imageName, user, duration, scanErr)
- continue
- }
+ slog.InfoContext(ctx, "scheduled vulnerability scan: scanning image", "image", imageName, "imageId", imageID)
- scanned++
- s.saveScheduledSuccessfulScanInternal(ctx, envID, imageID, imageName, user, result, duration)
- s.collectScheduledFixableSummaryInternal(ctx, result, notificationSummary)
+ result, duration, scanErr := s.runScheduledImageScanInternal(ctx, containerID, imageName, imageID, scannerVersion)
+ if scanErr != nil {
+ s.saveScheduledFailedScanInternal(ctx, envID, imageID, imageName, user, duration, scanErr)
+ return scanStatusFailed
}
- s.sendScheduledVulnerabilitySummaryInternal(ctx, scanned, notificationSummary)
-
- return scanned, failed, nil
+ s.saveScheduledSuccessfulScanInternal(ctx, envID, imageID, imageName, user, result, duration)
+ s.collectScheduledFixableSummaryInternal(ctx, result, notificationSummary)
+ return scanStatusSuccess
}
// createBatchTrivyContainer creates a long-running Trivy container that stays
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index ee4770332..dead30c3b 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -183,6 +183,8 @@
"auto_update_select_containers": "Select containers...",
"auto_update_containers_excluded_one": "1 container excluded",
"auto_update_containers_excluded_many": "{count} containers excluded",
+ "auto_update_exclude_description": "Select containers to exclude from automatic updates.",
+ "auto_update_excluded_containers": "Excluded Containers",
"_comment_common_actions": "=== COMMON - ACTION STATES ===",
"common_action_creating": "Creating…",
"common_action_deleting": "Deleting…",
diff --git a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte
index 06b3755a3..597c4ec45 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte
@@ -9,7 +9,9 @@
import * as Card from '$lib/components/ui/card';
import { Label } from '$lib/components/ui/label';
import { Switch } from '$lib/components/ui/switch';
- import SearchableSelect from '$lib/components/form/searchable-select.svelte';
+ import { Input } from '$lib/components/ui/input';
+ import { Checkbox } from '$lib/components/ui/checkbox';
+ import * as ScrollArea from '$lib/components/ui/scroll-area';
import { JobsIcon, AlertIcon } from '$lib/icons';
import type { JobStatus, JobPrerequisite } from '$lib/types/job-schedule.type';
import type { ContainerSummaryDto } from '$lib/types/container.type';
@@ -48,12 +50,9 @@
});
const excludedContainers = new SvelteSet<string>();
+ let searchTerm = $state('');
+
- const exclusionLabel = $derived.by(() => {
- if (excludedContainers.size === 0) return m.auto_update_select_containers();
- if (excludedContainers.size === 1) return m.auto_update_containers_excluded_one();
- return m.auto_update_containers_excluded_many({ count: excludedContainers.size });
- });
$effect(() => {
const savedValue = $formInputs.autoUpdateExcludedContainers?.value || '';
@@ -142,7 +141,7 @@
return $formInputs.vulnerabilityScanEnabled.value;
default:
return undefined;
- }
+ }
}
function getContainerName(c: ContainerSummaryDto): string {
@@ -172,7 +171,7 @@
label: name,
disabled: labelExcluded,
hint: labelExcluded ? '(Label)' : undefined,
- selected: excludedContainers.has(name) || labelExcluded
+ selected: excludedContainers.has(name)
};
}
</script>
@@ -223,55 +222,74 @@
{/if}
{/snippet}
- {#if job.id === 'auto-update' && $formInputs.autoUpdate.value}
- <div class="border-border/20 space-y-3 border-t pt-3">
- <div class="space-y-1">
- <Label class="text-sm font-medium">Excluded Containers</Label>
- <p class="text-muted-foreground text-xs">Select containers to exclude from automatic updates.</p>
- </div>
+ {#if job.id === 'auto-update' && $formInputs.autoUpdate.value}
+ <div class="border-border/20 space-y-3 border-t pt-3">
+ <div class="space-y-1">
+ <Label class="text-sm font-medium">
+ {m.auto_update_excluded_containers()}
+ {#await containersPromise then containers}
+ <span class="text-muted-foreground ml-1 font-normal">
+ ({containers.filter((c) => excludedContainers.has(getContainerName(c))).length})
+ </span>
+ {/await}
+ </Label>
+ <p class="text-muted-foreground text-xs">{m.auto_update_exclude_description()}</p>
+ </div>
- {#await containersPromise}
- <SearchableSelect
- items={[]}
- displayText={exclusionLabel}
- placeholder={excludedContainers.size === 0}
- isLoading={true}
- emptyText="Loading containers..."
- size="sm"
- class="w-1/2"
- listClass="max-h-36"
- inputClass="h-8 py-1 text-sm"
- itemClass="py-1 text-sm"
- onSelect={(value) => toggleContainerExclusion(value)}
- />
- {:then containers}
- <SearchableSelect
- items={containers.map(mapContainerToItem)}
- displayText={exclusionLabel}
- placeholder={excludedContainers.size === 0}
- size="sm"
- class="w-1/2"
- listClass="max-h-36"
- inputClass="h-8 py-1 text-sm"
- itemClass="py-1 text-sm"
- onSelect={(value) => toggleContainerExclusion(value)}
- />
- {:catch error}
- <SearchableSelect
- items={[]}
- displayText={exclusionLabel}
- placeholder={excludedContainers.size === 0}
- emptyText={error.message || 'Failed to load containers'}
- size="sm"
- class="w-1/2"
- listClass="max-h-36"
- inputClass="h-8 py-1 text-sm"
- itemClass="py-1 text-sm"
- onSelect={(value) => toggleContainerExclusion(value)}
- />
- {/await}
- </div>
- {/if}
+ <div class="rounded-md border p-2">
+ <Input
+ type="search"
+ placeholder="Search containers..."
+ class="mb-2 h-8"
+ bind:value={searchTerm}
+ />
+ <ScrollArea.Root class="h-64 w-full rounded-md border p-2">
+ <div class="space-y-2">
+ {#await containersPromise}
+ <div class="flex items-center justify-center p-4">
+ <Spinner class="size-4" />
+ </div>
+ {:then containers}
+ {@const allItems = containers.map(mapContainerToItem)}
+ {@const filteredItems = searchTerm
+ ? allItems.filter(item => item.label.toLowerCase().includes(searchTerm.toLowerCase()))
+ : allItems}
+
+ {#if filteredItems.length === 0}
+ <p class="text-muted-foreground text-center text-sm py-4">
+ {m.common_no_results_found()}
+ </p>
+ {:else}
+ {#each filteredItems as container (container.value)}
+ <div class="flex items-center space-x-2">
+ <Checkbox
+ id="container-{container.value}"
+ checked={container.selected}
+ disabled={container.disabled}
+ onCheckedChange={() => toggleContainerExclusion(container.value)}
+ />
+ <Label
+ for="container-{container.value}"
+ class="text-sm font-normal {container.disabled ? 'text-muted-foreground' : ''}"
+ >
+ {container.label}
+ {#if container.hint}
+ <span class="ml-1 text-xs opacity-70">{container.hint}</span>
+ {/if}
+ </Label>
+ </div>
+ {/each}
+ {/if}
+ {:catch error}
+ <div class="text-destructive text-sm p-2">
+ {error.message || 'Failed to load containers'}
+ </div>
+ {/await}
+ </div>
+ </ScrollArea.Root>
+ </div>
+ </div>
+ {/if}
{#if job.id === 'scheduled-prune'}
{#if $formInputs.scheduledPruneEnabled.value}
diff --git a/types/settings/settings.go b/types/settings/settings.go
index bdb4d0b9a..77b4d371a 100644
--- a/types/settings/settings.go
+++ b/types/settings/settings.go
@@ -286,4 +286,9 @@ type Update struct {
//
// Required: false
ProxyRequestTimeout *string `json:"proxyRequestTimeout,omitempty"`
+
+ // AutoUpdateExcludedContainers is a comma-separated list of container names to exclude from auto-update.
+ //
+ // Required: false
+ AutoUpdateExcludedContainers *string `json:"autoUpdateExcludedContainers,omitempty"`
}