summaryrefslogtreecommitdiff
path: root/cmd/podman/common/default.go
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2020-04-16 12:06:36 -0700
committerJhon Honce <jhonce@redhat.com>2020-04-21 07:56:10 -0700
commitb21a5b7ff470612e2bde5f120aecfbc1a0881689 (patch)
treea47e3a42d363a99537a4d154bfecd2eba0de40fd /cmd/podman/common/default.go
parentf4c2eb1d9dcff5feda5c3eae81ce1bcdbf166ec4 (diff)
downloadpodman-b21a5b7ff470612e2bde5f120aecfbc1a0881689.tar.gz
podman-b21a5b7ff470612e2bde5f120aecfbc1a0881689.tar.bz2
podman-b21a5b7ff470612e2bde5f120aecfbc1a0881689.zip
Provide a json variable pointing to a configured json API
* All commands now using the same instance of json API * `json` variable created in each package to prevent `encoding/json` from being re-introduced Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/common/default.go')
-rw-r--r--cmd/podman/common/default.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go
index 89316270b..7233b2091 100644
--- a/cmd/podman/common/default.go
+++ b/cmd/podman/common/default.go
@@ -1,5 +1,9 @@
package common
+import (
+ "github.com/containers/libpod/cmd/podman/registry"
+)
+
var (
// DefaultHealthCheckInterval default value
DefaultHealthCheckInterval = "30s"
@@ -11,4 +15,6 @@ var (
DefaultHealthCheckTimeout = "30s"
// DefaultImageVolume default value
DefaultImageVolume = "bind"
+ // Pull in configured json library
+ json = registry.JsonLibrary()
)