motiejus/undocker
1
Fork 0
Code Packages Releases Activity

report name on failing untar

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-05-24 00:11:58 +03:00
parent 164846b551
commit 69bf4d7074
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rootfs/rootfs.go
View File

@ -81,10 +81,17 @@ func (r *RootFS) WriteTo(w io.Writer) (n int64, err error) {
return n, errBadManifest return n, errBadManifest
} }
type nameOffset struct {
name string
offset int64
}
// enumerate layers the way they would be laid down in the image // enumerate layers the way they would be laid down in the image
layers := make([]int64, len(layerOffsets)) layers := make([]nameOffset, len(layerOffsets))
for i, name := range manifest[0].Layers { for i, name := range manifest[0].Layers {
layers[i] = layerOffsets[name] layers[i] = nameOffset{
name: name,
offset: layerOffsets[name],
}
} }
// file2layer maps a filename to layer number (index in "layers") // file2layer maps a filename to layer number (index in "layers")
@ -98,8 +105,8 @@ func (r *RootFS) WriteTo(w io.Writer) (n int64, err error) {
wh := map[string]int{} wh := map[string]int{}
// iterate over all files, construct `file2layer`, `whreaddir`, `wh` // iterate over all files, construct `file2layer`, `whreaddir`, `wh`
for i, offset := range layers { for i, no := range layers {
if _, err := r.rd.Seek(offset, io.SeekStart); err != nil { if _, err := r.rd.Seek(no.offset, io.SeekStart); err != nil {
return n, err return n, err
} }
tr = tar.NewReader(r.rd) tr = tar.NewReader(r.rd)
@ -109,7 +116,7 @@ func (r *RootFS) WriteTo(w io.Writer) (n int64, err error) {
break break
} }
if err != nil { if err != nil {
return n, err return n, fmt.Errorf("decode %s: %w", no.name, err)
} }
if hdr.Typeflag == tar.TypeDir { if hdr.Typeflag == tar.TypeDir {
continue continue
@ -139,8 +146,8 @@ func (r *RootFS) WriteTo(w io.Writer) (n int64, err error) {
whIgnore := whiteoutDirs(whreaddir, len(layers)) whIgnore := whiteoutDirs(whreaddir, len(layers))
// iterate through all layers, all files, and write files. // iterate through all layers, all files, and write files.
for i, offset := range layers { for i, no := range layers {
if _, err := r.rd.Seek(offset, io.SeekStart); err != nil { if _, err := r.rd.Seek(no.offset, io.SeekStart); err != nil {
return n, err return n, err
} }
tr = tar.NewReader(r.rd) tr = tar.NewReader(r.rd)
@ -150,7 +157,7 @@ func (r *RootFS) WriteTo(w io.Writer) (n int64, err error) {
break break
} }
if err != nil { if err != nil {
return n, err return n, fmt.Errorf("decode %s: %w", no.name, err)
} }
if layer, ok := wh[hdr.Name]; ok && layer >= i { if layer, ok := wh[hdr.Name]; ok && layer >= i {
continue continue