summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-04-26 20:05:56 -0400
committerGitHub <noreply@github.com>2021-04-26 20:05:56 -0400
commitbdcfdadb2f41af203293a662c2b1bf5e5514586e (patch)
treee3752f01fa010f0aae14ac6df9bca87f945afbfe
parent5070ae3bced99087e8d18ec1df994ebe4502cdd1 (diff)
parent8edadd4c7eed93eb80f6e7acfe83d40dbf034952 (diff)
downloadpodman-bdcfdadb2f41af203293a662c2b1bf5e5514586e.tar.gz
podman-bdcfdadb2f41af203293a662c2b1bf5e5514586e.tar.bz2
podman-bdcfdadb2f41af203293a662c2b1bf5e5514586e.zip
Merge pull request #10144 from jmguzik/fix-prune-until-filter-images
Fix images prune filter until
-rw-r--r--libpod/image/prune.go2
-rw-r--r--test/apiv2/10-images.at14
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