Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: image size mismatch on details page (#1790)
Kyle Mendell85cfafed14eb
diff --git a/backend/internal/huma/handlers/images.go b/backend/internal/huma/handlers/images.goindex c8434ac35..834586a4d 100644--- a/backend/internal/huma/handlers/images.go+++ b/backend/internal/huma/handlers/images.go@@ -289,17 +289,15 @@ func (h *ImageHandler) GetImage(ctx context.Context, input *GetImageInput) (*Getreturn nil, huma.Error500InternalServerError("service not available")}- img, err := h.imageService.GetImageByID(ctx, input.ImageID)+ out, err := h.imageService.GetImageDetail(ctx, input.ImageID)if err != nil {return nil, huma.Error404NotFound((&common.ImageNotFoundError{Err: err}).Error())}- out := image.NewDetailSummary(img)-return &GetImageOutput{Body: base.ApiResponse[image.DetailSummary]{Success: true,- Data: out,+ Data: *out,},}, nil}diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.goindex be63c236a..1bfc49222 100644--- a/backend/internal/services/image_service.go+++ b/backend/internal/services/image_service.go@@ -47,18 +47,55 @@ func NewImageService(db *database.DB, dockerService *DockerClientService, regist}}-func (s *ImageService) GetImageByID(ctx context.Context, id string) (*image.InspectResponse, error) {+// GetImageDetail returns a DetailSummary for the given image ID. It fetches ImageInspect+// and ImageList concurrently so the size field reflects the same metric shown in the+// image table (docker image ls / docker system df).+func (s *ImageService) GetImageDetail(ctx context.Context, id string) (*imagetypes.DetailSummary, error) {dockerClient, err := s.dockerService.GetClient()if err != nil {return nil, fmt.Errorf("failed to connect to Docker: %w", err)}- inspect, err := dockerClient.ImageInspect(ctx, id)- if err != nil {- return nil, fmt.Errorf("inspect not found: %w", err)+ var (+ inspect image.InspectResponse+ listSize int64+ )++ g, gctx := errgroup.WithContext(ctx)++ g.Go(func() error {+ var err error+ inspect, err = dockerClient.ImageInspect(gctx, id)+ if err != nil {+ return fmt.Errorf("inspect not found: %w", err)+ }+ return nil+ })++ g.Go(func() error {+ imgs, err := dockerClient.ImageList(gctx, image.ListOptions{})+ if err != nil {+ return fmt.Errorf("failed to list images: %w", err)+ }+ for _, img := range imgs {+ if img.ID == id {+ listSize = img.Size+ break+ }+ }+ return nil+ })++ if err := g.Wait(); err != nil {+ return nil, err}- return &inspect, nil+ out := imagetypes.NewDetailSummary(new(inspect))+ if listSize > 0 {+ out.Size = listSize+ out.Descriptor.Size = listSize+ }+ return &out, nil}func (s *ImageService) RemoveImage(ctx context.Context, id string, force bool, user models.User) error {diff --git a/frontend/src/routes/(app)/images/[imageId]/+page.svelte b/frontend/src/routes/(app)/images/[imageId]/+page.svelteindex da6d89967..145fd535b 100644--- a/frontend/src/routes/(app)/images/[imageId]/+page.svelte+++ b/frontend/src/routes/(app)/images/[imageId]/+page.svelte@@ -140,7 +140,7 @@}});- const imageSize = $derived.by(() => bytes.format(image?.size || 0) || '0 B');+ const imageSize = $derived.by(() => bytes.format(Number(image?.size ?? 0)) || '0 B');const architecture = $derived.by(() => image?.architecture || m.common_na());const osName = $derived.by(() => image?.os || m.common_na());const repoTags = $derived.by(() => image?.repoTags ?? []);