summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-21 17:39:27 +0200
committerGitHub <noreply@github.com>2019-05-21 17:39:27 +0200
commite6277b1a2dedf8a4d80a270ddac0be4c22ed3e6d (patch)
treee3b30fc6784026ec0cb88c52680c86ed28207120
parent773b9ac9d059a66280ac50163a17bc705bde0a60 (diff)
parentc6f7066e772b2ee761665cbff027c3b1906fd171 (diff)
downloadpodman-e6277b1a2dedf8a4d80a270ddac0be4c22ed3e6d.tar.gz
podman-e6277b1a2dedf8a4d80a270ddac0be4c22ed3e6d.tar.bz2
podman-e6277b1a2dedf8a4d80a270ddac0be4c22ed3e6d.zip
Merge pull request #3167 from weirdwiz/filter
Minor fix filtering images by label
-rw-r--r--cmd/podman/images.go2
-rw-r--r--test/e2e/images_test.go13
2 files changed, 14 insertions, 1 deletions
diff --git a/cmd/podman/images.go b/cmd/podman/images.go
index 1c46571c3..3f755efc1 100644
--- a/cmd/podman/images.go
+++ b/cmd/podman/images.go
@@ -362,7 +362,7 @@ func CreateFilterFuncs(ctx context.Context, r *adapter.LocalRuntime, filters []s
var filterFuncs []imagefilters.ResultFilter
for _, filter := range filters {
splitFilter := strings.Split(filter, "=")
- if len(splitFilter) != 2 {
+ if len(splitFilter) < 2 {
return nil, errors.Errorf("invalid filter syntax %s", filter)
}
switch splitFilter[0] {
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
index bec6e304b..23455163b 100644
--- a/test/e2e/images_test.go
+++ b/test/e2e/images_test.go
@@ -298,4 +298,17 @@ ENV foo=bar
Expect(session2.ExitCode()).To(Equal(0))
Expect(len(session2.OutputToStringArray())).To(Equal(6))
})
+
+ It("podman images filter by label", func() {
+ SkipIfRemote()
+ dockerfile := `FROM docker.io/library/alpine:latest
+LABEL version="1.0"
+LABEL "com.example.vendor"="Example Vendor"
+`
+ podmanTest.BuildImage(dockerfile, "test", "true")
+ session := podmanTest.Podman([]string{"images", "-f", "label=version=1.0"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ Expect(len(session.OutputToStringArray())).To(Equal(2))
+ })
})