From ba5a6eed89d50c363449d35dd53ad1f80c1c7889 Mon Sep 17 00:00:00 2001 From: Daniel Menet Date: Sat, 9 Aug 2014 09:16:54 +0200 Subject: [PATCH 1/4] Enable `docker search` on private docker registry. The cli interface works similar to other registry related commands: docker search foo ... searches for foo on the official hub docker search localhost:5000/foo ... does the same for the private reg at localhost:5000 Signed-off-by: Daniel Menet Upstream-commit: cc3e94b9babc21e3505511fa6d02725dfc199be4 Component: engine --- components/engine/registry/service.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/engine/registry/service.go b/components/engine/registry/service.go index d2775e3cd1..8c2c0cc7b1 100644 --- a/components/engine/registry/service.go +++ b/components/engine/registry/service.go @@ -82,7 +82,11 @@ func (s *Service) Search(job *engine.Job) engine.Status { job.GetenvJson("authConfig", authConfig) job.GetenvJson("metaHeaders", metaHeaders) - r, err := NewRegistry(authConfig, HTTPRequestFactory(metaHeaders), IndexServerAddress(), true) + hostname, term, err := ResolveRepositoryName(term) + if err != nil { + return job.Error(err) + } + r, err := NewRegistry(authConfig, HTTPRequestFactory(metaHeaders), hostname, true) if err != nil { return job.Error(err) } From 40bc2f743b261d559a0e3623f4f53c050ad17fe8 Mon Sep 17 00:00:00 2001 From: Daniel Menet Date: Sun, 10 Aug 2014 11:48:34 +0200 Subject: [PATCH 2/4] Expand hostname before passing it to NewRegistry() Signed-off-by: Daniel Menet Upstream-commit: ea59aa8cb5c4cde39259112123c47b69ccd9b53d Component: engine --- components/engine/registry/service.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/registry/service.go b/components/engine/registry/service.go index 8c2c0cc7b1..96fc3f48df 100644 --- a/components/engine/registry/service.go +++ b/components/engine/registry/service.go @@ -86,6 +86,10 @@ func (s *Service) Search(job *engine.Job) engine.Status { if err != nil { return job.Error(err) } + hostname, err = ExpandAndVerifyRegistryUrl(hostname) + if err != nil { + return job.Error(err) + } r, err := NewRegistry(authConfig, HTTPRequestFactory(metaHeaders), hostname, true) if err != nil { return job.Error(err) From bc706dc232693031f2bf533fddb56a31bface484 Mon Sep 17 00:00:00 2001 From: Daniel Menet Date: Sat, 9 Aug 2014 09:16:54 +0200 Subject: [PATCH 3/4] Enable `docker search` on private docker registry. The cli interface works similar to other registry related commands: docker search foo ... searches for foo on the official hub docker search localhost:5000/foo ... does the same for the private reg at localhost:5000 Signed-off-by: Daniel Menet Upstream-commit: 3231033a80451adff73b53554e27fbabfebb4a4f Component: engine --- components/engine/registry/service.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/engine/registry/service.go b/components/engine/registry/service.go index 29afd16394..2d493f7e23 100644 --- a/components/engine/registry/service.go +++ b/components/engine/registry/service.go @@ -82,6 +82,14 @@ func (s *Service) Search(job *engine.Job) engine.Status { job.GetenvJson("authConfig", authConfig) job.GetenvJson("metaHeaders", metaHeaders) + hostname, term, err := ResolveRepositoryName(term) + if err != nil { + return job.Error(err) + } + hostname, err = ExpandAndVerifyRegistryUrl(hostname) + if err != nil { + return job.Error(err) + } r, err := NewSession(authConfig, HTTPRequestFactory(metaHeaders), IndexServerAddress(), true) if err != nil { return job.Error(err) From 06081e86de703784176b81669ce181586ace6174 Mon Sep 17 00:00:00 2001 From: Daniel Menet Date: Sun, 10 Aug 2014 11:48:34 +0200 Subject: [PATCH 4/4] Expand hostname before passing it to NewRegistry() Signed-off-by: Daniel Menet Upstream-commit: 676308b853a43bb7be4838e937ab4effff670b1a Component: engine --- components/engine/registry/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/registry/service.go b/components/engine/registry/service.go index 2d493f7e23..0e6f1bda93 100644 --- a/components/engine/registry/service.go +++ b/components/engine/registry/service.go @@ -90,7 +90,7 @@ func (s *Service) Search(job *engine.Job) engine.Status { if err != nil { return job.Error(err) } - r, err := NewSession(authConfig, HTTPRequestFactory(metaHeaders), IndexServerAddress(), true) + r, err := NewSession(authConfig, HTTPRequestFactory(metaHeaders), hostname, true) if err != nil { return job.Error(err) }