diff options
| author | baude <bbaude@redhat.com> | 2018-02-02 11:02:09 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-02-02 22:44:40 +0000 |
| commit | 6ba6ecf59b9204d36388de07b866f157a4d13957 (patch) | |
| tree | 53bc85dd3e9820eb09014b1db2f8d136e86f6799 /libpod/image_inspect.go | |
| parent | 3ea23f84818a816104ccdcf6b836ac4bb3a7c366 (diff) | |
| download | podman-6ba6ecf59b9204d36388de07b866f157a4d13957.tar.gz podman-6ba6ecf59b9204d36388de07b866f157a4d13957.tar.bz2 podman-6ba6ecf59b9204d36388de07b866f157a4d13957.zip | |
Migrate Create|Commit to ginkgo
Migrate create and commit bats tests to the ginkgo
test suite. In doing so, some structures had to be
moved to pkg/podmanstructs/podmanstructs.go so we
could do better verification of test results.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #286
Approved by: rhatdan
Diffstat (limited to 'libpod/image_inspect.go')
| -rw-r--r-- | libpod/image_inspect.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpod/image_inspect.go b/libpod/image_inspect.go index 3d904e64b..cc4b8307a 100644 --- a/libpod/image_inspect.go +++ b/libpod/image_inspect.go @@ -9,10 +9,10 @@ import ( digest "github.com/opencontainers/go-digest" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "github.com/projectatomic/libpod/libpod/driver" + "github.com/projectatomic/libpod/pkg/inspect" ) -func getImageData(img storage.Image, imgRef types.Image, size int64, driver *driver.Data) (*ImageData, error) { +func getImageData(img storage.Image, imgRef types.Image, size int64, driver *inspect.Data) (*inspect.ImageData, error) { imgSize, err := imgRef.Size() if err != nil { return nil, errors.Wrapf(err, "error reading size of image %q", img.ID) @@ -41,7 +41,7 @@ func getImageData(img storage.Image, imgRef types.Image, size int64, driver *dri repoDigests = append(repoDigests, strings.SplitN(name, ":", 2)[0]+"@"+imgDigest.String()) } - data := &ImageData{ + data := &inspect.ImageData{ ID: img.ID, RepoTags: img.Names, RepoDigests: repoDigests, @@ -57,7 +57,7 @@ func getImageData(img storage.Image, imgRef types.Image, size int64, driver *dri Annotations: annotations, Digest: imgDigest, Labels: info.Labels, - RootFS: &RootFS{ + RootFS: &inspect.RootFS{ Type: ociv1Img.RootFS.Type, Layers: ociv1Img.RootFS.DiffIDs, }, |