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

Removed incorrect FS extraction from earlier merge with master, and fixed linting errors

This commit is contained in:
Priya Wadhwa 2018-09-12 17:10:03 -07:00
parent ee9aa954ac
commit 7a6dfb6d8b
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/executor/build.go
View File

@ -85,15 +85,15 @@ func newStageBuilder(opts *config.KanikoOptions, stage config.KanikoStage) (*sta
// key will return a string representation of the build at the cmd // key will return a string representation of the build at the cmd
// TODO: priyawadhwa@ to fill this out when implementing caching // TODO: priyawadhwa@ to fill this out when implementing caching
func (s *stageBuilder) key(cmd string) (string, error) { // func (s *stageBuilder) key(cmd string) (string, error) {
return "", nil // return "", nil
} // }
// extractCachedLayer will extract the cached layer and append it to the config file // extractCachedLayer will extract the cached layer and append it to the config file
// TODO: priyawadhwa@ to fill this out when implementing caching // TODO: priyawadhwa@ to fill this out when implementing caching
func (s *stageBuilder) extractCachedLayer(layer v1.Image, createdBy string) error { // func (s *stageBuilder) extractCachedLayer(layer v1.Image, createdBy string) error {
return nil // return nil
} // }
func (s *stageBuilder) build(opts *config.KanikoOptions) error { func (s *stageBuilder) build(opts *config.KanikoOptions) error {
// Unpack file system to root // Unpack file system to root
@ -114,9 +114,6 @@ func (s *stageBuilder) build(opts *config.KanikoOptions) error {
if command == nil { if command == nil {
continue continue
} }
if err := util.GetFSFromImage(constants.RootDir, s.image); err != nil {
return err
}
logrus.Info(command.String()) logrus.Info(command.String())
if err := command.ExecuteCommand(&s.cf.Config, args); err != nil { if err := command.ExecuteCommand(&s.cf.Config, args); err != nil {
return err return err