diff options
| author | Jakub Guzik <jakubmguzik@gmail.com> | 2021-04-24 21:42:00 +0200 |
|---|---|---|
| committer | Jakub Guzik <jakubmguzik@gmail.com> | 2021-04-26 22:51:33 +0200 |
| commit | 8edadd4c7eed93eb80f6e7acfe83d40dbf034952 (patch) | |
| tree | fa3cd1b6401c389cdfae61ceddec1cd0b21dde7a | |
| parent | 476c76f580d5cd092ff958765af36857b2a68d6c (diff) | |
| download | podman-8edadd4c7eed93eb80f6e7acfe83d40dbf034952.tar.gz podman-8edadd4c7eed93eb80f6e7acfe83d40dbf034952.tar.bz2 podman-8edadd4c7eed93eb80f6e7acfe83d40dbf034952.zip | |
Fix images prune filter until
This commits fixes until filter. It is now checking if the created
timestamp is before until filter value as expected in the docs.
Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
| -rw-r--r-- | libpod/image/prune.go | 2 | ||||
| -rw-r--r-- | test/apiv2/10-images.at | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/libpod/image/prune.go b/libpod/image/prune.go index 0e41fde44..e0480d3d1 100644 --- a/libpod/image/prune.go +++ b/libpod/image/prune.go @@ -30,7 +30,7 @@ func generatePruneFilterFuncs(filter, filterValue string) (ImageFilter, error) { return nil, err } return func(i *Image) bool { - if !until.IsZero() && i.Created().After((until)) { + if !until.IsZero() && i.Created().Before(until) { return true } return false diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at index f854d38ab..a08393668 100644 --- a/test/apiv2/10-images.at +++ b/test/apiv2/10-images.at @@ -126,6 +126,20 @@ t DELETE libpod/images/test:test 200 t GET images/json?filters='{"label":["xyz"]}' 200 length=0 t GET libpod/images/json?filters='{"label":["xyz"]}' 200 length=0 + +# to be used in prune until filter tests +podman image build -t test1:latest -<<EOF +from alpine +RUN >file3 +EOF + +# image should not be deleted +t GET images/json?filters='{"reference":["test1"]}' 200 length=1 +t POST images/prune?filters='{"until":["500000"]}' 200 +t GET images/json?filters='{"reference":["test1"]}' 200 length=1 + +t DELETE libpod/images/test1:latest 200 + # Export more than one image # FIXME FIXME FIXME, this doesn't work: # not ok 64 [10-images] GET images/get?names=alpine,busybox : status |