diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-07 21:49:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 21:49:24 +0200 |
| commit | 11c8b01e1d81008bc55fed8d6f62ce39dc5459c8 (patch) | |
| tree | 36f7089418825a179b5e667a2324ba0cf39f57d0 /pkg/domain/infra/abi/containers.go | |
| parent | 08fa3d511f2b96613bbbe76e517f2c9288e5bf56 (diff) | |
| parent | 8ae28a55acc51a02597b23140916a690fbbdc3fc (diff) | |
| download | podman-11c8b01e1d81008bc55fed8d6f62ce39dc5459c8.tar.gz podman-11c8b01e1d81008bc55fed8d6f62ce39dc5459c8.tar.bz2 podman-11c8b01e1d81008bc55fed8d6f62ce39dc5459c8.zip | |
Merge pull request #5739 from jwhonce/wip/diff
V2 Podman diff(changes) support
Diffstat (limited to 'pkg/domain/infra/abi/containers.go')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 828ee56f0..ccbe6d4fd 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -599,9 +599,9 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri ExitCode: 125, } if err := ctr.Start(ctx, ctr.PodID() != ""); err != nil { - //if lastError != nil { + // if lastError != nil { // fmt.Fprintln(os.Stderr, lastError) - //} + // } report.Err = err if errors.Cause(err) == define.ErrWillDeadlock { report.Err = errors.Wrapf(err, "please run 'podman system renumber' to resolve deadlocks") @@ -623,6 +623,19 @@ func (ic *ContainerEngine) ContainerList(ctx context.Context, options entities.C return ps.GetContainerLists(ic.Libpod, options) } +// ContainerDiff provides changes to given container +func (ic *ContainerEngine) ContainerDiff(ctx context.Context, nameOrId string, opts entities.DiffOptions) (*entities.DiffReport, error) { + if opts.Latest { + ctnr, err := ic.Libpod.GetLatestContainer() + if err != nil { + return nil, errors.Wrap(err, "unable to get latest container") + } + nameOrId = ctnr.ID() + } + changes, err := ic.Libpod.GetDiff("", nameOrId) + return &entities.DiffReport{Changes: changes}, err +} + func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.ContainerRunOptions) (*entities.ContainerRunReport, error) { var ( joinPod bool |