detect newer version tags for pinned images and show them as a badge with release notes
This commit is contained in:
36 files changed
+8820
-98
No files matched your search
@@ -0,0 +1,58 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { inspectContainer } from '$lib/server/docker';
|
||||
import { authorize } from '$lib/server/authorize';
|
||||
import { validateDockerIdParam } from '$lib/server/docker-validation';
|
||||
import { resolveReleaseSource } from '$lib/server/semver/release-source';
|
||||
import { resolveChangelogUrl } from '$lib/utils/changelog-url';
|
||||
import { fetchReleaseNotes } from '$lib/server/semver/release-notes';
|
||||
|
||||
/**
|
||||
* GET /api/containers/{id}/version-notes - Release notes for a newer version tag
|
||||
*
|
||||
* @openapi
|
||||
* summary: Resolve GitHub release notes for the versions a semver update-check surfaced (requires the 'view' permission)
|
||||
* path: id:string! Container ID or name (from GET /api/containers)
|
||||
* query: env:integer The target environment ID (omit for the local/default Docker host) (from GET /api/environments)
|
||||
* query: versions:string! Comma-separated version tags to fetch notes for (target + skipped), e.g. "16.3-alpine,16.4-alpine"
|
||||
* resp-200: {changelogUrl:string, source:string, notes:array<{version:string!, name:string, githubTag:string, body:string, publishedAt:string, url:string!}>!}
|
||||
* resp-200-example: {"changelogUrl":"https://github.com/go-gitea/gitea/releases","source":"go-gitea/gitea","notes":[{"version":"1.22.0","name":"v1.22.0","githubTag":"v1.22.0","body":"## Changes...","publishedAt":"2024-05-01T00:00:00Z","url":"https://github.com/go-gitea/gitea/releases/tag/v1.22.0"}]}
|
||||
* resp-403: Permission denied
|
||||
* resp-500: Failed to resolve release notes
|
||||
*/
|
||||
export const GET: RequestHandler = async ({ params, url, cookies }) => {
|
||||
const invalid = validateDockerIdParam(params.id, 'container');
|
||||
if (invalid) return invalid;
|
||||
|
||||
const auth = await authorize(cookies);
|
||||
|
||||
const envId = url.searchParams.get('env');
|
||||
const envIdNum = envId ? parseInt(envId) : undefined;
|
||||
|
||||
if (auth.authEnabled && !(await auth.can('containers', 'view', envIdNum))) {
|
||||
return json({ error: 'Permission denied' }, { status: 403 });
|
||||
}
|
||||
|
||||
const versions = (url.searchParams.get('versions') ?? '')
|
||||
.split(',')
|
||||
.map((v) => v.trim())
|
||||
.filter(Boolean);
|
||||
|
||||
try {
|
||||
const inspectData = (await inspectContainer(params.id, envIdNum)) as any;
|
||||
const imageName: string | undefined = inspectData.Config?.Image;
|
||||
const labels: Record<string, string> = inspectData.Config?.Labels ?? {};
|
||||
|
||||
const src = resolveReleaseSource(imageName, labels);
|
||||
// Prefer the label-based changelog URL; fall back to the forge's releases page.
|
||||
const changelogUrl = resolveChangelogUrl(imageName, labels) ?? src?.releasesUrl ?? null;
|
||||
|
||||
// No recognizable forge -> no per-version notes, just the changelog link (if any).
|
||||
const notes = src ? await fetchReleaseNotes(src, versions) : [];
|
||||
|
||||
return json({ changelogUrl, source: src?.slug ?? null, notes });
|
||||
} catch (error) {
|
||||
console.error('Failed to resolve version notes:', error);
|
||||
return json({ error: 'Failed to resolve release notes' }, { status: 500 });
|
||||
}
|
||||
};
|
||||
@@ -2,10 +2,12 @@ import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { authorize } from '$lib/server/authorize';
|
||||
import { listContainers, inspectContainer, checkImageUpdateAvailable } from '$lib/server/docker';
|
||||
import { clearPendingContainerUpdates, addPendingContainerUpdate, getPendingContainerUpdates } from '$lib/server/db';
|
||||
import { clearPendingContainerUpdates, addPendingContainerUpdate, getPendingContainerUpdates, getEnvUpdateCheckSettings } from '$lib/server/db';
|
||||
import { isSystemContainer, isPodmanInfraContainer } from '$lib/server/scheduler/tasks/update-utils';
|
||||
import { isUpdateDisabledByLabel, isHiddenByLabel } from '$lib/server/container-labels';
|
||||
import { createJobResponse } from '$lib/server/sse';
|
||||
import { checkNewerVersion } from '$lib/server/semver/check';
|
||||
import type { NewerVersion } from '$lib/server/semver/find-newer';
|
||||
|
||||
export interface UpdateCheckResult {
|
||||
containerId: string;
|
||||
@@ -18,12 +20,23 @@ export interface UpdateCheckResult {
|
||||
isLocalImage?: boolean;
|
||||
systemContainer?: 'dockhand' | 'hawser' | null;
|
||||
updateDisabled?: boolean;
|
||||
/** A newer VERSION tag is published for a pinned image (advisory, never auto-applied). */
|
||||
newerVersion?: NewerVersion;
|
||||
}
|
||||
|
||||
/**
|
||||
* GET = READ the cached result of the last update check (no side effects, does NOT
|
||||
* trigger a new check). Returns the containers currently flagged as having a pending
|
||||
* image update. Use POST (below) to actually run a fresh check. (issue #1266)
|
||||
*
|
||||
* @openapi
|
||||
* summary: Read the cached pending image-update records for an environment (no fresh check; requires the 'view' permission)
|
||||
* description: Returns the containers currently flagged as having a pending image update from the last check. Does not trigger a new check — use POST to run a fresh check.
|
||||
* query: env:integer The target environment ID (omit for the local/default Docker host) (from GET /api/environments)
|
||||
* resp-200: {environmentId:integer!, pendingUpdates:array<{containerId:string!, containerName:string!, currentImage:string!, checkedAt:string}>!}
|
||||
* resp-400: Environment ID required
|
||||
* resp-403: Permission denied
|
||||
* resp-500: Failed to get pending updates
|
||||
*/
|
||||
export const GET: RequestHandler = async ({ url, cookies }) => {
|
||||
const auth = await authorize(cookies);
|
||||
@@ -59,6 +72,12 @@ export const GET: RequestHandler = async ({ url, cookies }) => {
|
||||
/**
|
||||
* POST = TRIGGER a fresh update check across all containers (job-based).
|
||||
* Returns progress events during checking, final result when done.
|
||||
*
|
||||
* @openapi
|
||||
* summary: Trigger a fresh image-update check across all (non-hidden, non-podman-infra) containers in an environment
|
||||
* query: env:integer The target environment ID (omit for the local/default Docker host) (from GET /api/environments)
|
||||
* resp-200: text/event-stream job stream ("progress" events with {checked,total}, final "result" event with {total,updatesFound,results}) — or, with "Accept: application/json", the final result as plain JSON
|
||||
* resp-403: Permission denied
|
||||
*/
|
||||
export const POST: RequestHandler = async ({ url, cookies, request }) => {
|
||||
const auth = await authorize(cookies);
|
||||
@@ -87,6 +106,17 @@ export const POST: RequestHandler = async ({ url, cookies, request }) => {
|
||||
|
||||
send('progress', { checked: 0, total: containers.length });
|
||||
|
||||
// Semver "newer version tag" detection is an opt-in branch on this same pass.
|
||||
// Read the env's update-check config once; if checkPinnedVersions is on, each
|
||||
// pinned-version container is also compared against the registry's tag list.
|
||||
const envSettings = envIdNum ? await getEnvUpdateCheckSettings(envIdNum) : null;
|
||||
const semverEnabled = !!envSettings?.checkPinnedVersions;
|
||||
const semverOptions = {
|
||||
maxBump: envSettings?.semverMaxBump ?? 'major',
|
||||
matchFlavor: envSettings?.semverMatchFlavor ?? true,
|
||||
includePrerelease: envSettings?.semverIncludePrerelease ?? false
|
||||
} as const;
|
||||
|
||||
// Check container for updates
|
||||
let checked = 0;
|
||||
const checkContainer = async (container: typeof containers[0]): Promise<UpdateCheckResult> => {
|
||||
@@ -120,6 +150,12 @@ export const POST: RequestHandler = async ({ url, cookies, request }) => {
|
||||
|
||||
const result = await checkImageUpdateAvailable(imageName, currentImageId, envIdNum);
|
||||
|
||||
// Newer-version-tag detection (opt-in). Skips instantly for floating tags,
|
||||
// so it only hits the registry for pinned versions. Never throws.
|
||||
const newerVersion = semverEnabled
|
||||
? await checkNewerVersion(imageName, semverOptions).catch(() => null)
|
||||
: null;
|
||||
|
||||
return {
|
||||
containerId: container.id,
|
||||
containerName: container.name,
|
||||
@@ -130,7 +166,8 @@ export const POST: RequestHandler = async ({ url, cookies, request }) => {
|
||||
error: result.error,
|
||||
isLocalImage: result.isLocalImage,
|
||||
systemContainer: isSystemContainer(imageName) || null,
|
||||
updateDisabled
|
||||
updateDisabled,
|
||||
newerVersion: newerVersion ?? undefined
|
||||
};
|
||||
} catch (error: any) {
|
||||
return {
|
||||
@@ -160,17 +197,21 @@ export const POST: RequestHandler = async ({ url, cookies, request }) => {
|
||||
|
||||
const updatesFound = results.filter(r => r.hasUpdate && !r.systemContainer && !r.updateDisabled).length;
|
||||
|
||||
// Save containers with updates to the database for persistence
|
||||
// Persist a row for anything worth showing on reload: a digest update, a
|
||||
// newer-version-tag (semver) suggestion, or both. A pure-semver row (no
|
||||
// digest update) still persists so the badge survives a page reload.
|
||||
if (envIdNum) {
|
||||
for (const result of results) {
|
||||
if (result.hasUpdate && !result.systemContainer && !result.updateDisabled) {
|
||||
await addPendingContainerUpdate(
|
||||
envIdNum,
|
||||
result.containerId,
|
||||
result.containerName,
|
||||
result.imageName
|
||||
);
|
||||
}
|
||||
if (result.systemContainer || result.updateDisabled) continue;
|
||||
const hasImageUpdate = result.hasUpdate;
|
||||
if (!hasImageUpdate && !result.newerVersion) continue;
|
||||
await addPendingContainerUpdate(
|
||||
envIdNum,
|
||||
result.containerId,
|
||||
result.containerName,
|
||||
result.imageName,
|
||||
{ hasImageUpdate, newerVersion: result.newerVersion ?? null }
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,8 +3,24 @@ import type { RequestHandler } from './$types';
|
||||
import { authorize } from '$lib/server/authorize';
|
||||
import { getPendingContainerUpdates, removePendingContainerUpdate, clearPendingContainerUpdates } from '$lib/server/db';
|
||||
|
||||
function safeParse(json: string): unknown {
|
||||
try {
|
||||
return JSON.parse(json);
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get pending container updates for an environment.
|
||||
*
|
||||
* @openapi
|
||||
* summary: List the containers in an environment that have a pending image update recorded (requires the 'view' permission)
|
||||
* query: env:integer! The target environment ID (required) (from GET /api/environments)
|
||||
* resp-200: {environmentId:integer!, pendingUpdates:array<{containerId:string!, containerName:string!, currentImage:string!, checkedAt:string!, hasImageUpdate:boolean!, newerVersion:object}>!}
|
||||
* resp-400: Environment ID is required
|
||||
* resp-403: Permission denied
|
||||
* resp-500: Failed to get the pending updates
|
||||
*/
|
||||
export const GET: RequestHandler = async ({ url, cookies }) => {
|
||||
const auth = await authorize(cookies);
|
||||
@@ -29,7 +45,9 @@ export const GET: RequestHandler = async ({ url, cookies }) => {
|
||||
containerId: u.containerId,
|
||||
containerName: u.containerName,
|
||||
currentImage: u.currentImage,
|
||||
checkedAt: u.checkedAt
|
||||
checkedAt: u.checkedAt,
|
||||
hasImageUpdate: u.hasImageUpdate,
|
||||
newerVersion: u.newerVersion ? safeParse(u.newerVersion) : null
|
||||
}))
|
||||
});
|
||||
} catch (error: any) {
|
||||
@@ -40,6 +58,16 @@ export const GET: RequestHandler = async ({ url, cookies }) => {
|
||||
|
||||
/**
|
||||
* Remove a pending container update (e.g., after manual update).
|
||||
*
|
||||
* @openapi
|
||||
* summary: Clear pending-update records for an environment, or for a single container when containerId is given
|
||||
* query: env:integer! The target environment ID (required) (from GET /api/environments)
|
||||
* query: containerId:string The container to clear; omit to clear ALL pending updates in the environment (from GET /api/containers)
|
||||
* resp-200: {success:boolean!}
|
||||
* resp-200-example: {"success":true}
|
||||
* resp-400: Environment ID is required
|
||||
* resp-403: Permission denied
|
||||
* resp-500: Failed to remove the pending update
|
||||
*/
|
||||
export const DELETE: RequestHandler = async ({ url, cookies }) => {
|
||||
const auth = await authorize(cookies);
|
||||
|
||||
@@ -10,6 +10,15 @@ import { registerSchedule, unregisterSchedule } from '$lib/server/scheduler';
|
||||
|
||||
/**
|
||||
* Get update check settings for an environment.
|
||||
*
|
||||
* @openapi
|
||||
* summary: Get the automatic container-image update-check schedule for an environment
|
||||
* path: id:integer! Environment id (from GET /api/environments)
|
||||
* resp-200: {settings:{enabled:boolean!, cron:string!, autoUpdate:boolean!, vulnerabilityCriteria:string!}!}
|
||||
* resp-200-example: {"settings":{"enabled":false,"cron":"0 4 * * *","autoUpdate":false,"vulnerabilityCriteria":"never"}}
|
||||
* resp-403: Permission denied (RBAC 'environments:view' missing)
|
||||
* resp-404: Environment not found
|
||||
* resp-500: Unexpected error while loading the settings
|
||||
*/
|
||||
export const GET: RequestHandler = async ({ params, cookies }) => {
|
||||
const auth = await authorize(cookies);
|
||||
@@ -44,6 +53,16 @@ export const GET: RequestHandler = async ({ params, cookies }) => {
|
||||
|
||||
/**
|
||||
* Save update check settings for an environment.
|
||||
*
|
||||
* @openapi
|
||||
* summary: Save the automatic image update-check schedule for an environment (registers/unregisters the croner job)
|
||||
* path: id:integer! Environment id (from GET /api/environments)
|
||||
* body: {enabled:boolean, cron:string, autoUpdate:boolean, vulnerabilityCriteria:string, checkPinnedVersions:boolean, semverMaxBump:string, semverMatchFlavor:boolean, semverIncludePrerelease:boolean}
|
||||
* body-example: {"enabled":true,"cron":"0 4 * * *","autoUpdate":false,"vulnerabilityCriteria":"never","checkPinnedVersions":true,"semverMaxBump":"minor","semverMatchFlavor":true,"semverIncludePrerelease":false}
|
||||
* resp-200: {success:boolean!, settings:{enabled:boolean!, cron:string!, autoUpdate:boolean!, vulnerabilityCriteria:string!}!}
|
||||
* resp-403: Permission denied (RBAC 'environments:edit' missing)
|
||||
* resp-404: Environment not found
|
||||
* resp-500: Unexpected error while saving the settings
|
||||
*/
|
||||
export const POST: RequestHandler = async ({ params, request, cookies }) => {
|
||||
const auth = await authorize(cookies);
|
||||
@@ -66,7 +85,11 @@ export const POST: RequestHandler = async ({ params, request, cookies }) => {
|
||||
enabled: data.enabled ?? false,
|
||||
cron: data.cron || '0 4 * * *',
|
||||
autoUpdate: data.autoUpdate ?? false,
|
||||
vulnerabilityCriteria: data.vulnerabilityCriteria || 'never'
|
||||
vulnerabilityCriteria: data.vulnerabilityCriteria || 'never',
|
||||
checkPinnedVersions: data.checkPinnedVersions ?? false,
|
||||
semverMaxBump: data.semverMaxBump || 'major',
|
||||
semverMatchFlavor: data.semverMatchFlavor ?? true,
|
||||
semverIncludePrerelease: data.semverIncludePrerelease ?? false
|
||||
};
|
||||
|
||||
// Save settings to database
|
||||
|
||||
@@ -65,7 +65,8 @@
|
||||
Cable,
|
||||
Copy,
|
||||
Loader2,
|
||||
AlertCircle
|
||||
AlertCircle,
|
||||
Tag
|
||||
} from 'lucide-svelte';
|
||||
import { broom } from '@lucide/lab';
|
||||
import { copyToClipboard } from '$lib/utils/clipboard';
|
||||
@@ -78,6 +79,8 @@
|
||||
import BatchUpdateModal from './BatchUpdateModal.svelte';
|
||||
import CheckUpdatesButton from '$lib/components/CheckUpdatesButton.svelte';
|
||||
import BatchOperationModal from '$lib/components/BatchOperationModal.svelte';
|
||||
import VersionUpdateBadge from '$lib/components/VersionUpdateBadge.svelte';
|
||||
import VersionUpdateModal from '$lib/components/VersionUpdateModal.svelte';
|
||||
import type { ContainerInfo } from '$lib/types';
|
||||
import { EmptyState, NoEnvironment } from '$lib/components/ui/empty-state';
|
||||
import { currentEnvironment, environments, appendEnvParam, clearStaleEnvironment } from '$lib/stores/environment';
|
||||
@@ -274,6 +277,14 @@
|
||||
const batchUpdateContainerIds = $derived($containerStore.pendingUpdateIds);
|
||||
const batchUpdateContainerNames = $derived($containerStore.pendingUpdateNames);
|
||||
|
||||
// Version-update (semver) release-notes modal — opened from the Tag badge.
|
||||
let versionModalContainer = $state<ContainerInfo | null>(null);
|
||||
let versionModalNewer = $state<import('$lib/server/semver/find-newer').NewerVersion | null>(null);
|
||||
function openVersionModal(container: ContainerInfo, newer: import('$lib/server/semver/find-newer').NewerVersion) {
|
||||
versionModalContainer = container;
|
||||
versionModalNewer = newer;
|
||||
}
|
||||
|
||||
// Single container update mode (doesn't overwrite batch list)
|
||||
let singleUpdateContainerId = $state<string | null>(null);
|
||||
let singleUpdateContainerName = $state<string | null>(null);
|
||||
@@ -307,10 +318,16 @@
|
||||
// Set of container IDs with updates available (for O(1) lookup)
|
||||
const containersWithUpdatesSet = $derived(new Set(batchUpdateContainerIds));
|
||||
|
||||
// Whether any semver badges are showing (may be true with zero digest updates).
|
||||
const hasNewerVersions = $derived($containerStore.newerVersions.size > 0);
|
||||
|
||||
// Container IDs whose last update check failed (e.g. registry rate-limited) — #1255
|
||||
const containersWithFailedCheckSet = $derived(new Set($containerStore.failedUpdateIds));
|
||||
const failedUpdateErrors = $derived($containerStore.failedUpdateErrors);
|
||||
|
||||
// Newer-version-tag (semver) suggestions from the last check, keyed by container ID.
|
||||
const newerVersionsMap = $derived($containerStore.newerVersions);
|
||||
|
||||
// Filter dropdown entries: real statuses plus the synthetic
|
||||
// "update-available" entry, only offered once we know about a pending
|
||||
// update — picking it on an empty set would just empty the list (#1063).
|
||||
@@ -466,6 +483,7 @@
|
||||
function handleUpdateCheckComplete(result: {
|
||||
withUpdates: Array<{ containerId: string; containerName: string }>;
|
||||
failed?: Array<{ containerId: string; error: string }>;
|
||||
newerVersions?: Array<{ containerId: string; newerVersion: import('$lib/server/semver/find-newer').NewerVersion }>;
|
||||
}) {
|
||||
if (result.withUpdates.length === 0) {
|
||||
containerStore.setPendingUpdates([], new Map());
|
||||
@@ -483,6 +501,9 @@
|
||||
failed.map((f) => f.containerId),
|
||||
new Map(failed.map((f) => [f.containerId, f.error]))
|
||||
);
|
||||
// Newer-version-tag (semver) suggestions — advisory badge, session-only.
|
||||
const newer = result.newerVersions ?? [];
|
||||
containerStore.setNewerVersions(new Map(newer.map((n) => [n.containerId, n.newerVersion])));
|
||||
}
|
||||
|
||||
// Load pending updates from database (persisted from check-updates or scheduled jobs)
|
||||
@@ -521,6 +542,8 @@
|
||||
// Failed-check state is session-only — clear it here too so "Clear"
|
||||
// dismisses the red "check failed" icons alongside the amber ones.
|
||||
containerStore.setFailedUpdates([], new Map());
|
||||
// Newer-version (semver) badges are session-only too — dismiss them alongside.
|
||||
containerStore.setNewerVersions(new Map());
|
||||
}
|
||||
} catch {
|
||||
toast.error('Failed to clear update indicators');
|
||||
@@ -1432,6 +1455,24 @@
|
||||
{/snippet}
|
||||
</ConfirmPopover>
|
||||
{/if}
|
||||
{#if hasNewerVersions}
|
||||
<!-- Newer version tags. Shown whether or not digest updates also exist.
|
||||
Only carries its own dismiss (×) when there's no "Update all" button
|
||||
(whose × already clears both) - so we never show two dismiss controls. -->
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
class="border-amber-500/40 text-amber-600 hover:bg-amber-500/10 hover:border-amber-500"
|
||||
onclick={updatableContainersCount === 0 ? dismissPendingUpdates : undefined}
|
||||
title={updatableContainersCount === 0 ? 'Dismiss version indicators' : 'Containers running a pinned tag with a newer version published'}
|
||||
>
|
||||
<Tag class="w-3.5 h-3.5" />
|
||||
{$containerStore.newerVersions.size} newer version{$containerStore.newerVersions.size !== 1 ? 's' : ''}
|
||||
{#if updatableContainersCount === 0}
|
||||
<span class="ml-1 text-[12px] leading-none opacity-40">×</span>
|
||||
{/if}
|
||||
</Button>
|
||||
{/if}
|
||||
{#if $canAccess('containers', 'remove')}
|
||||
<ConfirmPopover
|
||||
open={confirmPrune}
|
||||
@@ -1779,6 +1820,13 @@
|
||||
</Tooltip.Content>
|
||||
</Tooltip.Root>
|
||||
{/if}
|
||||
{#if newerVersionsMap.has(container.id)}
|
||||
<VersionUpdateBadge
|
||||
newerVersion={newerVersionsMap.get(container.id)!}
|
||||
variant="pill"
|
||||
onclick={() => openVersionModal(container, newerVersionsMap.get(container.id)!)}
|
||||
/>
|
||||
{/if}
|
||||
<span class="text-xs text-muted-foreground truncate" title={container.image}>{container.image}</span>
|
||||
</div>
|
||||
{:else if column.id === 'state'}
|
||||
@@ -2442,6 +2490,12 @@
|
||||
onComplete={handleBatchUpdateComplete}
|
||||
/>
|
||||
|
||||
<VersionUpdateModal
|
||||
bind:container={versionModalContainer}
|
||||
newerVersion={versionModalNewer}
|
||||
{envId}
|
||||
/>
|
||||
|
||||
<BatchOperationModal
|
||||
bind:open={showBatchOpModal}
|
||||
title={batchOpTitle}
|
||||
|
||||
@@ -185,6 +185,7 @@
|
||||
{ id: 'auto_update_failed', label: 'Update failed', description: 'Container auto-update failed' },
|
||||
{ id: 'auto_update_blocked', label: 'Update blocked by vulns', description: 'Update blocked due to vulnerability criteria' },
|
||||
{ id: 'updates_detected', label: 'Updates detected', description: 'Container image updates are available (scheduled check)' },
|
||||
{ id: 'newer_version_available', label: 'Newer version tag', description: 'A newer version tag is published for a pinned image (semver, advisory)' },
|
||||
{ id: 'batch_update_success', label: 'Batch update completed', description: 'Scheduled container updates completed successfully' }
|
||||
]
|
||||
},
|
||||
@@ -532,6 +533,11 @@
|
||||
let updateCheckAutoUpdate = $state(false);
|
||||
let updateCheckVulnerabilityCriteria = $state<VulnerabilityCriteria>('never');
|
||||
let updateCheckLoading = $state(false);
|
||||
// Semver (newer-version-tag) detection — persisted in the same update-check JSON blob.
|
||||
let semverEnabled = $state(false);
|
||||
let semverMaxBump = $state<'patch' | 'minor' | 'major'>('major');
|
||||
let semverMatchFlavor = $state(true);
|
||||
let semverIncludePrerelease = $state(false);
|
||||
|
||||
// Image prune settings state
|
||||
let imagePruneEnabled = $state(false);
|
||||
@@ -1222,12 +1228,20 @@
|
||||
updateCheckCron = data.settings.cron || '0 4 * * *';
|
||||
updateCheckAutoUpdate = data.settings.autoUpdate ?? false;
|
||||
updateCheckVulnerabilityCriteria = data.settings.vulnerabilityCriteria || 'never';
|
||||
semverEnabled = data.settings.checkPinnedVersions ?? false;
|
||||
semverMaxBump = data.settings.semverMaxBump || 'major';
|
||||
semverMatchFlavor = data.settings.semverMatchFlavor ?? true;
|
||||
semverIncludePrerelease = data.settings.semverIncludePrerelease ?? false;
|
||||
} else {
|
||||
// No settings found - use defaults
|
||||
updateCheckEnabled = false;
|
||||
updateCheckCron = '0 4 * * *';
|
||||
updateCheckAutoUpdate = false;
|
||||
updateCheckVulnerabilityCriteria = 'never';
|
||||
semverEnabled = false;
|
||||
semverMaxBump = 'major';
|
||||
semverMatchFlavor = true;
|
||||
semverIncludePrerelease = false;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
@@ -1246,7 +1260,11 @@
|
||||
enabled: updateCheckEnabled,
|
||||
cron: updateCheckCron,
|
||||
autoUpdate: updateCheckAutoUpdate,
|
||||
vulnerabilityCriteria: updateCheckVulnerabilityCriteria
|
||||
vulnerabilityCriteria: updateCheckVulnerabilityCriteria,
|
||||
checkPinnedVersions: semverEnabled,
|
||||
semverMaxBump,
|
||||
semverMatchFlavor,
|
||||
semverIncludePrerelease
|
||||
})
|
||||
});
|
||||
} catch (error) {
|
||||
@@ -2579,6 +2597,10 @@
|
||||
bind:updateCheckAutoUpdate={updateCheckAutoUpdate}
|
||||
bind:updateCheckVulnerabilityCriteria={updateCheckVulnerabilityCriteria}
|
||||
scannerEnabled={scannerEnabled}
|
||||
bind:semverEnabled={semverEnabled}
|
||||
bind:semverMaxBump={semverMaxBump}
|
||||
bind:semverMatchFlavor={semverMatchFlavor}
|
||||
bind:semverIncludePrerelease={semverIncludePrerelease}
|
||||
imagePruneLoading={imagePruneLoading}
|
||||
bind:imagePruneEnabled={imagePruneEnabled}
|
||||
bind:imagePruneCron={imagePruneCron}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
import CronEditor from '$lib/components/cron-editor.svelte';
|
||||
import TimezoneSelector from '$lib/components/TimezoneSelector.svelte';
|
||||
import VulnerabilityCriteriaSelector, { type VulnerabilityCriteria } from '$lib/components/VulnerabilityCriteriaSelector.svelte';
|
||||
import SemverCheckConfig from '$lib/components/SemverCheckConfig.svelte';
|
||||
import { CircleFadingArrowUp, CircleArrowUp, RefreshCw, Info, Trash2 } from 'lucide-svelte';
|
||||
import { formatDateTime } from '$lib/stores/settings';
|
||||
import { formatBytes } from '$lib/utils/format';
|
||||
@@ -17,6 +18,11 @@
|
||||
updateCheckAutoUpdate: boolean;
|
||||
updateCheckVulnerabilityCriteria: VulnerabilityCriteria;
|
||||
scannerEnabled: boolean;
|
||||
// Semver (newer-version-tag) detection — rides the same update check
|
||||
semverEnabled: boolean;
|
||||
semverMaxBump: 'patch' | 'minor' | 'major';
|
||||
semverMatchFlavor: boolean;
|
||||
semverIncludePrerelease: boolean;
|
||||
// Image prune settings
|
||||
imagePruneLoading: boolean;
|
||||
imagePruneEnabled: boolean;
|
||||
@@ -35,6 +41,10 @@
|
||||
updateCheckAutoUpdate = $bindable(),
|
||||
updateCheckVulnerabilityCriteria = $bindable(),
|
||||
scannerEnabled,
|
||||
semverEnabled = $bindable(),
|
||||
semverMaxBump = $bindable(),
|
||||
semverMatchFlavor = $bindable(),
|
||||
semverIncludePrerelease = $bindable(),
|
||||
imagePruneLoading,
|
||||
imagePruneEnabled = $bindable(),
|
||||
imagePruneCron = $bindable(),
|
||||
@@ -118,6 +128,13 @@
|
||||
<span>You'll receive notifications when updates are available. Containers won't be modified.</span>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<SemverCheckConfig
|
||||
bind:enabled={semverEnabled}
|
||||
bind:maxBump={semverMaxBump}
|
||||
bind:matchFlavor={semverMatchFlavor}
|
||||
bind:includePrerelease={semverIncludePrerelease}
|
||||
/>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
import * as Tooltip from '$lib/components/ui/tooltip';
|
||||
import * as Popover from '$lib/components/ui/popover';
|
||||
import MultiSelectFilter from '$lib/components/MultiSelectFilter.svelte';
|
||||
import { Play, Square, Trash2, Plus, ArrowBigDown, Search, Pencil, ExternalLink, GitBranch, RefreshCw, Loader2, FileCode, FileText, FileOutput, Box, RotateCcw, ScrollText, Terminal, Eye, Network, HardDrive, Heart, HeartPulse, HeartOff, ChevronsUpDown, ChevronsDownUp, Rocket, AlertTriangle, X, Layers, Pause, CircleDashed, Skull, FolderOpen, Variable, Clock, RotateCw, Import, Ship, Cable, LayoutPanelLeft, Rows3, GripVertical, Globe, CircleArrowUp, NotepadText } from 'lucide-svelte';
|
||||
import { Play, Square, Trash2, Plus, ArrowBigDown, Search, Pencil, ExternalLink, GitBranch, RefreshCw, Loader2, FileCode, FileText, FileOutput, Box, RotateCcw, ScrollText, Terminal, Eye, Network, HardDrive, Heart, HeartPulse, HeartOff, ChevronsUpDown, ChevronsDownUp, Rocket, AlertTriangle, X, Layers, Pause, CircleDashed, Skull, FolderOpen, Variable, Clock, RotateCw, Import, Ship, Cable, LayoutPanelLeft, Rows3, GripVertical, Globe, CircleArrowUp, NotepadText, Tag } from 'lucide-svelte';
|
||||
import { formatPorts } from '$lib/utils/port-format';
|
||||
import { parseCustomUrl } from '$lib/utils/custom-url';
|
||||
import { extractTraefikUrls } from '$lib/utils/traefik-urls';
|
||||
@@ -24,7 +24,7 @@
|
||||
import { appSettings } from '$lib/stores/settings';
|
||||
import ConfirmPopover from '$lib/components/ConfirmPopover.svelte';
|
||||
import BatchOperationModal from '$lib/components/BatchOperationModal.svelte';
|
||||
import type { ComposeStackInfo, ContainerStats } from '$lib/types';
|
||||
import type { ComposeStackInfo, ContainerStats, StackContainer } from '$lib/types';
|
||||
import StackModal from './StackModal.svelte';
|
||||
import DeleteStackModal from './DeleteStackModal.svelte';
|
||||
import GitSourceBadge from './GitSourceBadge.svelte';
|
||||
@@ -36,6 +36,8 @@
|
||||
import FileBrowserModal from '../containers/FileBrowserModal.svelte';
|
||||
import BatchUpdateModal from '../containers/BatchUpdateModal.svelte';
|
||||
import CheckUpdatesButton from '$lib/components/CheckUpdatesButton.svelte';
|
||||
import VersionUpdateBadge from '$lib/components/VersionUpdateBadge.svelte';
|
||||
import VersionUpdateModal from '$lib/components/VersionUpdateModal.svelte';
|
||||
import LogsPanel from '../logs/LogsPanel.svelte';
|
||||
import { currentEnvironment, environments, appendEnvParam, clearStaleEnvironment } from '$lib/stores/environment';
|
||||
import { onDockerEvent, isContainerListChange } from '$lib/stores/events';
|
||||
@@ -81,6 +83,12 @@
|
||||
let showBatchUpdateModal = $state(false);
|
||||
let singleUpdateContainerId = $state<string | null>(null);
|
||||
let singleUpdateContainerName = $state<string | null>(null);
|
||||
|
||||
// Version-update (semver) release-notes modal — opened from a container's Tag badge.
|
||||
let versionModalContainer = $state<StackContainer | null>(null);
|
||||
function openVersionModal(container: StackContainer) {
|
||||
versionModalContainer = container;
|
||||
}
|
||||
let envHasScanning = $state(false);
|
||||
let envVulnerabilityCriteria = $state<'never' | 'any' | 'critical_high' | 'critical' | 'more_than_current'>('never');
|
||||
|
||||
@@ -772,7 +780,8 @@
|
||||
// True when any stack container shows an update-available (amber) or
|
||||
// check-failed (red) indicator — gates the "dismiss indicators" button.
|
||||
const hasUpdateIndicators = $derived(
|
||||
stacks.some((s) => s.updatesAvailable) || failedUpdateCheckIds.size > 0
|
||||
stacks.some((s) => s.updatesAvailable || (s.newerVersionCount ?? 0) > 0) ||
|
||||
failedUpdateCheckIds.size > 0
|
||||
);
|
||||
|
||||
// Dismiss both the amber "update available" and red "check failed" indicators.
|
||||
@@ -1766,6 +1775,17 @@
|
||||
</Tooltip.Root>
|
||||
{/if}
|
||||
{/if}
|
||||
{#if (stack.newerVersionCount ?? 0) > 0}
|
||||
<Tooltip.Root>
|
||||
<Tooltip.Trigger class="inline-flex items-center gap-0.5 self-center shrink-0 text-amber-500">
|
||||
<Tag class="w-3.5 h-3.5" />
|
||||
<span class="text-2xs font-medium leading-none">{stack.newerVersionCount}</span>
|
||||
</Tooltip.Trigger>
|
||||
<Tooltip.Content>
|
||||
{stack.newerVersionCount} container{(stack.newerVersionCount ?? 0) > 1 ? 's have' : ' has'} a newer version tag.
|
||||
</Tooltip.Content>
|
||||
</Tooltip.Root>
|
||||
{/if}
|
||||
</span>
|
||||
{:else if column.id === 'source'}
|
||||
{#if source.sourceType === 'git'}
|
||||
@@ -2202,6 +2222,13 @@
|
||||
</Tooltip.Content>
|
||||
</Tooltip.Root>
|
||||
{/if}
|
||||
{#if container.newerVersion}
|
||||
<VersionUpdateBadge
|
||||
newerVersion={container.newerVersion}
|
||||
variant="pill"
|
||||
onclick={() => openVersionModal(container)}
|
||||
/>
|
||||
{/if}
|
||||
<span class="flex-1"></span>
|
||||
{#if container.health}
|
||||
<span title={container.health}>
|
||||
@@ -2700,6 +2727,12 @@
|
||||
onComplete={handleSingleUpdateComplete}
|
||||
/>
|
||||
|
||||
<VersionUpdateModal
|
||||
bind:container={versionModalContainer}
|
||||
newerVersion={versionModalContainer?.newerVersion ?? null}
|
||||
{envId}
|
||||
/>
|
||||
|
||||
<BatchOperationModal
|
||||
bind:open={showBatchOpModal}
|
||||
title={batchOpTitle}
|
||||
|
||||
Reference in new issue
Block a user