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/report | |
| 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/report')
| -rw-r--r-- | cmd/podman/report/diff.go | 3 | ||||
| -rw-r--r-- | cmd/podman/report/report.go | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cmd/podman/report/diff.go b/cmd/podman/report/diff.go index b36189d75..0730f06e8 100644 --- a/cmd/podman/report/diff.go +++ b/cmd/podman/report/diff.go @@ -6,7 +6,6 @@ import ( "github.com/containers/libpod/pkg/domain/entities" "github.com/containers/storage/pkg/archive" - jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" ) @@ -31,7 +30,7 @@ func ChangesToJSON(diffs *entities.DiffReport) error { } } - json := jsoniter.ConfigCompatibleWithStandardLibrary + // Pull in configured json library enc := json.NewEncoder(os.Stdout) return enc.Encode(body) } diff --git a/cmd/podman/report/report.go b/cmd/podman/report/report.go new file mode 100644 index 000000000..8392f10e0 --- /dev/null +++ b/cmd/podman/report/report.go @@ -0,0 +1,6 @@ +package report + +import "github.com/containers/libpod/cmd/podman/registry" + +// Pull in configured json library +var json = registry.JsonLibrary() |