summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-01-07 11:54:55 -0800
committerGitHub <noreply@github.com>2019-01-07 11:54:55 -0800
commit8c8d895d66f4bebe004463f77298a20a726b6690 (patch)
tree51d6f94609b0fa7f3e4d979c5f28a75fbd423d54 /cmd
parentbe84d9727e3d6ba649d4ca2d1b7d52849943310c (diff)
parent41fb81d074f57bcf562e7dee78a78896e9a0bc64 (diff)
downloadpodman-8c8d895d66f4bebe004463f77298a20a726b6690.tar.gz
podman-8c8d895d66f4bebe004463f77298a20a726b6690.tar.bz2
podman-8c8d895d66f4bebe004463f77298a20a726b6690.zip
Merge pull request #2098 from baude/remote
Add ability to build golang remote client
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/info.go12
1 files changed, 7 insertions, 5 deletions
diff --git a/cmd/podman/info.go b/cmd/podman/info.go
index c0639725e..4b80f94db 100644
--- a/cmd/podman/info.go
+++ b/cmd/podman/info.go
@@ -1,10 +1,10 @@
package main
import (
+ "github.com/containers/libpod/libpod/adapter"
"runtime"
"github.com/containers/libpod/cmd/podman/formats"
- "github.com/containers/libpod/cmd/podman/libpodruntime"
"github.com/containers/libpod/libpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
@@ -39,18 +39,20 @@ func infoCmd(c *cli.Context) error {
}
info := map[string]interface{}{}
- runtime, err := libpodruntime.GetRuntime(c)
+ localRuntime, err := adapter.GetRuntime(c)
if err != nil {
return errors.Wrapf(err, "could not get runtime")
}
- defer runtime.Shutdown(false)
+ defer localRuntime.Runtime.Shutdown(false)
- infoArr, err := runtime.Info()
+ infoArr, err := localRuntime.Runtime.Info()
if err != nil {
return errors.Wrapf(err, "error getting info")
}
- if c.Bool("debug") {
+ // TODO This is no a problem child because we don't know if we should add information
+ // TODO about the client or the backend. Only do for traditional podman for now.
+ if !localRuntime.Remote && c.Bool("debug") {
debugInfo := debugInfo(c)
infoArr = append(infoArr, libpod.InfoData{Type: "debug", Data: debugInfo})
}