public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #805 from tejal29/fix_720 

add debug level info what is the layer type
This commit is contained in:
Tejal Desai 2019-10-04 16:19:49 -07:00 committed by GitHub
parent 743a967933 1a88d7ae9c
commit 529bc4f20e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/util/fs_util.go
View File

@ -20,6 +20,7 @@ import (
"archive/tar" "archive/tar"
"bufio" "bufio"
"bytes" "bytes"
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
@ -82,11 +83,17 @@ func GetFSFromImage(root string, img v1.Image) ([]string, error) {
extractedFiles := []string{} extractedFiles := []string{}
for i, l := range layers { for i, l := range layers {
if mediaType, err := l.MediaType(); err == nil {
logrus.Debugf("Extracting layer %d of media type %s", mediaType)
} else {
logrus.Debugf("Extracting layer %d", i) logrus.Debugf("Extracting layer %d", i)
}
r, err := l.Uncompressed() r, err := l.Uncompressed()
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer r.Close()
tr := tar.NewReader(r) tr := tar.NewReader(r)
for { for {
hdr, err := tr.Next() hdr, err := tr.Next()
@ -94,7 +101,7 @@ func GetFSFromImage(root string, img v1.Image) ([]string, error) {
break break
} }
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, fmt.Sprintf("error reading tar %d", i))
} }
path := filepath.Join(root, filepath.Clean(hdr.Name)) path := filepath.Join(root, filepath.Clean(hdr.Name))
base := filepath.Base(path) base := filepath.Base(path)