Skip to content

Modern Docker Management, Designed for Everyone

feat: show image repo on untagged images (#809)

Kyle Mendellc112053e6111
diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.go
index 31c5a4d1b..d3dea3d31 100644
--- a/backend/internal/services/image_service.go
+++ b/backend/internal/services/image_service.go
@@ -13,6 +13,7 @@ import (
"log/slog"
+ ref "github.com/distribution/reference"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/image"
@@ -531,26 +532,49 @@ func mapDockerImagesToDTOs(dockerImages []image.Summary, inUseMap map[string]boo
if len(di.RepoTags) > 0 {
repoTag := di.RepoTags[0]
- // Use LastIndex to split on the LAST colon, correctly handling registry:port/image:tag
- lastColonIdx := strings.LastIndex(repoTag, ":")
- if lastColonIdx != -1 {
- imageDto.Repo = repoTag[:lastColonIdx]
- imageDto.Tag = repoTag[lastColonIdx+1:]
- // Handle edge cases
- if imageDto.Repo == "" {
- imageDto.Repo = "<none>"
- }
- if imageDto.Tag == "" {
- imageDto.Tag = "<none>"
+ // Use distribution/reference SDK to properly parse image references
+ if named, err := ref.ParseNormalizedNamed(repoTag); err == nil {
+ imageDto.Repo = ref.FamiliarName(named)
+ if tagged, ok := named.(ref.NamedTagged); ok {
+ imageDto.Tag = tagged.Tag()
+ } else {
+ imageDto.Tag = "latest"
}
} else {
- // No colon found, treat entire string as repo with default tag
- imageDto.Repo = repoTag
- imageDto.Tag = "latest"
+ // Fallback for malformed references
+ if lastColonIdx := strings.LastIndex(repoTag, ":"); lastColonIdx != -1 {
+ imageDto.Repo = repoTag[:lastColonIdx]
+ imageDto.Tag = repoTag[lastColonIdx+1:]
+ } else {
+ imageDto.Repo = repoTag
+ imageDto.Tag = "latest"
+ }
}
} else {
- imageDto.Repo = "<none>"
- imageDto.Tag = "<none>"
+ // No RepoTags. If we have RepoDigests, derive repository from the part before '@'
+ if len(di.RepoDigests) > 0 {
+ for _, rd := range di.RepoDigests {
+ if rd == "<none>@<none>" {
+ continue
+ }
+ // Format: registry/path/name@sha256:...
+ if at := strings.LastIndex(rd, "@"); at != -1 {
+ candidateRepo := rd[:at]
+ if candidateRepo != "" {
+ imageDto.Repo = candidateRepo
+ imageDto.Tag = "<none>"
+ break
+ }
+ }
+ }
+ }
+ // Fallbacks if no digest-derived repo found
+ if imageDto.Repo == "" {
+ imageDto.Repo = "<none>"
+ }
+ if imageDto.Tag == "" {
+ imageDto.Tag = "<none>"
+ }
}
if updateRecord, exists := updateMap[di.ID]; exists {
diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.go
index 7eab23a78..d65f697dc 100644
--- a/backend/internal/services/image_update_service.go
+++ b/backend/internal/services/image_update_service.go
@@ -255,10 +255,13 @@ func (s *ImageUpdateService) parseImageReference(imageRef string) *ImageParts {
// Extract repository (path without registry)
repository := ref.Path(named)
- // Extract tag
+ // Extract tag or default to latest
tag := "latest"
if tagged, ok := named.(ref.NamedTagged); ok {
tag = tagged.Tag()
+ } else if _, ok := named.(ref.Digested); ok {
+ // If it's a digest reference, still use "latest" as the tag for registry queries
+ tag = "latest"
}
return &ImageParts{
@@ -541,16 +544,47 @@ func (s *ImageUpdateService) saveUpdateResultByID(ctx context.Context, imageID s
var repo, tag string
if len(dockerImage.RepoTags) > 0 && dockerImage.RepoTags[0] != "<none>:<none>" {
- parts := strings.SplitN(dockerImage.RepoTags[0], ":", 2)
- repo = parts[0]
- if len(parts) > 1 {
- tag = parts[1]
+ // Use distribution/reference SDK for proper parsing
+ if named, err := ref.ParseNormalizedNamed(dockerImage.RepoTags[0]); err == nil {
+ repo = ref.FamiliarName(named)
+ if tagged, ok := named.(ref.NamedTagged); ok {
+ tag = tagged.Tag()
+ } else {
+ tag = "latest"
+ }
} else {
- tag = "latest"
+ // Fallback for malformed references
+ parts := strings.SplitN(dockerImage.RepoTags[0], ":", 2)
+ repo = parts[0]
+ if len(parts) > 1 {
+ tag = parts[1]
+ } else {
+ tag = "latest"
+ }
}
} else {
- repo = "<none>"
- tag = "<none>"
+ // Attempt to derive repo from RepoDigests if available
+ if len(dockerImage.RepoDigests) > 0 {
+ for _, rd := range dockerImage.RepoDigests {
+ if rd == "<none>@<none>" {
+ continue
+ }
+ if at := strings.LastIndex(rd, "@"); at != -1 {
+ repoCandidate := rd[:at]
+ if repoCandidate != "" {
+ repo = repoCandidate
+ tag = "<none>"
+ break
+ }
+ }
+ }
+ }
+ if repo == "" {
+ repo = "<none>"
+ }
+ if tag == "" {
+ tag = "<none>"
+ }
}
var lastError *string
diff --git a/frontend/src/routes/images/image-table.svelte b/frontend/src/routes/images/image-table.svelte
index b1be59512..c063b468a 100644
--- a/frontend/src/routes/images/image-table.svelte
+++ b/frontend/src/routes/images/image-table.svelte
@@ -12,6 +12,7 @@
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge/index.js';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { tryCatch } from '$lib/utils/try-catch';
import ImageUpdateItem from '$lib/components/image-update-item.svelte';
@@ -164,7 +165,8 @@
},
{ accessorKey: 'created', title: m.common_created(), sortable: true, cell: CreatedCell },
{ accessorKey: 'size', title: m.common_size(), sortable: true, cell: SizeCell },
- { accessorKey: 'repoTags', title: m.images_repository(), sortable: true, cell: RepoCell }
+ { accessorKey: 'repo', title: m.images_repository(), sortable: true, cell: RepoCell },
+ { accessorKey: 'repoTags', title: m.common_tags(), cell: TagCell }
] satisfies ColumnSpec<ImageSummaryDto>[];
const mobileFields = [
@@ -173,15 +175,34 @@
{ id: 'inUse', label: m.common_in_use(), defaultVisible: true },
{ id: 'created', label: m.common_created(), defaultVisible: true },
{ id: 'size', label: m.common_size(), defaultVisible: true },
- { id: 'repoTags', label: m.images_repository(), defaultVisible: true }
+ { id: 'repo', label: m.images_repository(), defaultVisible: true },
+ { id: 'repoTags', label: m.common_tags(), defaultVisible: true }
];
let mobileFieldVisibility = $state<Record<string, boolean>>({});
</script>
{#snippet RepoCell({ item }: { item: ImageSummaryDto })}
+ {#if item.repo && item.repo !== '<none>'}
+ <a class="font-medium hover:underline" href="/images/{item.id}">{item.repo}</a>
+ {:else}
+ <span class="text-muted-foreground italic">{m.images_untagged()}</span>
+ {/if}
+{/snippet}
+
+{#snippet TagCell({ item }: { item: ImageSummaryDto })}
{#if item.repoTags && item.repoTags.length > 0 && item.repoTags[0] !== '<none>:<none>'}
- <a class="font-medium hover:underline" href="/images/{item.id}">{item.repoTags[0]}</a>
+ <div class="flex flex-wrap gap-1.5">
+ {#each item.repoTags.slice(0, 2) as repoTag}
+ {@const tag = repoTag.split(':').pop() || repoTag}
+ <Badge variant="outline" class="font-mono text-xs">{tag}</Badge>
+ {/each}
+ {#if item.repoTags.length > 2}
+ <Badge variant="outline" class="text-xs">+{item.repoTags.length - 2}</Badge>
+ {/if}
+ </div>
+ {:else if item.tag && item.tag !== '<none>'}
+ <Badge variant="outline" class="font-mono text-xs">{item.tag}</Badge>
{:else}
<span class="text-muted-foreground italic">{m.images_untagged()}</span>
{/if}
@@ -228,8 +249,10 @@
component: ImageIcon,
variant: item.inUse ? 'emerald' : 'amber'
})}
- title={(item) =>
- item.repoTags && item.repoTags.length > 0 && item.repoTags[0] !== '<none>:<none>' ? item.repoTags[0] : m.images_untagged()}
+ title={(item) => {
+ if (item.repo && item.repo !== '<none>') return item.repo;
+ return m.images_untagged();
+ }}
subtitle={(item) => ((mobileFieldVisibility.id ?? false) ? item.id : null)}
badges={[
(item: ImageSummaryDto) =>
@@ -249,14 +272,22 @@
},
{
label: m.images_repository(),
- getValue: (item: ImageSummaryDto) => item.repoTags?.[0] || m.images_untagged(),
+ getValue: (item: ImageSummaryDto) => (item.repo && item.repo !== '<none>' ? item.repo : m.images_untagged()),
+ icon: ImageIcon,
+ iconVariant: 'purple' as const,
+ show: mobileFieldVisibility.repo ?? true
+ },
+ {
+ label: m.common_tags(),
+ getValue: (item: ImageSummaryDto) => {
+ if (item.repoTags && item.repoTags.length > 0 && item.repoTags[0] !== '<none>:<none>') {
+ return item.repoTags.map((rt) => rt.split(':').pop() || rt).join(', ');
+ }
+ return item.tag && item.tag !== '<none>' ? item.tag : m.images_untagged();
+ },
icon: ImageIcon,
iconVariant: 'purple' as const,
- show:
- (mobileFieldVisibility.repoTags ?? true) &&
- item.repoTags &&
- item.repoTags.length > 0 &&
- item.repoTags[0] !== '<none>:<none>'
+ show: mobileFieldVisibility.repoTags ?? true
}
]}
footer={(mobileFieldVisibility.created ?? true)