0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4777 from vbatts/vbatts-server-info_and_assurance

Browse source 
images: assurance and debug info on image layers
This commit is contained in:
Michael Crosby 2014-03-19 12:07:11 -07:00
commit 6b5ba1b066
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
archive/archive.go
View file

@ -617,6 +617,9 @@ func NewTempArchive(src Archive, dir string) (*TempArchive, error) {
if _, err := io.Copy(f, src); err != nil {
return nil, err
}
if err = f.Sync(); err != nil {
return nil, err
}
if _, err := f.Seek(0, 0); err != nil {
return nil, err
}

11
server/server.go
View file

@ -378,10 +378,15 @@ func (srv *Server) exportImage(img *image.Image, tempdir string) error {
if err != nil {
return err
}
if _, err = io.Copy(fsTar, fs); err != nil {
if written, err := io.Copy(fsTar, fs); err != nil {
return err
} else {
utils.Debugf("rendered layer for %s of [%d] size", i.ID, written)
}
if err = fsTar.Close(); err != nil {
return err
}
fsTar.Close()
// find parent
if i.Parent != "" {
@ -1537,6 +1542,8 @@ func (srv *Server) pushImage(r *registry.Registry, out io.Writer, remote, imgID,
defer os.RemoveAll(layerData.Name())
// Send the layer
utils.Debugf("rendered layer for %s of [%d] size", imgData.ID, layerData.Size)
checksum, checksumPayload, 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 {
return "", err