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 /docs/source/markdown/podman-diff.1.md | |
| 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 'docs/source/markdown/podman-diff.1.md')
| -rw-r--r-- | docs/source/markdown/podman-diff.1.md | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/docs/source/markdown/podman-diff.1.md b/docs/source/markdown/podman-diff.1.md index dbab2d4db..fd574abb1 100644 --- a/docs/source/markdown/podman-diff.1.md +++ b/docs/source/markdown/podman-diff.1.md @@ -4,18 +4,24 @@ podman\-diff - Inspect changes on a container or image's filesystem ## SYNOPSIS -**podman diff** [*options*] *name* - -**podman container diff** [*options*] *name* +**podman diff** [*options*] *container|image* [*container|image*] ## DESCRIPTION -Displays changes on a container or image's filesystem. The container or image will be compared to its parent layer +Displays changes on a container or image's filesystem. The container or image will be compared to its parent layer or the second argument when given. + +The output is prefixed with the following symbols: + +| Symbol | Description | +|--------|-------------| +| A | A file or directory was added. | +| D | A file or directory was deleted. | +| C | A file or directory was changed. | ## OPTIONS #### **--format** -Alter the output into a different format. The only valid format for diff is `json`. +Alter the output into a different format. The only valid format for **podman diff** is `json`. #### **--latest**, **-l** @@ -25,15 +31,12 @@ to run containers such as CRI-O, the last started container could be from either ## EXAMPLE ``` -# podman diff redis:alpine -C /usr -C /usr/local -C /usr/local/bin -A /usr/local/bin/docker-entrypoint.sh +$ podman diff container1 +A /myscript.sh ``` ``` -# podman diff --format json redis:alpine +$ podman diff --format json myimage { "changed": [ "/usr", @@ -46,8 +49,13 @@ A /usr/local/bin/docker-entrypoint.sh } ``` +``` +$ podman diff container1 image1 +A /test +``` + ## SEE ALSO -podman(1) +**[podman(1)](podman.1.md)**, **[podman-container-diff(1)](podman-container-diff.1.md)**, **[podman-image-diff(1)](podman-image-diff.1.md)** ## HISTORY August 2017, Originally compiled by Ryan Cole <rycole@redhat.com> |