Fixed conflicts

Upstream-commit: ac37fcf6f3f28f56b4ad58143891be9b1fe99dec Component: engine
2013-06-28 12:36:59 -07:00
parent 2be0a9146e
commit ddffbf8c3d
1 changed files with 1 additions and 1 deletions
@@ -613,7 +613,7 @@ func (srv *Server) pushRepository(r *registry.Registry, out io.Writer, name, reg

 	for _, ep := range repoData.Endpoints {
 		if !(strings.HasPrefix(ep, "http://") || strings.HasPrefix(ep, "https://")) {
-			ep = "https://" + ep
+			ep = fmt.Sprintf("%s://%s", registry.UrlScheme(), ep)
 		}
 		out.Write(sf.FormatStatus("Pushing repository %s to %s (%d tags)", name, ep, len(localRepo)))
 		// For each image within the repo, push them