Skip to content

Modern Docker Management, Designed for Everyone

fix: skip stored update state for digest-pinned images (#4610)

Kyle Mendell236974ea34df
diff --git a/backend/internal/version/service.go b/backend/internal/version/service.go
index 010875711..e217981d1 100644
--- a/backend/internal/version/service.go
+++ b/backend/internal/version/service.go
@@ -45,10 +45,11 @@ type latestRelease struct {
}
type currentImageInfo struct {
- Tag string
- Digest string
- ImageRef string
- ImageID string
+ Tag string
+ Digest string
+ ImageRef string
+ ImageID string
+ DigestPinned bool
}
type VersionService struct {
@@ -304,19 +305,19 @@ func (s *VersionService) GetAppVersionInfo(ctx context.Context) *version.Info {
// Semver versions (including prereleases like 2.4.0-next.1) display as v<version>.
displayVersion := strings.TrimPrefix(strings.TrimSpace(s.version), "v")
- currentTag, currentDigest, currentImageRef, currentImageID := s.detectCurrentImageInfo(ctx)
+ current := s.detectCurrentImageInfo(ctx)
// Update fields stay empty when update checks are disabled.
update := func() version.Info {
if s.disabled {
return version.Info{}
}
- checkImageRef := s.updateCheckImageRef(currentImageRef)
- digestUpdateAvailable, latestDigest := s.storedOrDigestBasedUpdate(ctx, currentImageID, currentTag, currentDigest, currentImageRef, checkImageRef)
+ checkImageRef := s.updateCheckImageRef(current.ImageRef)
+ digestUpdateAvailable, latestDigest := s.storedOrDigestBasedUpdate(ctx, current, checkImageRef)
switch {
- case isSemver && s.isNextBuild(currentTag):
- nextVersion := s.resolveNextVersion(ctx, checkImageRef, currentTag, latestDigest)
+ case isSemver && s.isNextBuild(current.Tag):
+ nextVersion := s.resolveNextVersion(ctx, checkImageRef, current.Tag, latestDigest)
return version.Info{
NewestDigest: latestDigest,
NewestVersion: kit.Ternary(nextVersion != "" && semver.Compare(nextVersion, ver) >= 0, nextVersion, ""),
@@ -355,8 +356,8 @@ func (s *VersionService) GetAppVersionInfo(ctx context.Context) *version.Info {
return &version.Info{
CurrentVersion: ver,
- CurrentTag: currentTag,
- CurrentDigest: currentDigest,
+ CurrentTag: current.Tag,
+ CurrentDigest: current.Digest,
DisplayVersion: kit.Ternary(isSemver, "v"+displayVersion, displayVersion),
Revision: s.revision,
ShortRevision: config.ShortRevision(),
@@ -375,50 +376,44 @@ func (s *VersionService) GetAppVersionInfo(ctx context.Context) *version.Info {
}
}
-// storedOrDigestBasedUpdate uses the stored poller row only when the check targets the running reference.
-func (s *VersionService) storedOrDigestBasedUpdate(ctx context.Context, currentImageID, currentTag, currentDigest, currentImageRef, checkImageRef string) (bool, string) {
- if s.imageUpdateService != nil && strings.TrimSpace(currentImageID) != "" && checkImageRef == currentImageRef {
- record, found, err := s.imageUpdateService.StoredUpdateByImageID(ctx, currentImageID)
+// storedOrDigestBasedUpdate uses the stored poller row only when the check targets the running, unpinned reference.
+func (s *VersionService) storedOrDigestBasedUpdate(ctx context.Context, current currentImageInfo, checkImageRef string) (bool, string) {
+ if s.imageUpdateService != nil && strings.TrimSpace(current.ImageID) != "" && checkImageRef == current.ImageRef && !current.DigestPinned {
+ record, found, err := s.imageUpdateService.StoredUpdateByImageID(ctx, current.ImageID)
if err != nil {
- slog.WarnContext(ctx, "Failed to read stored Arcane image update state", "imageId", currentImageID, "error", err)
+ slog.WarnContext(ctx, "Failed to read stored Arcane image update state", "imageId", current.ImageID, "error", err)
} else if found {
return record.HasUpdate, mo.PointerToOption(record.LatestDigest).OrEmpty()
}
}
- if currentTag == "" || currentDigest == "" || checkImageRef == "" || s.containerRegistryService == nil {
+ if current.Tag == "" || current.Digest == "" || checkImageRef == "" || s.containerRegistryService == nil {
return false, ""
}
- latestDigest, err := s.containerRegistryService.ImageDigest(ctx, checkImageRef+":"+currentTag)
+ latestDigest, err := s.containerRegistryService.ImageDigest(ctx, checkImageRef+":"+current.Tag)
if err != nil {
- slog.WarnContext(ctx, "Failed to fetch latest digest for tag", "tag", currentTag, "error", err)
+ slog.WarnContext(ctx, "Failed to fetch latest digest for tag", "tag", current.Tag, "error", err)
return false, ""
}
- updateAvailable := currentDigest != latestDigest && latestDigest != ""
+ updateAvailable := current.Digest != latestDigest && latestDigest != ""
if updateAvailable {
- slog.InfoContext(ctx, "Digest-based update available", "tag", currentTag, "currentDigest", currentDigest, "latestDigest", latestDigest)
+ slog.InfoContext(ctx, "Digest-based update available", "tag", current.Tag, "currentDigest", current.Digest, "latestDigest", latestDigest)
}
return updateAvailable, latestDigest
}
// detectCurrentImageInfo attempts to detect the current container's image tag and digest
-func (s *VersionService) detectCurrentImageInfo(ctx context.Context) (tag, digest, imageRef, imageID string) {
+func (s *VersionService) detectCurrentImageInfo(ctx context.Context) (detected currentImageInfo) {
if cached, found, _ := s.currentImage.Get(struct{}{}); found {
- return cached.Tag, cached.Digest, cached.ImageRef, cached.ImageID
+ return cached
}
defer func() {
if ctx.Err() != nil {
return
}
- detected := currentImageInfo{
- Tag: tag,
- Digest: digest,
- ImageRef: imageRef,
- ImageID: imageID,
- }
- if digest != "" {
+ if detected.Digest != "" {
s.currentImage.Set(struct{}{}, detected)
} else {
s.currentImage.SetWithTTL(struct{}{}, detected, time.Minute)
@@ -427,13 +422,13 @@ func (s *VersionService) detectCurrentImageInfo(ctx context.Context) (tag, diges
if s.dockerService == nil {
slog.DebugContext(ctx, "detectCurrentImageInfo: dockerService is nil")
- return "", "", "", ""
+ return currentImageInfo{}
}
dockerClient, err := s.dockerService.GetClient(ctx)
if err != nil {
slog.DebugContext(ctx, "detectCurrentImageInfo: failed to get docker client", "error", err)
- return "", "", "", ""
+ return currentImageInfo{}
}
containerId, err := cgroup.CurrentContainerID()
@@ -444,7 +439,7 @@ func (s *VersionService) detectCurrentImageInfo(ctx context.Context) (tag, diges
}
if containerId == "" {
slog.DebugContext(ctx, "detectCurrentImageInfo: could not detect container ID")
- return "", "", "", ""
+ return currentImageInfo{}
}
slog.DebugContext(ctx, "detectCurrentImageInfo: detected container", "containerId", containerId)
@@ -453,39 +448,52 @@ func (s *VersionService) detectCurrentImageInfo(ctx context.Context) (tag, diges
})
if err != nil {
slog.DebugContext(ctx, "detectCurrentImageInfo: failed to inspect container", "containerId", containerId, "error", err)
- return "", "", "", ""
+ return currentImageInfo{}
}
- imageID = inspectResult.Container.Image
configImage := kit.FromPtr(inspectResult.Container.Config).Image
// The tag comes from the user-specified config image; the repository falls back to it too.
- tag, imageRef = "latest", configImage
- if named, parseErr := reference.ParseNormalizedNamed(configImage); parseErr == nil {
+ tag, imageRef := "latest", configImage
+ named, parseErr := reference.ParseNormalizedNamed(configImage)
+ if parseErr == nil {
imageRef = named.Name()
if tagged, ok := named.(reference.Tagged); ok {
tag = tagged.Tag()
}
}
+ _, digestPinned := named.(reference.Digested)
+ base := currentImageInfo{
+ Tag: tag,
+ ImageRef: imageRef,
+ ImageID: inspectResult.Container.Image,
+ DigestPinned: digestPinned,
+ }
- if imageID == "" {
- return tag, "", imageRef, imageID
+ if base.ImageID == "" {
+ return base
}
imageInspect, err := s.dockerService.Call(ctx, func(ctx context.Context, cli *client.Client) (client.ImageInspectResult, error) {
- return cli.ImageInspect(ctx, imageID)
+ return cli.ImageInspect(ctx, base.ImageID)
})
if err != nil {
- return tag, "", imageRef, imageID
+ return base
}
for _, repoDigest := range imageInspect.RepoDigests {
- named, parseErr := reference.ParseNormalizedNamed(repoDigest)
- if parseErr != nil {
+ repoNamed, repoParseErr := reference.ParseNormalizedNamed(repoDigest)
+ if repoParseErr != nil {
continue
}
- if digested, ok := named.(reference.Digested); ok {
- return tag, string(digested.Digest()), named.Name(), imageID
+ if digested, ok := repoNamed.(reference.Digested); ok {
+ return currentImageInfo{
+ Tag: base.Tag,
+ Digest: string(digested.Digest()),
+ ImageRef: repoNamed.Name(),
+ ImageID: base.ImageID,
+ DigestPinned: base.DigestPinned,
+ }
}
}
- return tag, "", imageRef, imageID
+ return base
}
// RunStreamProducer shares one version poll loop across every connected client and emits a snapshot whenever it changes.
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 6356e0099..480748878 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -2893,6 +2893,8 @@
"update_center_step_reload": "Reload page",
"update_center_estimated": "This usually takes under a minute.",
"update_center_complete": "Update complete.",
+ "update_center_unconfirmed": "The update was requested but could not be confirmed. Check the environment's logs.",
+ "update_center_unconfirmed_version": "The update was requested but the environment still runs {version}. Check its logs.",
"auto_start": "Auto-start",
"api_key_name_placeholder": "Enter a name for this API key",
"api_key_save_warning": "Save this key now — it won't be shown again.",
diff --git a/frontend/src/lib/components/dialogs/update-center-dialog.svelte b/frontend/src/lib/components/dialogs/update-center-dialog.svelte
index 0c7eb843f..12a1d00b6 100644
--- a/frontend/src/lib/components/dialogs/update-center-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/update-center-dialog.svelte
@@ -6,7 +6,7 @@
import ReleaseNotes from '#lib/components/release-notes.svelte';
import * as Dialog from '#lib/components/ui/dialog/index.js';
import Spinner from '#lib/components/ui/spinner/spinner.svelte';
- import { ExternalLinkIcon, SuccessIcon } from '#lib/icons/index.js';
+ import { AlertIcon, ExternalLinkIcon, SuccessIcon } from '#lib/icons/index.js';
import { m } from '#lib/paraglide/messages.js';
import { queryKeys } from '#lib/query/query-keys.js';
import BaseAPIService from '#lib/services/api-service.js';
@@ -104,7 +104,8 @@
return at ? formatRelativeTime(at) : '';
});
- let upgradeStatus = $state<'upgrading' | 'waiting' | 'ready' | 'complete'>('upgrading');
+ let upgradeStatus = $state<'upgrading' | 'waiting' | 'ready' | 'complete' | 'failed'>('upgrading');
+ let lastSeenVersion = $state<string | null>(null);
let pollAbort = $state<{ aborted: boolean } | null>(null);
let fallbackTimeout: ReturnType<typeof setTimeout> | null = null;
let baselineVersionInfo = $state<AppVersionInformation | null>(null);
@@ -215,6 +216,7 @@
(async () => {
const info = await systemUpgradeService.getVersionInfo(envId);
successfulPolls += 1;
+ lastSeenVersion = info.displayVersion || info.currentVersion;
// Promote a hung trigger to "resolved" once the agent has answered
// at least 2 unrelated requests successfully. The agent is alive and
@@ -297,6 +299,7 @@
if (requestResult1.error !== null) {
const err = requestResult1.error;
+ lastSeenVersion = null;
log('version-endpoint-error', err);
}
if (requestResult1.data) return;
@@ -307,7 +310,7 @@
if (!abortRef.aborted) {
log('monitor-timeout', { timeoutMs, isRemoteEnvironment });
if (isRemoteEnvironment) {
- upgradeStatus = 'complete';
+ upgradeStatus = 'failed';
} else {
if (fallbackTimeout) {
clearTimeout(fallbackTimeout);
@@ -374,6 +377,7 @@
// poll loop can run its no-op detection against it.
triggerResolvedAt = null;
reportedUpToDate = false;
+ lastSeenVersion = null;
let triggerErrored = false;
const triggerPromise = (async () => {
const result = await tryCatch(
@@ -408,7 +412,7 @@
() => {
log('fallback-timeout', { reason: 'timeout', isRemoteEnvironment });
if (isRemoteEnvironment) {
- if (upgradeStatus !== 'complete') upgradeStatus = 'complete';
+ if (upgradeStatus !== 'complete') upgradeStatus = 'failed';
} else {
reloadPage();
}
@@ -432,7 +436,7 @@
open = false;
}
- type StepState = 'done' | 'active' | 'pending';
+ type StepState = 'done' | 'active' | 'pending' | 'failed';
const steps = $derived.by<Array<{ key: string; label: string; state: StepState }>>(() => {
const labels = isRemoteEnvironment
? [
@@ -454,6 +458,7 @@
case 'waiting':
return 1;
case 'ready':
+ case 'failed':
return 2;
case 'complete':
return labels.length;
@@ -465,7 +470,11 @@
return labels.map(({ key, label }, idx) => ({
key,
label,
- state: idx < phaseIndex ? 'done' : idx === phaseIndex ? 'active' : 'pending'
+ state: (() => {
+ if (idx < phaseIndex) return 'done';
+ if (idx > phaseIndex) return 'pending';
+ return upgradeStatus === 'failed' ? 'failed' : 'active';
+ })()
}));
});
@@ -501,11 +510,14 @@
'flex size-6 shrink-0 items-center justify-center rounded-full border transition-colors',
step.state === 'done' && 'border-success/40 bg-success/10 text-success',
step.state === 'active' && 'border-primary/40 bg-primary/10 text-primary',
- step.state === 'pending' && 'border-border bg-muted/40 text-muted-foreground/60'
+ step.state === 'pending' && 'border-border bg-muted/40 text-muted-foreground/60',
+ step.state === 'failed' && 'border-warning/40 bg-warning/10 text-warning'
)}
>
{#if step.state === 'done'}
<SuccessIcon class="size-3.5" />
+ {:else if step.state === 'failed'}
+ <AlertIcon class="size-3.5" />
{:else if step.state === 'active'}
<Spinner class="size-3.5" />
{:else}
@@ -516,7 +528,7 @@
class={cn(
'transition-colors',
step.state === 'done' && 'text-foreground',
- step.state === 'active' && 'font-medium text-foreground',
+ (step.state === 'active' || step.state === 'failed') && 'font-medium text-foreground',
step.state === 'pending' && 'text-muted-foreground'
)}
>
@@ -534,6 +546,16 @@
</p>
<ArcaneButton action="base" onclick={closeAfterComplete} size="sm" customLabel={m.common_close()} />
</div>
+ {:else if upgradeStatus === 'failed'}
+ <div class="mt-4 flex items-center justify-between gap-3 rounded-lg border border-warning/20 bg-warning/5 px-3 py-2.5">
+ <p class="flex items-center gap-2 text-sm font-medium text-warning">
+ <AlertIcon class="size-4 shrink-0" />
+ {lastSeenVersion
+ ? m.update_center_unconfirmed_version({ version: lastSeenVersion })
+ : m.update_center_unconfirmed()}
+ </p>
+ <ArcaneButton action="base" onclick={closeAfterComplete} size="sm" customLabel={m.common_close()} />
+ </div>
{:else}
<p class="mt-4 text-xs text-muted-foreground">
{m.update_center_estimated()}