Merge pull request #1109 from dynport/remote-lookup-fix

Fix remote lookup when pushing into registry

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
 	}

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
 			}