p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

filter image listing using path.Match

Browse Source 
Upstream-commit: b44d11312054d1d7bc0f0bbc8eeaddc2d30c26cc
Component: engine
This commit is contained in:
Martin Redmond
2013-09-06 16:16:10 -04:00
parent b385774680
commit 99856a0342
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/server.go
View File

@ -211,7 +211,7 @@ func (srv *Server) Images(all bool, filter string) ([]APIImages, error) {
outs := []APIImages{} //produce [] when empty instead of 'null'
for name, repository := range srv.runtime.repositories.Repositories {
if filter != "" {
if match, _ := path.Match ( filter, name ); !match {
if match, _ := path.Match(filter, name); !match {
continue
}
}
@ -681,7 +681,7 @@ func (srv *Server) getImageList(localRepo map[string]string) ([][]*registry.ImgD
depGraph.NewNode(img.ID)
img.WalkHistory(func(current *Image) error {
imgList[current.ID] = &registry.ImgData{
ID: current.ID,
ID: current.ID,
Tag: tag,
}
parent, err := current.GetParent()

54
components/engine/server_test.go
View File

@ -431,3 +431,57 @@ func TestRmi(t *testing.T) {
}
}
}
func TestImagesFilter(t *testing.T) {
runtime := mkRuntime(t)
defer nuke(runtime)
srv := &Server{runtime: runtime}
if err := srv.runtime.repositories.Set("utest", "tag1", unitTestImageName, false); err != nil {
t.Fatal(err)
}
if err := srv.runtime.repositories.Set("utest/docker", "tag2", unitTestImageName, false); err != nil {
t.Fatal(err)
}
if err := srv.runtime.repositories.Set("utest:5000/docker", "tag3", unitTestImageName, false); err != nil {
t.Fatal(err)
}
images, err := srv.Images(false, "utest*/*")
if err != nil {
t.Fatal(err)
}
if len(images) != 2 {
t.Fatal("incorrect number of matches returned")
}
images, err = srv.Images(false, "utest")
if err != nil {
t.Fatal(err)
}
if len(images) != 1 {
t.Fatal("incorrect number of matches returned")
}
images, err = srv.Images(false, "utest*")
if err != nil {
t.Fatal(err)
}
if len(images) != 1 {
t.Fatal("incorrect number of matches returned")
}
images, err = srv.Images(false, "*5000*/*")
if err != nil {
t.Fatal(err)
}
if len(images) != 1 {
t.Fatal("incorrect number of matches returned")
}
}