|
@@ -1128,7 +1128,7 @@ func (srv *Server) pushRepository(r *registry.Registry, out io.Writer, localName
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
- out.Write(sf.FormatStatus("", "Pushing tags for rev [%s] on {%s}", elem.ID, ep+"repositories/"+remoteName+"/tags/"+elem.Tag))
|
|
|
|
|
|
+ out.Write(sf.FormatStatus("", "Pushing tags for rev [%s] on {%s}", utils.TruncateID(elem.ID), ep+"repositories/"+remoteName+"/tags/"+elem.Tag))
|
|
if err := r.PushRegistryTag(remoteName, elem.ID, elem.Tag, ep, repoData.Tokens); err != nil {
|
|
if err := r.PushRegistryTag(remoteName, elem.ID, elem.Tag, ep, repoData.Tokens); err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
@@ -1138,13 +1138,13 @@ func (srv *Server) pushRepository(r *registry.Registry, out io.Writer, localName
|
|
if err := pushTags(); err != nil {
|
|
if err := pushTags(); err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
- out.Write(sf.FormatStatus("", "Image %s already pushed, skipping", elem.ID))
|
|
|
|
|
|
+ out.Write(sf.FormatProgress(utils.TruncateID(elem.ID), "Image already pushed, skipping", nil))
|
|
continue
|
|
continue
|
|
} else if r.LookupRemoteImage(elem.ID, ep, repoData.Tokens) {
|
|
} else if r.LookupRemoteImage(elem.ID, ep, repoData.Tokens) {
|
|
if err := pushTags(); err != nil {
|
|
if err := pushTags(); err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
- out.Write(sf.FormatStatus("", "Image %s already pushed, skipping", elem.ID))
|
|
|
|
|
|
+ out.Write(sf.FormatProgress(utils.TruncateID(elem.ID), "Image already pushed, skipping", nil))
|
|
continue
|
|
continue
|
|
}
|
|
}
|
|
checksum, err := srv.pushImage(r, out, remoteName, elem.ID, ep, repoData.Tokens, sf)
|
|
checksum, err := srv.pushImage(r, out, remoteName, elem.ID, ep, repoData.Tokens, sf)
|
|
@@ -1174,7 +1174,7 @@ func (srv *Server) pushImage(r *registry.Registry, out io.Writer, remote, imgID,
|
|
if err != nil {
|
|
if err != nil {
|
|
return "", fmt.Errorf("Cannot retrieve the path for {%s}: %s", imgID, err)
|
|
return "", fmt.Errorf("Cannot retrieve the path for {%s}: %s", imgID, err)
|
|
}
|
|
}
|
|
- out.Write(sf.FormatStatus("", "Pushing %s", imgID))
|
|
|
|
|
|
+ out.Write(sf.FormatProgress(utils.TruncateID(imgID), "Pushing", nil))
|
|
|
|
|
|
imgData := ®istry.ImgData{
|
|
imgData := ®istry.ImgData{
|
|
ID: imgID,
|
|
ID: imgID,
|
|
@@ -1183,7 +1183,7 @@ func (srv *Server) pushImage(r *registry.Registry, out io.Writer, remote, imgID,
|
|
// Send the json
|
|
// Send the json
|
|
if err := r.PushImageJSONRegistry(imgData, jsonRaw, ep, token); err != nil {
|
|
if err := r.PushImageJSONRegistry(imgData, jsonRaw, ep, token); err != nil {
|
|
if err == registry.ErrAlreadyExists {
|
|
if err == registry.ErrAlreadyExists {
|
|
- out.Write(sf.FormatStatus("", "Image %s already pushed, skipping", imgData.ID))
|
|
|
|
|
|
+ out.Write(sf.FormatProgress(utils.TruncateID(imgData.ID), "Image already pushed, skipping", nil))
|
|
return "", nil
|
|
return "", nil
|
|
}
|
|
}
|
|
return "", err
|
|
return "", err
|
|
@@ -1196,14 +1196,11 @@ func (srv *Server) pushImage(r *registry.Registry, out io.Writer, remote, imgID,
|
|
defer os.RemoveAll(layerData.Name())
|
|
defer os.RemoveAll(layerData.Name())
|
|
|
|
|
|
// Send the layer
|
|
// Send the layer
|
|
- checksum, err = r.PushImageLayerRegistry(imgData.ID, utils.ProgressReader(layerData, int(layerData.Size), out, sf, false, "", "Pushing"), ep, token, jsonRaw)
|
|
|
|
|
|
+ checksum, err = r.PushImageLayerRegistry(imgData.ID, utils.ProgressReader(layerData, int(layerData.Size), out, sf, false, utils.TruncateID(imgData.ID), "Pushing"), ep, token, jsonRaw)
|
|
if err != nil {
|
|
if err != nil {
|
|
return "", err
|
|
return "", err
|
|
}
|
|
}
|
|
imgData.Checksum = checksum
|
|
imgData.Checksum = checksum
|
|
-
|
|
|
|
- out.Write(sf.FormatStatus("", ""))
|
|
|
|
-
|
|
|
|
// Send the checksum
|
|
// Send the checksum
|
|
if err := r.PushImageChecksumRegistry(imgData, ep, token); err != nil {
|
|
if err := r.PushImageChecksumRegistry(imgData, ep, token); err != nil {
|
|
return "", err
|
|
return "", err
|