summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-11-26 16:46:22 -0800
committerGitHub <noreply@github.com>2018-11-26 16:46:22 -0800
commit39560500fcc504bea70d48759f44c64f680c2ef2 (patch)
tree96d1a8f64e6337e33cbcb2d44a92764666ae7160
parent392648e7bcf954284907318057be7ea38a1437fc (diff)
parent5438ec19181cc5855e6b54e152e0fe3161a75913 (diff)
downloadpodman-39560500fcc504bea70d48759f44c64f680c2ef2.tar.gz
podman-39560500fcc504bea70d48759f44c64f680c2ef2.tar.bz2
podman-39560500fcc504bea70d48759f44c64f680c2ef2.zip
Merge pull request #1868 from QiWang19/issue860
Add history field to image inspect
-rw-r--r--libpod/image/image.go1
-rw-r--r--pkg/inspect/inspect.go1
2 files changed, 2 insertions, 0 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go
index a05c15160..434f9031e 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -869,6 +869,7 @@ func (i *Image) Inspect(ctx context.Context) (*inspect.ImageData, error) {
GraphDriver: driver,
ManifestType: manifestType,
User: ociv1Img.Config.User,
+ History: ociv1Img.History,
}
return data, nil
}
diff --git a/pkg/inspect/inspect.go b/pkg/inspect/inspect.go
index 62ba53147..5bdcf677f 100644
--- a/pkg/inspect/inspect.go
+++ b/pkg/inspect/inspect.go
@@ -126,6 +126,7 @@ type ImageData struct {
Annotations map[string]string `json:"Annotations"`
ManifestType string `json:"ManifestType"`
User string `json:"User"`
+ History []v1.History `json:"History"`
}
// RootFS holds the root fs information of an image