diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2021-07-01 15:24:20 +0200 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2021-07-02 17:11:56 +0200 |
| commit | 8f6a0243f4b7f861a116c0dba5967b3cfe23d61f (patch) | |
| tree | 4525ea01079f4f61104e34b5f19b0a823c17f6a0 /libpod/container_internal_linux.go | |
| parent | fd1715568b7c14451dcf2581c385c8d3e307d30e (diff) | |
| download | podman-8f6a0243f4b7f861a116c0dba5967b3cfe23d61f.tar.gz podman-8f6a0243f4b7f861a116c0dba5967b3cfe23d61f.tar.bz2 podman-8f6a0243f4b7f861a116c0dba5967b3cfe23d61f.zip | |
podman diff accept two images or containers
First, make podman diff accept optionally a second argument. This allows
the user to specify a second image/container to compare the first with.
If it is not set the parent layer will be used as before.
Second, podman container diff should only use containers and podman
image diff should only use images. Previously, podman container diff
would use the image when both an image and container with this name
exists.
To make this work two new parameters have been added to the api. If they
are not used the previous behaviour is used. The same applies to the
bindings.
Fixes #10649
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 25db3cff0..850af235f 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -923,7 +923,7 @@ func (c *Container) exportCheckpoint(options ContainerCheckpointOptions) error { var addToTarFiles []string if !options.IgnoreRootfs { // To correctly track deleted files, let's go through the output of 'podman diff' - rootFsChanges, err := c.runtime.GetDiff("", c.ID()) + rootFsChanges, err := c.runtime.GetDiff("", c.ID(), define.DiffContainer) if err != nil { return errors.Wrapf(err, "error exporting root file-system diff for %q", c.ID()) } |