Fixed image dangling logic and added InUse field to images

productiveops · Dec 30, 2023 · d1b83ca · d1b83ca
1 parent bcc9db3
commit d1b83ca
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/pkg/dockerapi/image.go b/pkg/dockerapi/image.go
@@ -3,6 +3,7 @@ package dockerapi
 import (
 	"context"
 	"errors"
+	"slices"
 	"sort"
 	"strings"
 
@@ -17,6 +18,11 @@ func ImageList(req *DockerImageList) (*DockerImageListResponse, error) {
 		return nil, err
 	}
 
+	dcontainers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{All: req.All})
+	if err != nil {
+		return nil, err
+	}
+
 	dimages, err := cli.ImageList(context.Background(), types.ImageListOptions{All: req.All})
 	if err != nil {
 		return nil, err
@@ -26,9 +32,10 @@ func ImageList(req *DockerImageList) (*DockerImageListResponse, error) {
 	for i, item := range dimages {
 		name := "<none>"
 		tag := "<none>"
-		dangling := len(item.RepoTags) == 0
+		inUse := slices.ContainsFunc(dcontainers, func(c types.Container) bool { return c.ImageID == item.ID })
+		untagged := len(item.RepoTags) == 0 
 
-		if dangling {
+		if untagged {
 			if len(item.RepoDigests) >= 1 {
 				name = strings.Split(item.RepoDigests[0], "@")[0]
 			}
@@ -45,8 +52,9 @@ func ImageList(req *DockerImageList) (*DockerImageListResponse, error) {
 			Name: 		name,
 			Tag: 		tag,
 			Size:   	item.Size,
-			Dangling: 	dangling,
+			Dangling: 	untagged && !inUse,
 			Created: 	item.Created,
+			InUse: 		inUse,
 		}
 	}
 

diff --git a/pkg/dockerapi/models.go b/pkg/dockerapi/models.go
@@ -63,6 +63,7 @@ type Image struct {
 	Size    int64  `json:"size"`
 	Dangling bool  `json:"dangling"`
 	Created int64  `json:"created"`
+	InUse   bool   `json:"inUse"`
 }
 
 type DockerImageList struct {

diff --git a/web/src/app/images/image-list.tsx b/web/src/app/images/image-list.tsx
@@ -137,6 +137,7 @@ export default function ImageList() {
               <TableHead scope="col">Id</TableHead>
               <TableHead scope="col">Name</TableHead>
               <TableHead scope="col">Tag</TableHead>
+              <TableHead scope="col">Status</TableHead>
               <TableHead scope="col">Size</TableHead>
               <TableHead scope="col">
                 <span className="sr-only">Actions</span>
@@ -158,6 +159,7 @@ export default function ImageList() {
                       ""
                     )}
                   </TableCell>
+                  <TableCell>{item.inUse ? "In use" : "Unused"}</TableCell>
                   <TableCell>{convertByteToMb(item.size)}</TableCell>
                   <TableCell className="text-right">
                     <TableButtonDelete

diff --git a/web/src/lib/api-models.ts b/web/src/lib/api-models.ts
@@ -99,6 +99,7 @@ export interface IImage {
   size: number
   dangling: boolean
   created: number
+  inUse: boolean
 }
 
 export interface IVolume {