| ... | ... |
@@ -219,7 +219,7 @@ func (graph *Graph) TempLayerArchive(id string, compression archive.Compression, |
| 219 | 219 |
if err != nil {
|
| 220 | 220 |
return nil, err |
| 221 | 221 |
} |
| 222 |
- return archive.NewTempArchive(utils.ProgressReader(ioutil.NopCloser(a), 0, output, sf, true, "", "Buffering to disk"), tmp) |
|
| 222 |
+ return archive.NewTempArchive(utils.ProgressReader(ioutil.NopCloser(a), 0, output, sf, false, utils.TruncateID(id), "Buffering to disk"), tmp) |
|
| 223 | 223 |
} |
| 224 | 224 |
|
| 225 | 225 |
// Mktemp creates a temporary sub-directory inside the graph's filesystem. |
| ... | ... |
@@ -1093,7 +1093,7 @@ func (srv *Server) pushRepository(r *registry.Registry, out io.Writer, localName |
| 1093 | 1093 |
return nil |
| 1094 | 1094 |
} |
| 1095 | 1095 |
|
| 1096 |
- out.Write(sf.FormatStatus("", "Pushing tags for rev [%s] on {%s}", elem.ID, ep+"repositories/"+remoteName+"/tags/"+elem.Tag))
|
|
| 1096 |
+ out.Write(sf.FormatStatus("", "Pushing tags for rev [%s] on {%s}", utils.TruncateID(elem.ID), ep+"repositories/"+remoteName+"/tags/"+elem.Tag))
|
|
| 1097 | 1097 |
if err := r.PushRegistryTag(remoteName, elem.ID, elem.Tag, ep, repoData.Tokens); err != nil {
|
| 1098 | 1098 |
return err |
| 1099 | 1099 |
} |
| ... | ... |
@@ -1103,13 +1103,13 @@ func (srv *Server) pushRepository(r *registry.Registry, out io.Writer, localName |
| 1103 | 1103 |
if err := pushTags(); err != nil {
|
| 1104 | 1104 |
return err |
| 1105 | 1105 |
} |
| 1106 |
- out.Write(sf.FormatStatus("", "Image %s already pushed, skipping", elem.ID))
|
|
| 1106 |
+ out.Write(sf.FormatProgress(utils.TruncateID(elem.ID), "Image already pushed, skipping", nil)) |
|
| 1107 | 1107 |
continue |
| 1108 | 1108 |
} else if r.LookupRemoteImage(elem.ID, ep, repoData.Tokens) {
|
| 1109 | 1109 |
if err := pushTags(); err != nil {
|
| 1110 | 1110 |
return err |
| 1111 | 1111 |
} |
| 1112 |
- out.Write(sf.FormatStatus("", "Image %s already pushed, skipping", elem.ID))
|
|
| 1112 |
+ out.Write(sf.FormatProgress(utils.TruncateID(elem.ID), "Image already pushed, skipping", nil)) |
|
| 1113 | 1113 |
continue |
| 1114 | 1114 |
} |
| 1115 | 1115 |
checksum, err := srv.pushImage(r, out, remoteName, elem.ID, ep, repoData.Tokens, sf) |
| ... | ... |
@@ -1139,7 +1139,7 @@ func (srv *Server) pushImage(r *registry.Registry, out io.Writer, remote, imgID, |
| 1139 | 1139 |
if err != nil {
|
| 1140 | 1140 |
return "", fmt.Errorf("Cannot retrieve the path for {%s}: %s", imgID, err)
|
| 1141 | 1141 |
} |
| 1142 |
- out.Write(sf.FormatStatus("", "Pushing %s", imgID))
|
|
| 1142 |
+ out.Write(sf.FormatProgress(utils.TruncateID(imgID), "Pushing", nil)) |
|
| 1143 | 1143 |
|
| 1144 | 1144 |
imgData := ®istry.ImgData{
|
| 1145 | 1145 |
ID: imgID, |
| ... | ... |
@@ -1148,7 +1148,7 @@ func (srv *Server) pushImage(r *registry.Registry, out io.Writer, remote, imgID, |
| 1148 | 1148 |
// Send the json |
| 1149 | 1149 |
if err := r.PushImageJSONRegistry(imgData, jsonRaw, ep, token); err != nil {
|
| 1150 | 1150 |
if err == registry.ErrAlreadyExists {
|
| 1151 |
- out.Write(sf.FormatStatus("", "Image %s already pushed, skipping", imgData.ID))
|
|
| 1151 |
+ out.Write(sf.FormatProgress(utils.TruncateID(imgData.ID), "Image already pushed, skipping", nil)) |
|
| 1152 | 1152 |
return "", nil |
| 1153 | 1153 |
} |
| 1154 | 1154 |
return "", err |
| ... | ... |
@@ -1161,14 +1161,11 @@ func (srv *Server) pushImage(r *registry.Registry, out io.Writer, remote, imgID, |
| 1161 | 1161 |
defer os.RemoveAll(layerData.Name()) |
| 1162 | 1162 |
|
| 1163 | 1163 |
// Send the layer |
| 1164 |
- checksum, err = r.PushImageLayerRegistry(imgData.ID, utils.ProgressReader(layerData, int(layerData.Size), out, sf, false, "", "Pushing"), ep, token, jsonRaw) |
|
| 1164 |
+ checksum, err = r.PushImageLayerRegistry(imgData.ID, utils.ProgressReader(layerData, int(layerData.Size), out, sf, false, utils.TruncateID(imgData.ID), "Pushing"), ep, token, jsonRaw) |
|
| 1165 | 1165 |
if err != nil {
|
| 1166 | 1166 |
return "", err |
| 1167 | 1167 |
} |
| 1168 | 1168 |
imgData.Checksum = checksum |
| 1169 |
- |
|
| 1170 |
- out.Write(sf.FormatStatus("", ""))
|
|
| 1171 |
- |
|
| 1172 | 1169 |
// Send the checksum |
| 1173 | 1170 |
if err := r.PushImageChecksumRegistry(imgData, ep, token); err != nil {
|
| 1174 | 1171 |
return "", err |