filter flag: split out for separate --filter flags

adding tests and allowing for easy passing of filters.Args from client
to server.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
This commit is contained in:
Vincent Batts
2014-06-02 16:33:51 -04:00
parent 3391aac2b2
commit f1cc7ce5d7
5 changed files with 101 additions and 29 deletions
+10 -3
View File
@@ -700,12 +700,19 @@ func (srv *Server) Images(job *engine.Job) engine.Status {
filt_tagged = true
)
imageFilters, err := filters.ParseFlag(job.Getenv("filters"), nil)
utils.Debugf("SUCH JOB: %#v", job)
utils.Debugf("SUCH ENV: %#v", *job.Env())
imageFilters, err := filters.FromParam(job.Getenv("filters"))
if err != nil {
return job.Error(err)
}
if i, ok := imageFilters["untagged"]; ok && strings.ToLower(i) == "true" {
filt_tagged = false
utils.Debugf("SUCH FILTERS: %#v", imageFilters)
if i, ok := imageFilters["untagged"]; ok {
for _, value := range i {
if strings.ToLower(value) == "true" {
filt_tagged = false
}
}
}
if job.GetenvBool("all") && !filt_tagged {