diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-05-21 16:42:41 -0400 |
|---|---|---|
| committer | Matthew Heon <mcs@bellerophon.lldp.net> | 2019-06-03 15:54:53 -0400 |
| commit | 1be345bd9d82ac64d7ae3ceea41f72329f7bdebf (patch) | |
| tree | 6339a03fd92edb07e694fd43c690c82a3b8ee006 /pkg/adapter | |
| parent | 7c465d4d9738f25546d61b915d63bf8fff0ed14d (diff) | |
| download | podman-1be345bd9d82ac64d7ae3ceea41f72329f7bdebf.tar.gz podman-1be345bd9d82ac64d7ae3ceea41f72329f7bdebf.tar.bz2 podman-1be345bd9d82ac64d7ae3ceea41f72329f7bdebf.zip | |
Begin to break up pkg/inspect
Let's put inspect structs where they're actually being used. We
originally made pkg/inspect to solve circular import issues.
There are no more circular import issues.
Image structs remain for now, I'm focusing on container inspect.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg/adapter')
| -rw-r--r-- | pkg/adapter/containers_remote.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go index 0c0bce813..ce4b96370 100644 --- a/pkg/adapter/containers_remote.go +++ b/pkg/adapter/containers_remote.go @@ -16,7 +16,6 @@ import ( "github.com/containers/libpod/cmd/podman/shared" iopodman "github.com/containers/libpod/cmd/podman/varlink" "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/inspect" "github.com/containers/libpod/pkg/varlinkapi/virtwriter" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/docker/docker/pkg/term" @@ -29,12 +28,12 @@ import ( ) // Inspect returns an inspect struct from varlink -func (c *Container) Inspect(size bool) (*inspect.ContainerInspectData, error) { +func (c *Container) Inspect(size bool) (*libpod.InspectContainerData, error) { reply, err := iopodman.ContainerInspectData().Call(c.Runtime.Conn, c.ID(), size) if err != nil { return nil, err } - data := inspect.ContainerInspectData{} + data := libpod.InspectContainerData{} if err := json.Unmarshal([]byte(reply), &data); err != nil { return nil, err } |