summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaura Brehm <laurabrehm@hey.com>2023-05-10 01:33:15 +0100
committerLaura Brehm <laurabrehm@hey.com>2023-05-10 15:03:26 +0100
commit763d2b7996021f7dae14196649e27ddc225eaa9c (patch)
tree24f761a48fdda4f1d3a21dd52f85c32409512d2b
parente9eff01dcad5d525549aa89fa13998903c911d45 (diff)
downloaddocker-763d2b7996021f7dae14196649e27ddc225eaa9c.tar.gz
c8d: fix image history for dangling images
Signed-off-by: Laura Brehm <laurabrehm@hey.com> (cherry picked from commit 4603b6d6b6b00bb635a03ffcb693cde32b3f5c7d) Signed-off-by: Laura Brehm <laurabrehm@hey.com>
-rw-r--r--daemon/containerd/image_history.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/daemon/containerd/image_history.go b/daemon/containerd/image_history.go
index a99716ead7..a2d0c11425 100644
--- a/daemon/containerd/image_history.go
+++ b/daemon/containerd/image_history.go
@@ -90,13 +90,16 @@ func (i *ImageService) ImageHistory(ctx context.Context, name string) ([]*imaget
return nil, err
}
- tags := make([]string, len(tagged))
- for i, t := range tagged {
+ var tags []string
+ for _, t := range tagged {
+ if isDanglingImage(t) {
+ continue
+ }
name, err := reference.ParseNamed(t.Name)
if err != nil {
return nil, err
}
- tags[i] = reference.FamiliarString(name)
+ tags = append(tags, reference.FamiliarString(name))
}
history[0].Tags = tags
}