diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-26 09:55:54 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-26 09:55:54 -0700 |
commit | aa079016bdfbe498b27cc81006860e9d588abe49 (patch) | |
tree | 7676e6ac3bd0ab34970d7a8f2616e4ebc5cd7ad8 /pkg | |
parent | 60b009af4ef1415b83e0419ba41381912693ab86 (diff) | |
parent | 7f2221d48f7d0df8cc5beed70ff5dbc57bca3529 (diff) | |
download | podman-aa079016bdfbe498b27cc81006860e9d588abe49.tar.gz podman-aa079016bdfbe498b27cc81006860e9d588abe49.tar.bz2 podman-aa079016bdfbe498b27cc81006860e9d588abe49.zip |
Merge pull request #2771 from baude/issue2765
size is optional for container inspection
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/adapter/containers_remote.go | 2 | ||||
-rw-r--r-- | pkg/varlinkapi/containers.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go index a8146567a..2982d6cbb 100644 --- a/pkg/adapter/containers_remote.go +++ b/pkg/adapter/containers_remote.go @@ -22,7 +22,7 @@ import ( // Inspect returns an inspect struct from varlink func (c *Container) Inspect(size bool) (*inspect.ContainerInspectData, error) { - reply, err := iopodman.ContainerInspectData().Call(c.Runtime.Conn, c.ID()) + reply, err := iopodman.ContainerInspectData().Call(c.Runtime.Conn, c.ID(), size) if err != nil { return nil, err } diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index 3185ba0e9..7a6ae3507 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -519,12 +519,12 @@ func (i *LibpodAPI) ContainerArtifacts(call iopodman.VarlinkCall, name, artifact } // ContainerInspectData returns the inspect data of a container in string format -func (i *LibpodAPI) ContainerInspectData(call iopodman.VarlinkCall, name string) error { +func (i *LibpodAPI) ContainerInspectData(call iopodman.VarlinkCall, name string, size bool) error { ctr, err := i.Runtime.LookupContainer(name) if err != nil { return call.ReplyContainerNotFound(name, err.Error()) } - data, err := ctr.Inspect(true) + data, err := ctr.Inspect(size) if err != nil { return call.ReplyErrorOccurred("unable to inspect container") } |