motiejus/undocker
1
Fork 0
Code Packages Releases Activity

move tw initialization later

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-05-24 00:11:58 +03:00
parent 503fff5820
commit 6c3943a3cc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rootfs/rootfs.go
View File

@ -50,14 +50,8 @@ func New(rd io.ReadSeeker) *RootFS {
// WriteTo writes a docker image to an open tarball. // WriteTo writes a docker image to an open tarball.
func (r *RootFS) WriteTo(w io.Writer) (n int64, err error) { func (r *RootFS) WriteTo(w io.Writer) (n int64, err error) {
wr := bytecounter.New(w)
tr := tar.NewReader(r.rd) tr := tar.NewReader(r.rd)
tw := tar.NewWriter(wr)
var closer func() error var closer func() error
defer func() {
err = multierr.Append(err, tw.Close())
n = wr.N
}()
// layerOffsets maps a layer name (a9b123c0daa/layer.tar) to it's offset // layerOffsets maps a layer name (a9b123c0daa/layer.tar) to it's offset
layerOffsets := map[string]int64{} layerOffsets := map[string]int64{}
@ -155,6 +149,12 @@ func (r *RootFS) WriteTo(w io.Writer) (n int64, err error) {
// construct directories to whiteout, for each layer. // construct directories to whiteout, for each layer.
whIgnore := whiteoutDirs(whreaddir, len(layers)) whIgnore := whiteoutDirs(whreaddir, len(layers))
wr := bytecounter.New(w)
tw := tar.NewWriter(wr)
defer func() {
err = multierr.Append(err, tw.Close())
n = wr.N
}()
// iterate through all layers, all files, and write files. // iterate through all layers, all files, and write files.
for i, no := range layers { for i, no := range layers {
if _, err := r.rd.Seek(no.offset, io.SeekStart); err != nil { if _, err := r.rd.Seek(no.offset, io.SeekStart); err != nil {