From 9632cf09bfd7b4a8513799bf19070ecabd55c446 Mon Sep 17 00:00:00 2001 From: Tobias Schwab Date: Tue, 2 Jul 2013 22:07:02 +0000 Subject: [PATCH] fix two obvious bugs??? --- registry/registry.go | 2 +- server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/registry/registry.go b/registry/registry.go index 622c09b3f3..0853a68e9f 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -67,7 +67,7 @@ func (r *Registry) GetRemoteHistory(imgId, registry string, token []string) ([]s func (r *Registry) LookupRemoteImage(imgId, registry string, token []string) bool { rt := &http.Transport{Proxy: http.ProxyFromEnvironment} - req, err := http.NewRequest("GET", registry+"/images/"+imgId+"/json", nil) + req, err := http.NewRequest("GET", registry+"/v1/images/"+imgId+"/json", nil) if err != nil { return false } diff --git a/server.go b/server.go index cedd06ad7c..944ab043eb 100644 --- a/server.go +++ b/server.go @@ -626,7 +626,7 @@ func (srv *Server) pushRepository(r *registry.Registry, out io.Writer, name, reg if _, exists := repoData.ImgList[elem.ID]; exists { out.Write(sf.FormatStatus("Image %s already on registry, skipping", name)) continue - } else if registryEp != "" && r.LookupRemoteImage(elem.ID, registryEp, repoData.Tokens) { + } else if r.LookupRemoteImage(elem.ID, ep, repoData.Tokens) { fmt.Fprintf(out, "Image %s already on registry, skipping\n", name) continue }