From 7a6dfb6d8b8e1995eec115e539c27166b21c5323 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Wed, 12 Sep 2018 17:10:03 -0700 Subject: [PATCH] Removed incorrect FS extraction from earlier merge with master, and fixed linting errors --- pkg/executor/build.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg/executor/build.go b/pkg/executor/build.go index 9bcbfda1e..b908a0beb 100644 --- a/pkg/executor/build.go +++ b/pkg/executor/build.go @@ -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 // TODO: priyawadhwa@ to fill this out when implementing caching -func (s *stageBuilder) key(cmd string) (string, error) { - return "", nil -} +// func (s *stageBuilder) key(cmd string) (string, error) { +// return "", nil +// } // extractCachedLayer will extract the cached layer and append it to the config file // TODO: priyawadhwa@ to fill this out when implementing caching -func (s *stageBuilder) extractCachedLayer(layer v1.Image, createdBy string) error { - return nil -} +// func (s *stageBuilder) extractCachedLayer(layer v1.Image, createdBy string) error { +// return nil +// } func (s *stageBuilder) build(opts *config.KanikoOptions) error { // Unpack file system to root @@ -114,9 +114,6 @@ func (s *stageBuilder) build(opts *config.KanikoOptions) error { if command == nil { continue } - if err := util.GetFSFromImage(constants.RootDir, s.image); err != nil { - return err - } logrus.Info(command.String()) if err := command.ExecuteCommand(&s.cf.Config, args); err != nil { return err