diff options
author | Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> | 2023-05-10 22:30:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-10 22:30:02 +0200 |
commit | 3b443c8cfc8850a384332fa1360d84987f6a0b18 (patch) | |
tree | 3b946e6bbc7f5a073cd51568f53eb90dfaae8486 | |
parent | f70d9933d160b12b8d6247c77e721c94fae9eefe (diff) | |
parent | 4603b6d6b6b00bb635a03ffcb693cde32b3f5c7d (diff) | |
download | docker-3b443c8cfc8850a384332fa1360d84987f6a0b18.tar.gz |
Merge pull request #45508 from laurazard/c8d-dangling-image-history
c8d: image history – handle dangling images
-rw-r--r-- | daemon/containerd/image_history.go | 9 |
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 } |