diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 16:13:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 16:13:06 -0400 |
| commit | ba1b5d4559d336b5d52d961eb273f6fe40c50d8f (patch) | |
| tree | 765af64fae0f2c3156178e5c71d6d2cb19f1d111 /cmd/podman/common | |
| parent | 02bd8cef7b7286f8955a68a00294c08d81803a4a (diff) | |
| parent | b21a5b7ff470612e2bde5f120aecfbc1a0881689 (diff) | |
| download | podman-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/common')
| -rw-r--r-- | cmd/podman/common/default.go | 6 | ||||
| -rw-r--r-- | cmd/podman/common/specgen.go | 1 |
2 files changed, 6 insertions, 1 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() ) diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 12fd16551..fc0167461 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -1,7 +1,6 @@ package common import ( - "encoding/json" "fmt" "os" "path/filepath" |