Merge pull request #8320 from dmcgowan/provenance_pull

Official image provenance pull flow
This commit is contained in:
Michael Crosby
2014-10-03 10:56:54 -07:00
21 changed files with 2146 additions and 112 deletions
+2 -2
View File
@@ -214,7 +214,7 @@ func (s *TagStore) CmdPush(job *engine.Job) engine.Status {
return job.Error(err)
}
endpoint, err := registry.ExpandAndVerifyRegistryUrl(hostname)
endpoint, err := registry.NewEndpoint(hostname)
if err != nil {
return job.Error(err)
}
@@ -243,7 +243,7 @@ func (s *TagStore) CmdPush(job *engine.Job) engine.Status {
var token []string
job.Stdout.Write(sf.FormatStatus("", "The push refers to an image: [%s]", localName))
if _, err := s.pushImage(r, job.Stdout, remoteName, img.ID, endpoint, token, sf); err != nil {
if _, err := s.pushImage(r, job.Stdout, remoteName, img.ID, endpoint.String(), token, sf); err != nil {
return job.Error(err)
}
return engine.StatusOK