summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-30 20:34:28 +0100
committerGitHub <noreply@github.com>2020-10-30 20:34:28 +0100
commite5227b9d75d2a5145050a9a6b66fd6b812a370e9 (patch)
tree7e5f0d572469b665e04c4f93f37457a0c1506105
parentd475c99b5bb850e35bcb4c252e482c7aac9df221 (diff)
parentcab33cfbf6a729778afd6740e81df4f647514214 (diff)
downloadpodman-e5227b9d75d2a5145050a9a6b66fd6b812a370e9.tar.gz
podman-e5227b9d75d2a5145050a9a6b66fd6b812a370e9.tar.bz2
podman-e5227b9d75d2a5145050a9a6b66fd6b812a370e9.zip
Merge pull request #8201 from QiWang19/search-limit
Remove search limit since pagination support
-rw-r--r--cmd/podman/images/search.go4
-rw-r--r--docs/source/markdown/podman-search.1.md2
-rw-r--r--test/e2e/search_test.go7
3 files changed, 8 insertions, 5 deletions
diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go
index aabcf98ff..774b39d3a 100644
--- a/cmd/podman/images/search.go
+++ b/cmd/podman/images/search.go
@@ -99,10 +99,6 @@ func imageSearch(cmd *cobra.Command, args []string) error {
return errors.Errorf("search requires exactly one argument")
}
- if searchOptions.Limit > 100 {
- return errors.Errorf("Limit %d is outside the range of [1, 100]", searchOptions.Limit)
- }
-
if searchOptions.ListTags && len(searchOptions.Filters) != 0 {
return errors.Errorf("filters are not applicable to list tags result")
}
diff --git a/docs/source/markdown/podman-search.1.md b/docs/source/markdown/podman-search.1.md
index fc09d96ea..15a38383a 100644
--- a/docs/source/markdown/podman-search.1.md
+++ b/docs/source/markdown/podman-search.1.md
@@ -62,7 +62,7 @@ Note: use .Tag only if the --list-tags is set.
**--limit**=*limit*
-Limit the number of results. This value can be in the range between 1 and 100. The default number of results is 25.
+Limit the number of results (default 25).
Note: The results from each registry will be limited to this value.
Example if limit is 10 and two registries are being searched, the total
number of results will be 20, 10 from each (if there are at least 10 matches in each).
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
index 4f2751099..424a191c5 100644
--- a/test/e2e/search_test.go
+++ b/test/e2e/search_test.go
@@ -460,4 +460,11 @@ registries = ['{{.Host}}:{{.Port}}']`
search.WaitWithDefaultTimeout()
Expect(len(search.OutputToStringArray()) == 0).To(BeTrue())
})
+
+ It("podman search with limit over 100", func() {
+ search := podmanTest.Podman([]string{"search", "--limit", "130", "registry.redhat.io/rhel"})
+ search.WaitWithDefaultTimeout()
+ Expect(search.ExitCode()).To(Equal(0))
+ Expect(len(search.OutputToStringArray())).To(Equal(131))
+ })
})