From 75864d5c85375a9211c0a3e9a55be91f065e3dd5 Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Fri, 1 May 2020 23:41:06 -0700 Subject: [PATCH] flip the flag --- pkg/commands/add.go | 4 ---- pkg/commands/base_command.go | 2 +- pkg/commands/copy.go | 8 -------- pkg/commands/workdir.go | 6 +----- pkg/executor/build.go | 4 +++- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/pkg/commands/add.go b/pkg/commands/add.go index 75a6b5b20..b39b5eb98 100644 --- a/pkg/commands/add.go +++ b/pkg/commands/add.go @@ -116,10 +116,6 @@ func (a *AddCommand) FilesToSnapshot() []string { return a.snapshotFiles } -func (a *AddCommand) ProvidesFilesToSnapshot() bool { - return true -} - // String returns some information about the command for the image config func (a *AddCommand) String() string { return a.cmd.String() diff --git a/pkg/commands/base_command.go b/pkg/commands/base_command.go index b96bf85d9..94c4fe156 100644 --- a/pkg/commands/base_command.go +++ b/pkg/commands/base_command.go @@ -33,7 +33,7 @@ func (b *BaseCommand) FilesToSnapshot() []string { } func (b *BaseCommand) ProvidesFilesToSnapshot() bool { - return false + return true } func (b *BaseCommand) FilesUsedFromContext(_ *v1.Config, _ *dockerfile.BuildArgs) ([]string, error) { diff --git a/pkg/commands/copy.go b/pkg/commands/copy.go index 35505284f..4e667a373 100644 --- a/pkg/commands/copy.go +++ b/pkg/commands/copy.go @@ -138,10 +138,6 @@ func (c *CopyCommand) MetadataOnly() bool { return false } -func (c *CopyCommand) ProvidesFilesToSnapshot() bool { - return true -} - func (c *CopyCommand) RequiresUnpackedFS() bool { return true } @@ -218,10 +214,6 @@ func (cr *CachingCopyCommand) MetadataOnly() bool { return false } -func (cr *CachingCopyCommand) ProvidesFilesToSnapshot() bool { - return true -} - func (cr *CachingCopyCommand) String() string { if cr.cmd == nil { return "nil command" diff --git a/pkg/commands/workdir.go b/pkg/commands/workdir.go index 96104bb13..e95d0ea3e 100644 --- a/pkg/commands/workdir.go +++ b/pkg/commands/workdir.go @@ -74,8 +74,4 @@ func (w *WorkdirCommand) String() string { func (w *WorkdirCommand) MetadataOnly() bool { return false -} - -func (w *WorkdirCommand) ProvidesFilesToSnapshot() bool { - return true -} +} \ No newline at end of file diff --git a/pkg/executor/build.go b/pkg/executor/build.go index b07be09e5..45adc8bc4 100644 --- a/pkg/executor/build.go +++ b/pkg/executor/build.go @@ -318,6 +318,7 @@ func (s *stageBuilder) build() error { } initSnapshotTaken := false + layer := 0 cacheGroup := errgroup.Group{} for index, command := range s.cmds { @@ -370,7 +371,8 @@ func (s *stageBuilder) build() error { if !s.shouldTakeSnapshot(index, files, command.ProvidesFilesToSnapshot()) { continue } - + layer++ + logrus.Infof(fmt.Sprintf("%d", layer)) if isCacheCommand { v := command.(commands.Cached) layer := v.Layer()