diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-03 11:16:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-03 11:16:42 -0700 |
| commit | 42757c18553bb2e6865efed4c912e3361012c49c (patch) | |
| tree | 6fc8cf07f8751043f1c0ee25ad664810fd597d84 /cmd/podman/diff.go | |
| parent | 662ae6c0edd65db396c184c288fa93fce8023879 (diff) | |
| parent | 576a80b0d75182a5ae12985c47bd31da72a51bc8 (diff) | |
| download | podman-42757c18553bb2e6865efed4c912e3361012c49c.tar.gz podman-42757c18553bb2e6865efed4c912e3361012c49c.tar.bz2 podman-42757c18553bb2e6865efed4c912e3361012c49c.zip | |
Merge pull request #2825 from baude/remotediff
add remote-client diff
Diffstat (limited to 'cmd/podman/diff.go')
| -rw-r--r-- | cmd/podman/diff.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go index e77e562d4..7f5a313f8 100644 --- a/cmd/podman/diff.go +++ b/cmd/podman/diff.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/containers/buildah/pkg/formats" "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/cmd/podman/libpodruntime" + "github.com/containers/libpod/pkg/adapter" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -86,18 +86,17 @@ func diffCmd(c *cliconfig.DiffValues) error { return errors.Errorf("container, image, or layer name must be specified: podman diff [options [...]] ID-NAME") } - runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand) + runtime, err := adapter.GetRuntime(&c.PodmanCommand) if err != nil { return errors.Wrapf(err, "could not get runtime") } defer runtime.Shutdown(false) to := c.InputArgs[0] - changes, err := runtime.GetDiff("", to) + changes, err := runtime.Diff(c, to) if err != nil { return errors.Wrapf(err, "could not get changes for %q", to) } - diffOutput := []diffOutputParams{} outputFormat := c.Format |