diff options
| author | baude <bbaude@redhat.com> | 2019-01-17 08:43:34 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-01-18 15:43:11 -0600 |
| commit | eadaa5fb420e3e8e6b0e277ac88cc528f9950ee4 (patch) | |
| tree | a846f4b272229aaf51e4cca161bfe9b5268d7613 /cmd/podman/shared/container.go | |
| parent | f897cccbdeb2c1e92b9a1b866128a67d5ccb957d (diff) | |
| download | podman-eadaa5fb420e3e8e6b0e277ac88cc528f9950ee4.tar.gz podman-eadaa5fb420e3e8e6b0e277ac88cc528f9950ee4.tar.bz2 podman-eadaa5fb420e3e8e6b0e277ac88cc528f9950ee4.zip | |
podman-remote inspect
base enablement of the inspect command.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'cmd/podman/shared/container.go')
| -rw-r--r-- | cmd/podman/shared/container.go | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go index a904ef75a..9040c4a5c 100644 --- a/cmd/podman/shared/container.go +++ b/cmd/podman/shared/container.go @@ -2,7 +2,6 @@ package shared import ( "context" - "encoding/json" "fmt" "github.com/google/shlex" "io" @@ -446,8 +445,7 @@ func getStrFromSquareBrackets(cmd string) string { // GetCtrInspectInfo takes container inspect data and collects all its info into a ContainerData // structure for inspection related methods -func GetCtrInspectInfo(ctr *libpod.Container, ctrInspectData *inspect.ContainerInspectData) (*inspect.ContainerData, error) { - config := ctr.Config() +func GetCtrInspectInfo(config *libpod.ContainerConfig, ctrInspectData *inspect.ContainerInspectData, createArtifact *cc.CreateConfig) (*inspect.ContainerData, error) { spec := config.Spec cpus, mems, period, quota, realtimePeriod, realtimeRuntime, shares := getCPUInfo(spec) @@ -456,16 +454,6 @@ func GetCtrInspectInfo(ctr *libpod.Container, ctrInspectData *inspect.ContainerI pidsLimit := getPidsInfo(spec) cgroup := getCgroup(spec) - var createArtifact cc.CreateConfig - artifact, err := ctr.GetArtifact("create-config") - if err == nil { - if err := json.Unmarshal(artifact, &createArtifact); err != nil { - return nil, err - } - } else { - logrus.Errorf("couldn't get some inspect information, error getting artifact %q: %v", ctr.ID(), err) - } - data := &inspect.ContainerData{ ctrInspectData, &inspect.HostConfig{ @@ -493,7 +481,7 @@ func GetCtrInspectInfo(ctr *libpod.Container, ctrInspectData *inspect.ContainerI PidsLimit: pidsLimit, Privileged: config.Privileged, ReadonlyRootfs: spec.Root.Readonly, - Runtime: ctr.RuntimeName(), + Runtime: config.OCIRuntime, NetworkMode: string(createArtifact.NetMode), IpcMode: string(createArtifact.IpcMode), Cgroup: cgroup, |