mirror of
https://github.com/containers/podman.git
synced 2025-12-02 11:08:36 +08:00
history: correctly set tags
Requires vendoring fixes from c/common and to update the transformation code. Also add a test to avoid future regressions. Fixes: #17763 Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
8
vendor/github.com/containers/common/libimage/history.go
generated
vendored
8
vendor/github.com/containers/common/libimage/history.go
generated
vendored
@@ -51,7 +51,6 @@ func (i *Image) History(ctx context.Context) ([]ImageHistory, error) {
|
||||
}
|
||||
|
||||
if layer != nil {
|
||||
history.Tags = layer.Names
|
||||
if !ociImage.History[x].EmptyLayer {
|
||||
history.Size = layer.UncompressedSize
|
||||
}
|
||||
@@ -64,8 +63,13 @@ func (i *Image) History(ctx context.Context) ([]ImageHistory, error) {
|
||||
history.ID = id
|
||||
usedIDs[id] = true
|
||||
}
|
||||
for i := range node.images {
|
||||
history.Tags = append(history.Tags, node.images[i].Names()...)
|
||||
}
|
||||
}
|
||||
if layer.Parent != "" && !ociImage.History[x].EmptyLayer {
|
||||
if layer.Parent == "" {
|
||||
layer = nil
|
||||
} else if !ociImage.History[x].EmptyLayer {
|
||||
layer, err = i.runtime.store.Layer(layer.Parent)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user