aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman/system
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-21 16:13:06 -0400
committerGitHub <noreply@github.com>2020-04-21 16:13:06 -0400
commitba1b5d4559d336b5d52d961eb273f6fe40c50d8f (patch)
tree765af64fae0f2c3156178e5c71d6d2cb19f1d111 /cmd/podman/system
parent02bd8cef7b7286f8955a68a00294c08d81803a4a (diff)
parentb21a5b7ff470612e2bde5f120aecfbc1a0881689 (diff)
downloadpodman-ba1b5d4559d336b5d52d961eb273f6fe40c50d8f.tar.gz
podman-ba1b5d4559d336b5d52d961eb273f6fe40c50d8f.tar.bz2
podman-ba1b5d4559d336b5d52d961eb273f6fe40c50d8f.zip
Merge pull request #5851 from jwhonce/wip/json
Provide a json variable pointing to a configured json API
Diffstat (limited to 'cmd/podman/system')
-rw-r--r--cmd/podman/system/info.go1
-rw-r--r--cmd/podman/system/system.go3
2 files changed, 3 insertions, 1 deletions
diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go
index aa0a66ffc..8e014a91b 100644
--- a/cmd/podman/system/info.go
+++ b/cmd/podman/system/info.go
@@ -1,7 +1,6 @@
package system
import (
- "encoding/json"
"fmt"
"os"
"text/template"
diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go
index 6d8c9ebc5..2d55e8c13 100644
--- a/cmd/podman/system/system.go
+++ b/cmd/podman/system/system.go
@@ -7,6 +7,9 @@ import (
)
var (
+ // Pull in configured json library
+ json = registry.JsonLibrary()
+
// Command: podman _system_
systemCmd = &cobra.Command{
Use: "system",