aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/containers/buildah/docker
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-07-23 05:56:00 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2019-07-30 16:48:18 -0400
commit141c7a5165261b0a75254107b63b2dac22203ebf (patch)
treeaa6b513cf7e28727367ee6d4ba2980fe48bc86f5 /vendor/github.com/containers/buildah/docker
parent680a3838748b297b7c3c462f98b58f82e39218e8 (diff)
downloadpodman-141c7a5165261b0a75254107b63b2dac22203ebf.tar.gz
podman-141c7a5165261b0a75254107b63b2dac22203ebf.tar.bz2
podman-141c7a5165261b0a75254107b63b2dac22203ebf.zip
Vendor in buildah 1.9.2
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/containers/buildah/docker')
-rw-r--r--vendor/github.com/containers/buildah/docker/types.go9
1 files changed, 1 insertions, 8 deletions
diff --git a/vendor/github.com/containers/buildah/docker/types.go b/vendor/github.com/containers/buildah/docker/types.go
index c59be0e60..2011619f4 100644
--- a/vendor/github.com/containers/buildah/docker/types.go
+++ b/vendor/github.com/containers/buildah/docker/types.go
@@ -161,18 +161,11 @@ type V1Image struct {
// V2Image stores the image configuration
type V2Image struct {
V1Image
- Parent ID `json:"parent,omitempty"`
+ Parent ID `json:"parent,omitempty"` // nolint:govet
RootFS *V2S2RootFS `json:"rootfs,omitempty"`
History []V2S2History `json:"history,omitempty"`
OSVersion string `json:"os.version,omitempty"`
OSFeatures []string `json:"os.features,omitempty"`
-
- // rawJSON caches the immutable JSON associated with this image.
- rawJSON []byte
-
- // computedID is the ID computed from the hash of the image config.
- // Not to be confused with the legacy V1 ID in V1Image.
- computedID ID
}
// github.com/docker/distribution/manifest/versioned.go