diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-10 21:28:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-10 21:28:05 +0100 |
| commit | e1ffac6cc73eb36640cbaf6a1a28ba44749a96d9 (patch) | |
| tree | 61134dad4b2efdaa65dee6e7206e5ce20080302c /libpod/image/image.go | |
| parent | 6ed88e047579bd2d1eac99a6089cc617f0c4773d (diff) | |
| parent | 986feef2e80cfaed7cbce0df4fd5d619bcffefd7 (diff) | |
| download | podman-e1ffac6cc73eb36640cbaf6a1a28ba44749a96d9.tar.gz podman-e1ffac6cc73eb36640cbaf6a1a28ba44749a96d9.tar.bz2 podman-e1ffac6cc73eb36640cbaf6a1a28ba44749a96d9.zip | |
Merge pull request #4832 from baude/apiv2tomaster
Apiv2tomaster
Diffstat (limited to 'libpod/image/image.go')
| -rw-r--r-- | libpod/image/image.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index c8583a1c5..bce10e24c 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -781,6 +781,7 @@ type History struct { CreatedBy string `json:"createdBy"` Size int64 `json:"size"` Comment string `json:"comment"` + Tags []string `json:"tags"` } // History gets the history of an image and the IDs of images that are part of @@ -840,14 +841,17 @@ func (i *Image) History(ctx context.Context) ([]*History, error) { delete(topLayerMap, layer.ID) } } - - allHistory = append(allHistory, &History{ + h := History{ ID: id, Created: oci.History[x].Created, CreatedBy: oci.History[x].CreatedBy, Size: size, Comment: oci.History[x].Comment, - }) + } + if layer != nil { + h.Tags = layer.Names + } + allHistory = append(allHistory, &h) if layer != nil && layer.Parent != "" && !oci.History[x].EmptyLayer { layer, err = i.imageruntime.store.Layer(layer.Parent) |