diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-08 14:45:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-08 14:45:24 +0200 |
| commit | 39f5ea4c040d60f5f16b85ab144ddacf4cbba4c8 (patch) | |
| tree | 001ee1a2377c342c616f300831375c42ae58c63f /pkg/adapter | |
| parent | f6a2860b625a796bd9d6fd48e641b7f7fa50d28a (diff) | |
| parent | 1be345bd9d82ac64d7ae3ceea41f72329f7bdebf (diff) | |
| download | podman-39f5ea4c040d60f5f16b85ab144ddacf4cbba4c8.tar.gz podman-39f5ea4c040d60f5f16b85ab144ddacf4cbba4c8.tar.bz2 podman-39f5ea4c040d60f5f16b85ab144ddacf4cbba4c8.zip | |
Merge pull request #3180 from mheon/inspect_volumes
Begin to break up pkg/inspect
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 776fcbb70..cf0b90b3a 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 } |