Merge pull request #2751 from wsong/support_regex_filter

Support asterisks in image reference filter

cluster/image.go

@@ -3,6 +3,7 @@ package cluster
 import (
 	"strings"
 
+	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
 )
 
@@ -108,22 +109,30 @@ func (images Images) Filter(opts ImageFilterOptions) Images {
 		if !opts.Filters.Include(filter) {
 			return true
 		}
+		candidates := map[string]struct{}{}
 		for _, repoTag := range image.RepoTags {
 			imageName, _ := ParseRepositoryTag(repoTag)
-			for _, pattern := range opts.Filters.Get(filter) {
-				if repoTag == pattern || pattern == imageName {
-					return true
-				}
-			}
+			candidates[repoTag] = struct{}{}
+			candidates[imageName] = struct{}{}
 		}
 		for _, repoDigests := range image.RepoDigests {
 			imageName, _ := ParseRepositoryTag(repoDigests)
+			candidates[repoDigests] = struct{}{}
+			candidates[imageName] = struct{}{}
+		}
+		for candidate := range candidates {
 			for _, pattern := range opts.Filters.Get(filter) {
-				if repoDigests == pattern || pattern == imageName {
+				ref, err := reference.Parse(candidate)
+				if err != nil {
+					continue
+				}
+				found, matchErr := reference.FamiliarMatch(pattern, ref)
+				if matchErr == nil && found {
 					return true
 				}
 			}
 		}
+
 		return false
 	}
 

test/integration/api/images.bats

@@ -42,6 +42,11 @@ function teardown() {
 	# lines are: header, busybox, <none>
 	run docker_swarm images -a
 	[ "${#lines[@]}" -ge 3 ]
+
+	run docker_swarm images --filter reference='busy*'
+	[ "$status" -eq 0 ]
+	[ "${#lines[@]}" -eq 2 ]
+	[[ "${lines[1]}" == *"busybox"* ]]
 }
 
 @test "docker images -f label" {